From 3aee1afddea84ce486b4b84082ef71453f377fa2 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Fri, 4 Mar 2022 13:57:51 +0100 Subject: [PATCH] libvirt-8.1.0-1.el9 - Rebased to libvirt-8.1.0 (rhbz#2060313) - The rebase also fixes the following bugs: rhbz#1643868, rhbz#2045953, rhbz#1910856, rhbz#2051451, rhbz#1745868 rhbz#2040548, rhbz#2041665, rhbz#1999372, rhbz#2038045, rhbz#2045959 rhbz#2046024, rhbz#2040555, rhbz#2057067, rhbz#2037146, rhbz#2036300 Resolves: rhbz#1643868, rhbz#1745868, rhbz#1910856, rhbz#1999372, rhbz#2036300 Resolves: rhbz#2037146, rhbz#2038045, rhbz#2040548, rhbz#2040555, rhbz#2041665 Resolves: rhbz#2045953, rhbz#2045959, rhbz#2046024, rhbz#2051451, rhbz#2057067 Resolves: rhbz#2060313 --- ...ke-systemd-unit-ordering-more-robust.patch | 89 -- ...HEL-Fix-virConnectGetMaxVcpus-output.patch | 10 +- ...sGetStatInfo-is-unable-to-parse-data.patch | 104 --- ...ibvirt-guests-when-building-libvirtd.patch | 75 -- ...docs-Add-man-page-for-libvirt-guests.patch | 217 ----- ...-domain-definition-even-on-migration.patch | 71 -- ...rt-qemu-fix-inactive-snapshot-revert.patch | 41 - ...ud-executing-qemuDomainUndefineFlags.patch | 49 + ...mainSetupDisk-Initialize-targetPaths.patch | 41 - ...nerate-memory-only-after-controllers.patch | 662 -------------- libvirt-remove-sysconfig-files.patch | 846 ------------------ libvirt-util-Fix-machined-servicename.patch | 71 -- libvirt.spec | 72 +- sources | 2 +- symlinks | 2 +- 15 files changed, 98 insertions(+), 2254 deletions(-) delete mode 100644 libvirt-Make-systemd-unit-ordering-more-robust.patch delete mode 100644 libvirt-Revert-report-error-when-virProcessGetStatInfo-is-unable-to-parse-data.patch delete mode 100644 libvirt-build-Only-install-libvirt-guests-when-building-libvirtd.patch delete mode 100644 libvirt-docs-Add-man-page-for-libvirt-guests.patch delete mode 100644 libvirt-qemu-Validate-domain-definition-even-on-migration.patch delete mode 100644 libvirt-qemu-fix-inactive-snapshot-revert.patch create mode 100644 libvirt-qemu-segmentation-fault-in-virtqemud-executing-qemuDomainUndefineFlags.patch delete mode 100644 libvirt-qemuDomainSetupDisk-Initialize-targetPaths.patch delete mode 100644 libvirt-qemu_command-Generate-memory-only-after-controllers.patch delete mode 100644 libvirt-remove-sysconfig-files.patch delete mode 100644 libvirt-util-Fix-machined-servicename.patch diff --git a/libvirt-Make-systemd-unit-ordering-more-robust.patch b/libvirt-Make-systemd-unit-ordering-more-robust.patch deleted file mode 100644 index be38df5..0000000 --- a/libvirt-Make-systemd-unit-ordering-more-robust.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ee1ce580f5373070e4b6a50d1ae4a3218c737a72 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Martin Kletzander -Date: Mon, 14 Feb 2022 12:37:37 +0100 -Subject: [PATCH] Make systemd unit ordering more robust - -Since libvirt-guests script/service can operate on various URIs and we do -support both socket activation and traditional services, the ordering should be -specified for all the possible sockets and services. - -Also remove the Wants= dependency since do not want to start any service. We -cannot know which one libvirt-guests is configured, so we'd have to start all -the daemons which would break if unused colliding services are not -masked (libvirtd.service in the modular case and all the modular daemon service -units in the monolithic scenario). Fortunately we can assume that the system is -configured properly to start services/sockets that are of interest to the user. -That also works with the setup described in https://libvirt.org/daemons.html . - -To make it even more robust we add the daemon service into the machine units -created for individual domains as it was missing there. - -https://bugzilla.redhat.com/show_bug.cgi?id=1868537 - -Signed-off-by: Martin Kletzander -Reviewed-by: Michal Privoznik -(cherry picked from commit 4e42686adef8b9e9266f0099ddcd25bc95c4ed43) -Signed-off-by: Martin Kletzander ---- - src/util/virsystemd.c | 8 ++++++-- - tools/libvirt-guests.service.in | 12 +++++++++++- - 2 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c -index a86d4c6bb9..f156c2f39a 100644 ---- a/src/util/virsystemd.c -+++ b/src/util/virsystemd.c -@@ -441,8 +441,10 @@ int virSystemdCreateMachine(const char *name, - nicindexes, nnicindexes, sizeof(int)); - gprops = g_variant_new_parsed("[('Slice', <%s>)," - " ('After', <['libvirtd.service']>)," -+ " ('After', <['virt%sd.service']>)," - " ('Before', <['virt-guest-shutdown.target']>)]", -- slicename); -+ slicename, -+ drivername); - message = g_variant_new("(s@ayssus@ai@a(sv))", - name, - guuid, -@@ -489,8 +491,10 @@ int virSystemdCreateMachine(const char *name, - uuid, 16, sizeof(unsigned char)); - gprops = g_variant_new_parsed("[('Slice', <%s>)," - " ('After', <['libvirtd.service']>)," -+ " ('After', <['virt%sd.service']>)," - " ('Before', <['virt-guest-shutdown.target']>)]", -- slicename); -+ slicename, -+ drivername); - message = g_variant_new("(s@ayssus@a(sv))", - name, - guuid, -diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 1a9b233e11..3cf6476196 100644 ---- a/tools/libvirt-guests.service.in -+++ b/tools/libvirt-guests.service.in -@@ -1,10 +1,20 @@ - [Unit] - Description=Suspend/Resume Running libvirt Guests --Wants=libvirtd.service - Requires=virt-guest-shutdown.target - After=network.target - After=time-sync.target -+After=libvirtd.socket -+After=virtqemud.socket -+After=virtlxcd.socket -+After=virtvboxd.socket -+After=virtvzd.socket -+After=virtxend.socket - After=libvirtd.service -+After=virtqemud.service -+After=virtlxcd.service -+After=virtvboxd.service -+After=virtvzd.service -+After=virtxend.service - After=virt-guest-shutdown.target - Documentation=man:libvirt-guests(8) - Documentation=https://libvirt.org --- -2.35.1 - diff --git a/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch b/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch index 245859e..94ddd36 100644 --- a/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch +++ b/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch @@ -1,5 +1,5 @@ -From 16b9ab85b004308e1d99db4ed4769a5fa56e2dfa Mon Sep 17 00:00:00 2001 -Message-Id: <16b9ab85b004308e1d99db4ed4769a5fa56e2dfa@dist-git> +From b9d80773f6f6c4720669624c0a8978ee6c072185 Mon Sep 17 00:00:00 2001 +Message-Id: From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 27 Aug 2018 13:09:38 +0200 Subject: [PATCH] RHEL: Fix virConnectGetMaxVcpus output @@ -26,10 +26,10 @@ Reviewed-by: Andrea Bolognani 1 file changed, 5 insertions(+) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c -index a07c00a0e9..35f41daef2 100644 +index 011ef8a153..2ba9a4a3ee 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c -@@ -1166,6 +1166,11 @@ virHostCPUGetKVMMaxVCPUs(void) +@@ -1172,6 +1172,11 @@ virHostCPUGetKVMMaxVCPUs(void) return -1; } @@ -42,5 +42,5 @@ index a07c00a0e9..35f41daef2 100644 /* at first try KVM_CAP_MAX_VCPUS to determine the maximum count */ if ((ret = ioctl(fd, KVM_CHECK_EXTENSION, KVM_CAP_MAX_VCPUS)) > 0) -- -2.34.1 +2.35.1 diff --git a/libvirt-Revert-report-error-when-virProcessGetStatInfo-is-unable-to-parse-data.patch b/libvirt-Revert-report-error-when-virProcessGetStatInfo-is-unable-to-parse-data.patch deleted file mode 100644 index f2ab83f..0000000 --- a/libvirt-Revert-report-error-when-virProcessGetStatInfo-is-unable-to-parse-data.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 81f1508d99d4740e7a2a092128d651cf245a554e Mon Sep 17 00:00:00 2001 -Message-Id: <81f1508d99d4740e7a2a092128d651cf245a554e@dist-git> -From: Michal Privoznik -Date: Tue, 18 Jan 2022 12:40:09 +0100 -Subject: [PATCH] Revert "report error when virProcessGetStatInfo() is unable - to parse data" - -This reverts commit 938382b60ae5bd1f83b5cb09e1ce68b9a88f679a. - -Turns out, the commit did more harm than good. It changed -semantics on some public APIs. For instance, while -qemuDomainGetInfo() previously did not returned an error it does -now. While the calls to virProcessGetStatInfo() is guarded with -virDomainObjIsActive() it doesn't necessarily mean that QEMU's -PID is still alive. QEMU might be gone but we just haven't -realized it (e.g. because the eof handler thread is waiting for a -job). - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2041610 -Signed-off-by: Michal Privoznik -Reviewed-by: Andrea Bolognani -(cherry picked from commit 105dace22cc7b5b18d72a4dcad4a2cf386ce5c99) -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2043579 -Signed-off-by: Michal Privoznik ---- - src/ch/ch_driver.c | 2 ++ - src/qemu/qemu_driver.c | 7 ++++++- - src/util/virprocess.c | 8 ++------ - 3 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c -index 3cbc668489..53e0872207 100644 ---- a/src/ch/ch_driver.c -+++ b/src/ch/ch_driver.c -@@ -1073,6 +1073,8 @@ chDomainHelperGetVcpus(virDomainObj *vm, - if (virProcessGetStatInfo(&vcpuinfo->cpuTime, - &vcpuinfo->cpu, NULL, - vm->pid, vcpupid) < 0) { -+ virReportSystemError(errno, "%s", -+ _("cannot get vCPU placement & pCPU time")); - return -1; - } - } -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index 65ac5ef367..d3d76c003f 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -1359,6 +1359,8 @@ qemuDomainHelperGetVcpus(virDomainObj *vm, - if (virProcessGetStatInfo(&vcpuinfo->cpuTime, - &vcpuinfo->cpu, NULL, - vm->pid, vcpupid) < 0) { -+ virReportSystemError(errno, "%s", -+ _("cannot get vCPU placement & pCPU time")); - return -1; - } - } -@@ -2519,6 +2521,8 @@ qemuDomainGetInfo(virDomainPtr dom, - if (virDomainObjIsActive(vm)) { - if (virProcessGetStatInfo(&(info->cpuTime), NULL, NULL, - vm->pid, 0) < 0) { -+ virReportError(VIR_ERR_OPERATION_FAILED, "%s", -+ _("cannot read cputime for domain")); - goto cleanup; - } - } -@@ -10526,7 +10530,8 @@ qemuDomainMemoryStatsInternal(virQEMUDriver *driver, - } - - if (virProcessGetStatInfo(NULL, NULL, &rss, vm->pid, 0) < 0) { -- virResetLastError(); -+ virReportError(VIR_ERR_OPERATION_FAILED, "%s", -+ _("cannot get RSS for domain")); - } else { - stats[ret].tag = VIR_DOMAIN_MEMORY_STAT_RSS; - stats[ret].val = rss; -diff --git a/src/util/virprocess.c b/src/util/virprocess.c -index 85d8c8e747..b559a4257e 100644 ---- a/src/util/virprocess.c -+++ b/src/util/virprocess.c -@@ -1784,10 +1784,7 @@ virProcessGetStatInfo(unsigned long long *cpuTime, - virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_STIME], NULL, 10, &systime) < 0 || - virStrToLong_l(proc_stat[VIR_PROCESS_STAT_RSS], NULL, 10, &rss) < 0 || - virStrToLong_i(proc_stat[VIR_PROCESS_STAT_PROCESSOR], NULL, 10, &cpu) < 0) { -- virReportError(VIR_ERR_INTERNAL_ERROR, -- _("cannot parse process status data for pid '%d/%d'"), -- (int) pid, (int) tid); -- return -1; -+ VIR_WARN("cannot parse process status data"); - } - - /* We got jiffies -@@ -1884,8 +1881,7 @@ virProcessGetStatInfo(unsigned long long *cpuTime G_GNUC_UNUSED, - pid_t pid G_GNUC_UNUSED, - pid_t tid G_GNUC_UNUSED) - { -- virReportSystemError(ENOSYS, "%s", -- _("Process statistics data is not supported on this platform")); -+ errno = ENOSYS; - return -1; - } - --- -2.35.0 - diff --git a/libvirt-build-Only-install-libvirt-guests-when-building-libvirtd.patch b/libvirt-build-Only-install-libvirt-guests-when-building-libvirtd.patch deleted file mode 100644 index a2ecb09..0000000 --- a/libvirt-build-Only-install-libvirt-guests-when-building-libvirtd.patch +++ /dev/null @@ -1,75 +0,0 @@ -From f45c99be9258f2d97c1f19b93ae8f5e73f4cb486 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Jim Fehlig -Date: Mon, 10 Jan 2022 11:42:58 -0700 -Subject: [PATCH] build: Only install libvirt-guests when building libvirtd - -libvirt-guests was already moved to the libvirt daemon package in commit -d800c50349. It only needs to be installed when building libvirtd. - -Signed-off-by: Jim Fehlig -Reviewed-by: Andrea Bolognani -(cherry picked from commit 3be5ba11a2c6fcb2dfdffa03ab4f847113f36b85) - -https://bugzilla.redhat.com/show_bug.cgi?id=2042529 ---- - tools/meson.build | 38 ++++++++++++++++++++------------------ - 1 file changed, 20 insertions(+), 18 deletions(-) - -diff --git a/tools/meson.build b/tools/meson.build -index 22fa3604ba..2d0aecb90b 100644 ---- a/tools/meson.build -+++ b/tools/meson.build -@@ -297,29 +297,31 @@ if conf.has('WITH_SANLOCK') - ) - endif - --configure_file( -- input: 'libvirt-guests.sh.in', -- output: '@BASENAME@', -- configuration: tools_conf, -- install: true, -- install_dir: libexecdir, -- install_mode: 'rwxrwxr-x', --) -- --if init_script == 'systemd' -- install_data( -- 'libvirt-guests.sysconf', -- install_dir: sysconfdir / 'sysconfig', -- rename: 'libvirt-guests', -- ) -- -+if conf.has('WITH_LIBVIRTD') - configure_file( -- input: 'libvirt-guests.service.in', -+ input: 'libvirt-guests.sh.in', - output: '@BASENAME@', - configuration: tools_conf, - install: true, -- install_dir: prefix / 'lib' / 'systemd' / 'system', -+ install_dir: libexecdir, -+ install_mode: 'rwxrwxr-x', - ) -+ -+ if init_script == 'systemd' -+ install_data( -+ 'libvirt-guests.sysconf', -+ install_dir: sysconfdir / 'sysconfig', -+ rename: 'libvirt-guests', -+ ) -+ -+ configure_file( -+ input: 'libvirt-guests.service.in', -+ output: '@BASENAME@', -+ configuration: tools_conf, -+ install: true, -+ install_dir: prefix / 'lib' / 'systemd' / 'system', -+ ) -+ endif - endif - - if bash_completion_dep.found() --- -2.35.0 - diff --git a/libvirt-docs-Add-man-page-for-libvirt-guests.patch b/libvirt-docs-Add-man-page-for-libvirt-guests.patch deleted file mode 100644 index de5f819..0000000 --- a/libvirt-docs-Add-man-page-for-libvirt-guests.patch +++ /dev/null @@ -1,217 +0,0 @@ -From 8363046dd5f3e018aaea7b6d9b711fb3d1e417cc Mon Sep 17 00:00:00 2001 -Message-Id: <8363046dd5f3e018aaea7b6d9b711fb3d1e417cc@dist-git> -From: Jim Fehlig -Date: Fri, 7 Jan 2022 14:35:10 -0700 -Subject: [PATCH] docs: Add man page for libvirt-guests - -Signed-off-by: Jim Fehlig -Reviewed-by: Andrea Bolognani -(cherry picked from commit 161727417a91bdddf8f3167cf70c3de2829be81c) - -https://bugzilla.redhat.com/show_bug.cgi?id=2042529 ---- - docs/manpages/index.rst | 1 + - docs/manpages/libvirt-guests.rst | 151 +++++++++++++++++++++++++++++++ - docs/manpages/meson.build | 1 + - libvirt.spec.in | 1 + - tools/libvirt-guests.service.in | 2 +- - 5 files changed, 155 insertions(+), 1 deletion(-) - create mode 100644 docs/manpages/libvirt-guests.rst - -diff --git a/docs/manpages/index.rst b/docs/manpages/index.rst -index fb4a36d46a..8fd0d90041 100644 ---- a/docs/manpages/index.rst -+++ b/docs/manpages/index.rst -@@ -41,6 +41,7 @@ Tools - * `virt-admin(1) `__ - daemon administration interface - * `virsh(1) `__ - management user interface - * `virt-qemu-run(1) `__ - run standalone QEMU instances -+* `libvirt-guests(8) `__ - suspend/resume running libvirt guests - - Key codes - ========= -diff --git a/docs/manpages/libvirt-guests.rst b/docs/manpages/libvirt-guests.rst -new file mode 100644 -index 0000000000..76045ed11a ---- /dev/null -+++ b/docs/manpages/libvirt-guests.rst -@@ -0,0 +1,151 @@ -+============== -+libvirt-guests -+============== -+ -+------------------------------------- -+suspend/resume running libvirt guests -+------------------------------------- -+ -+:Manual section: 8 -+:Manual group: Virtualization Support -+ -+.. contents:: -+ -+SYNOPSIS -+======== -+ -+``libvirt-guests`` *COMMAND* -+ -+ -+DESCRIPTION -+=========== -+ -+``libvirt-guests`` is a service that can be used to coordinate guest and host -+lifecyle actions. By default, ``libvirt-guests`` will suspend running guests -+when the host shuts down, and restore them to their pre-shutdown state when -+the host reboots. -+ -+``libvirt-guests`` is typically under control of systemd. When -+``libvirt-guests.service`` is enabled, systemd will call ``libvirt-guests`` -+with the ``start`` *COMMAND* when the host boots. Conversely, systemd will call -+``libvirt-guests`` with the ``stop`` *COMMAND* when the host shuts down. -+ -+``libvirt-guests`` can be used directly. In addition to the ``start`` and -+``stop`` *COMMAND*\s, it also supports ``status``, ``restart``, ``condrestart``, -+``try-restart``, ``reload``, ``force-reload``, ``gueststatus``, and -+``shutdown`` *COMMAND*\s. -+ -+ -+FILES -+===== -+ -+``libvirt-guests`` defines several variables to control service behavior. -+The default vaule of these variables can be overridden in: -+ -+* ``@SYSCONFDIR@/sysconfig/libvirt-guests`` -+ -+The following variables are supported: -+ -+- URIS=default -+ -+ URIs to check for running guests. Example: -+ ``URIS='default xen:///system xen+tcp://host/system lxc:///system'`` -+ -+- ON_BOOT=start -+ -+ Action taken on host boot -+ -+ * start -+ -+ All guests which were running on shutdown are started on boot regardless -+ of their autostart settings -+ -+ * ignore -+ -+ ``libvirt-guests`` won't start any guest on boot, however, guests marked -+ as autostart will still be automatically started by libvirtd -+ -+- START_DELAY=0 -+ -+ Number of seconds to wait between each guest start. Set to 0 to allow parallel -+ startup. -+ -+- ON_SHUTDOWN=suspend -+ -+ Action taken on host shutdown -+ -+ * suspend -+ -+ All running guests are suspended using virsh managedsave -+ -+ * shutdown -+ -+ All running guests are asked to shutdown. Please be careful with this -+ settings since there is no way to distinguish between a guest which is -+ stuck or ignores shutdown requests and a guest which just needs a long -+ time to shutdown. When setting ON_SHUTDOWN=shutdown, you must also set -+ SHUTDOWN_TIMEOUT to a value suitable for your guests. -+ -+- PARALLEL_SHUTDOWN=0 -+ -+ Number of guests will be shutdown concurrently, taking effect when -+ "ON_SHUTDOWN" is set to "shutdown". If Set to 0, guests will be shutdown one -+ after another. Number of guests on shutdown at any time will not exceed number -+ set in this variable. -+ -+- SHUTDOWN_TIMEOUT=300 -+ -+ Number of seconds we're willing to wait for a guest to shut down. If parallel -+ shutdown is enabled, this timeout applies as a timeout for shutting down all -+ guests on a single URI defined in the variable URIS. If this is 0, then there -+ is no time out (use with caution, as guests might not respond to a shutdown -+ request). The default value is 300 seconds (5 minutes). -+ -+- BYPASS_CACHE=0 -+ -+ If non-zero, try to bypass the file system cache when saving and -+ restoring guests, even though this may give slower operation for -+ some file systems. -+ -+- SYNC_TIME=0 -+ -+ If non-zero, try to sync guest time on domain resume. Be aware, that -+ this requires guest agent with support for time synchronization -+ running in the guest. By default, this functionality is turned off. -+ -+ -+BUGS -+==== -+ -+Please report all bugs you discover. This should be done via either: -+ -+#. the mailing list -+ -+ `https://libvirt.org/contact.html `_ -+ -+#. the bug tracker -+ -+ `https://libvirt.org/bugs.html `_ -+ -+Alternatively, you may report bugs to your software distributor / vendor. -+ -+ -+AUTHORS -+======= -+ -+Please refer to the AUTHORS file distributed with libvirt. -+ -+ -+LICENSE -+======= -+ -+``libvirt-guests`` is distributed under the terms of the GNU LGPL v2.1+. -+This is free software; see the source for copying conditions. There -+is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR -+PURPOSE -+ -+ -+SEE ALSO -+======== -+ -+libvirtd(8), `https://libvirt.org/ `_ -diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build -index 150f45d296..bad9b62a2e 100644 ---- a/docs/manpages/meson.build -+++ b/docs/manpages/meson.build -@@ -21,6 +21,7 @@ docs_man_files = [ - { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') }, - { 'name': 'virt-xml-validate', 'section': '1', 'install': true }, - -+ { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, - { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, - { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('WITH_SANLOCK') }, - { 'name': 'virt-ssh-helper', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, -diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 10c664016a..1a9b233e11 100644 ---- a/tools/libvirt-guests.service.in -+++ b/tools/libvirt-guests.service.in -@@ -6,7 +6,7 @@ After=network.target - After=time-sync.target - After=libvirtd.service - After=virt-guest-shutdown.target --Documentation=man:libvirtd(8) -+Documentation=man:libvirt-guests(8) - Documentation=https://libvirt.org - - [Service] --- -2.35.0 - diff --git a/libvirt-qemu-Validate-domain-definition-even-on-migration.patch b/libvirt-qemu-Validate-domain-definition-even-on-migration.patch deleted file mode 100644 index a20b9bc..0000000 --- a/libvirt-qemu-Validate-domain-definition-even-on-migration.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 84cedeca547585a51f6044186d241a501ff757d2 Mon Sep 17 00:00:00 2001 -Message-Id: <84cedeca547585a51f6044186d241a501ff757d2@dist-git> -From: Michal Privoznik -Date: Mon, 31 Jan 2022 12:55:47 +0100 -Subject: [PATCH] qemu: Validate domain definition even on migration - -When we are about to spawn QEMU, we validate the domain -definition against qemuCaps. Except when domain is/was already -running before (i.e. on incoming migration, snapshots, resume -from a file). However, especially on incoming migration it may -happen that the destination QEMU is different to the source -QEMU, e.g. the destination QEMU may have some devices disabled. - -And we have a function that validates devices/features requested -in domain XML against the desired QEMU capabilities (aka -qemuCaps) - it's virDomainDefValidate() which calls -qemuValidateDomainDef() and qemuValidateDomainDeviceDef() -subsequently. - -But the problem here is that the validation function is -explicitly skipped over in specific scenarios (like incoming -migration, restore from a snapshot or previously saved file). - -This in turn means that we may spawn QEMU and request -device/features it doesn't support. When that happens QEMU fails -to load migration stream: - - qemu-kvm: ... 'virtio-mem-pci' is not a valid device model name - -(NB, while the example shows one particular device, the problem -is paramount) - -This problem is easier to run into since we are slowly moving -validation from qemu_command.c into said validation functions. - -The solution is simple: do the validation in all cases. And while -it may happen that users would be unable to migrate/restore a -guest due to a bug in our validator, spawning QEMU without -validation is worse (especially when you consider that users can -supply their own XMLs for migrate/restore operations - these were -never validated). - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2048435 -Signed-off-by: Michal Privoznik -Reviewed-by: Peter Krempa -(cherry picked from commit 517b8c12b98d7ac0bb4d582e0b491d50d776eb6d) -Signed-off-by: Michal Privoznik ---- - src/qemu/qemu_process.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c -index 5c9ca0fe4f..5c6657a876 100644 ---- a/src/qemu/qemu_process.c -+++ b/src/qemu/qemu_process.c -@@ -5411,11 +5411,7 @@ qemuProcessStartValidate(virQEMUDriver *driver, - - } - -- /* Checks below should not be executed when starting a qemu process for a -- * VM that was running before (migration, snapshots, save). It's more -- * important to start such VM than keep the configuration clean */ -- if ((flags & VIR_QEMU_PROCESS_START_NEW) && -- virDomainDefValidate(vm->def, 0, driver->xmlopt, qemuCaps) < 0) -+ if (virDomainDefValidate(vm->def, 0, driver->xmlopt, qemuCaps) < 0) - return -1; - - if (qemuProcessStartValidateGraphics(vm) < 0) --- -2.35.1 - diff --git a/libvirt-qemu-fix-inactive-snapshot-revert.patch b/libvirt-qemu-fix-inactive-snapshot-revert.patch deleted file mode 100644 index ae4c4cf..0000000 --- a/libvirt-qemu-fix-inactive-snapshot-revert.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1911ebd62779701aae271dd3e047415bfd2cd303 Mon Sep 17 00:00:00 2001 -Message-Id: <1911ebd62779701aae271dd3e047415bfd2cd303@dist-git> -From: =?UTF-8?q?J=C3=A1n=20Tomko?= -Date: Thu, 20 Jan 2022 14:53:33 +0100 -Subject: [PATCH] qemu: fix inactive snapshot revert -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The commit splitting out the qemuSnapshotRevertInactive function -dropped the 'defined = true' line by accident and instead -returned -1, leaving the user with a cryptic error: -error: An error occurred, but the cause is unknown - -https://bugzilla.redhat.com/show_bug.cgi?id=2039136 -https://gitlab.com/libvirt/libvirt/-/issues/266 - -Fixes: 85e4a13c3f19078fb6af5ffb4a80022c142cbc7e -Signed-off-by: Ján Tomko -(cherry picked from commit 76deb656132bb8817ddae4b7f417930c4db824c9) -Signed-off-by: Ján Tomko ---- - src/qemu/qemu_snapshot.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c -index f92e00f9c0..ac7bab90f8 100644 ---- a/src/qemu/qemu_snapshot.c -+++ b/src/qemu/qemu_snapshot.c -@@ -2193,7 +2193,7 @@ qemuSnapshotRevertInactive(virDomainObj *vm, - - if (*inactiveConfig) { - virDomainObjAssignDef(vm, inactiveConfig, false, NULL); -- return -1; -+ defined = true; - } - - if (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | --- -2.35.0 - diff --git a/libvirt-qemu-segmentation-fault-in-virtqemud-executing-qemuDomainUndefineFlags.patch b/libvirt-qemu-segmentation-fault-in-virtqemud-executing-qemuDomainUndefineFlags.patch new file mode 100644 index 0000000..44a8850 --- /dev/null +++ b/libvirt-qemu-segmentation-fault-in-virtqemud-executing-qemuDomainUndefineFlags.patch @@ -0,0 +1,49 @@ +From 71b08cbfc65d779e9e502157e709a3dace0bf4e4 Mon Sep 17 00:00:00 2001 +Message-Id: <71b08cbfc65d779e9e502157e709a3dace0bf4e4@dist-git> +From: Boris Fiuczynski +Date: Tue, 1 Mar 2022 18:47:59 +0100 +Subject: [PATCH] qemu: segmentation fault in virtqemud executing + qemuDomainUndefineFlags + +Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault. + +Stack trace of thread 664419: + #0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=) at ../src/qemu/qemu_driver.c:6618 + #1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=) at ../src/libvirt-domain.c:6519 + #2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=, rerr=0x3ff8287b950, client=) + at src/remote/remote_daemon_dispatch_stubs.h:13080 + #3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=, ret=0x0) + at src/remote/remote_daemon_dispatch_stubs.h:13059 + #4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010) + at ../src/rpc/virnetserverprogram.c:428 + #5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302 + #6 0x000003ff8758c260 in virNetServerProcessMsg (msg=, prog=, client=, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140 + #7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160 + #8 0x000003ff874c49aa in virThreadPoolWorker (opaque=) at ../src/util/virthreadpool.c:164 + #9 0x000003ff874c3f62 in virThreadHelper (data=) at ../src/util/virthread.c:256 + #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6 + #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6 + +Signed-off-by: Boris Fiuczynski +Reviewed-by: Jim Fehlig +Reviewed-by: Michal Privoznik +--- + src/qemu/qemu_driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index b74b0375a7..18f1156862 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, + } + } + +- if (vm->def->os.loader->nvram) { ++ if (vm->def->os.loader && vm->def->os.loader->nvram) { + nvram_path = g_strdup(vm->def->os.loader->nvram); + } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { + qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); +-- +2.35.1 + diff --git a/libvirt-qemuDomainSetupDisk-Initialize-targetPaths.patch b/libvirt-qemuDomainSetupDisk-Initialize-targetPaths.patch deleted file mode 100644 index cdec8db..0000000 --- a/libvirt-qemuDomainSetupDisk-Initialize-targetPaths.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0eec7bae9f59b2693798d25d346243109e92aeff Mon Sep 17 00:00:00 2001 -Message-Id: <0eec7bae9f59b2693798d25d346243109e92aeff@dist-git> -From: Peter Krempa -Date: Tue, 25 Jan 2022 17:49:00 +0100 -Subject: [PATCH] qemuDomainSetupDisk: Initialize 'targetPaths' - -Compiler isn't able to see that 'virDevMapperGetTargets' in cases e.g. -when the devmapper isn't available may not initialize the value in the -pointer passed as the second argument. - -The usage 'qemuDomainSetupDisk' lead to an accidental infinite loop as -previous calls apparently doctored the stack to a point where -'g_slist_concat' would end up in an infinite loop trying to find the end -of the list. - -Fixes: 6c49c2ee9fcb88de02cdc333f666a8e95d60a3b0 -Closes: https://gitlab.com/libvirt/libvirt/-/issues/268 -Signed-off-by: Peter Krempa -Reviewed-by: Andrea Bolognani -(cherry picked from commit ddb2384f0c78a91c40d95afdbc7fe325e95ef2bc) -https://bugzilla.redhat.com/show_bug.cgi?id=2046170 ---- - src/qemu/qemu_namespace.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c -index 23b1160c5e..94453033f5 100644 ---- a/src/qemu/qemu_namespace.c -+++ b/src/qemu/qemu_namespace.c -@@ -251,7 +251,7 @@ qemuDomainSetupDisk(virStorageSource *src, - if (!(tmpPath = virPCIDeviceAddressGetIOMMUGroupDev(&next->nvme->pciAddr))) - return -1; - } else { -- GSList *targetPaths; -+ GSList *targetPaths = NULL; - - if (virStorageSourceIsEmpty(next) || - !virStorageSourceIsLocalStorage(next)) { --- -2.35.1 - diff --git a/libvirt-qemu_command-Generate-memory-only-after-controllers.patch b/libvirt-qemu_command-Generate-memory-only-after-controllers.patch deleted file mode 100644 index 6671005..0000000 --- a/libvirt-qemu_command-Generate-memory-only-after-controllers.patch +++ /dev/null @@ -1,662 +0,0 @@ -From 6f692c60b1d58135f439ad91e95d18540dfa6556 Mon Sep 17 00:00:00 2001 -Message-Id: <6f692c60b1d58135f439ad91e95d18540dfa6556@dist-git> -From: Michal Privoznik -Date: Thu, 27 Jan 2022 11:13:53 +0100 -Subject: [PATCH] qemu_command: Generate memory only after controllers - -Currently, memory device (def->mems) part of cmd line is -generated before any controller. In majority of cases it doesn't -matter because neither of memory devices live on a bus that's -created by an exposed controller (e.g. there's no DIMM -controller, at least not exposed). Except for virtio-mem and -virtio-pmem, which do have a PCI address. And if it so happens -that the device goes onto non-default bus (pci.0) starting such -guest fails, because the controller that creates the desired bus -wasn't processed yet. QEMU processes arguments in order. - -For instance, if virtio-mem has address with bus='0x01' QEMU -refuses to start with the following message: - - Bus 'pci.1' not found - -Similarly for virtio-pmem. I've successfully tested migration and -changing the order does not affect migration stream. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2047271 -Signed-off-by: Michal Privoznik -Reviewed-by: Andrea Bolognani -(cherry picked from commit af23241cfed712f69450e82135d7c7b4899736de) - -Conflicts: -tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args: -tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args: -tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args: -tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args: -tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args: -tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args: -tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args: -tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args: -tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args: -tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args: - These happened because downstream we don't use JSON for -device, - but upstream we do (as of 1a691fe1c84090da80a652c4c80ac00a6134a69b). - -Signed-off-by: Michal Privoznik ---- - src/qemu/qemu_command.c | 6 +++--- - tests/qemuxml2argvdata/hugepages-memaccess.args | 4 ++-- - tests/qemuxml2argvdata/hugepages-memaccess2.args | 4 ++-- - tests/qemuxml2argvdata/hugepages-numa-default-dimm.args | 4 ++-- - .../qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args | 4 ++-- - .../qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args | 4 ++-- - tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args | 8 ++++---- - tests/qemuxml2argvdata/memory-hotplug-dimm.args | 8 ++++---- - .../memory-hotplug-nvdimm-access.x86_64-latest.args | 4 ++-- - .../memory-hotplug-nvdimm-align.x86_64-5.2.0.args | 4 ++-- - .../memory-hotplug-nvdimm-align.x86_64-latest.args | 4 ++-- - .../memory-hotplug-nvdimm-label.x86_64-5.2.0.args | 4 ++-- - .../memory-hotplug-nvdimm-label.x86_64-latest.args | 4 ++-- - .../memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 4 ++-- - .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 4 ++-- - .../memory-hotplug-nvdimm-ppc64-abi-update.args | 4 ++-- - tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args | 4 ++-- - .../memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 4 ++-- - .../memory-hotplug-nvdimm-readonly.x86_64-latest.args | 4 ++-- - .../memory-hotplug-nvdimm.x86_64-latest.args | 4 ++-- - .../memory-hotplug-ppc64-nonuma-abi-update.args | 8 ++++---- - tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args | 8 ++++---- - .../memory-hotplug-virtio-mem.x86_64-latest.args | 8 ++++---- - .../memory-hotplug-virtio-pmem.x86_64-5.2.0.args | 4 ++-- - .../memory-hotplug-virtio-pmem.x86_64-latest.args | 4 ++-- - tests/qemuxml2argvdata/pages-dimm-discard.args | 8 ++++---- - 26 files changed, 65 insertions(+), 65 deletions(-) - -diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c -index d822533ccb..509bab08ef 100644 ---- a/src/qemu/qemu_command.c -+++ b/src/qemu/qemu_command.c -@@ -10543,9 +10543,6 @@ qemuBuildCommandLine(virQEMUDriver *driver, - qemuBuildNumaCommandLine(cfg, def, cmd, priv) < 0) - return NULL; - -- if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) -- return NULL; -- - virUUIDFormat(def->uuid, uuid); - virCommandAddArgList(cmd, "-uuid", uuid, NULL); - -@@ -10595,6 +10592,9 @@ qemuBuildCommandLine(virQEMUDriver *driver, - if (qemuBuildControllersCommandLine(cmd, def, qemuCaps) < 0) - return NULL; - -+ if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) -+ return NULL; -+ - if (qemuBuildHubCommandLine(cmd, def, qemuCaps) < 0) - return NULL; - -diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args -index b89f791697..a369c7f6da 100644 ---- a/tests/qemuxml2argvdata/hugepages-memaccess.args -+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args -@@ -24,8 +24,6 @@ QEMU_AUDIO_DRV=none \ - -numa node,nodeid=2,cpus=2,memdev=ram-node2 \ - -object memory-backend-file,id=ram-node3,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,size=1073741824,host-nodes=3,policy=bind \ - -numa node,nodeid=3,cpus=3,memdev=ram-node3 \ ---object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ ---device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -37,6 +35,8 @@ QEMU_AUDIO_DRV=none \ - -no-acpi \ - -boot strict=on \ - -usb \ -+-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ -+-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ - -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ - -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ - -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args -index 0c296797e9..434ebdaa62 100644 ---- a/tests/qemuxml2argvdata/hugepages-memaccess2.args -+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args -@@ -24,8 +24,6 @@ QEMU_AUDIO_DRV=none \ - -numa node,nodeid=2,cpus=2,memdev=ram-node2 \ - -object memory-backend-file,id=ram-node3,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=off,size=1073741824,host-nodes=3,policy=bind \ - -numa node,nodeid=3,cpus=3,memdev=ram-node3 \ ---object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ ---device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -37,6 +35,8 @@ QEMU_AUDIO_DRV=none \ - -no-acpi \ - -boot strict=on \ - -usb \ -+-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ -+-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ - -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ - -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ - -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args -index f560cabf8e..57bb70346d 100644 ---- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args -+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args -@@ -19,8 +19,6 @@ QEMU_AUDIO_DRV=none \ - -mem-prealloc \ - -mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \ - -numa node,nodeid=0,cpus=0-1,mem=1024 \ ---object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,host-nodes=1-3,policy=bind \ ---device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ - -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ - -display none \ - -no-user-config \ -@@ -32,4 +30,6 @@ QEMU_AUDIO_DRV=none \ - -no-acpi \ - -boot strict=on \ - -usb \ -+-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,host-nodes=1-3,policy=bind \ -+-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ - -msg timestamp=on -diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args -index 8b5665f86e..7d9dcfb4df 100644 ---- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args -+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":1073741824}' \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912}' \ ---device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912}' \ -+-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -audiodev '{"id":"audio1","driver":"none"}' \ - -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ - -msg timestamp=on -diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args -index 8a40e2d79c..04a320d469 100644 ---- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args -+++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ - -smp 8,sockets=1,dies=1,cores=8,threads=1 \ - -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"host-nodes":[3],"policy":"preferred"}' \ - -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ ---object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912,"host-nodes":[3],"policy":"preferred"}' \ ---device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912,"host-nodes":[3],"policy":"preferred"}' \ -+-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -audiodev '{"id":"audio1","driver":"none"}' \ - -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ - -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args -index 907072d55d..b36117f1e8 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args -@@ -17,10 +17,6 @@ QEMU_AUDIO_DRV=none \ - -realtime mlock=off \ - -smp 2,sockets=2,cores=1,threads=1 \ - -numa node,nodeid=0,cpus=0-1,mem=214 \ ---object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ ---device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ ---object memory-backend-ram,id=memdimm2,size=536870912 \ ---device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -32,6 +28,10 @@ QEMU_AUDIO_DRV=none \ - -no-acpi \ - -boot strict=on \ - -usb \ -+-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ -+-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -+-object memory-backend-ram,id=memdimm2,size=536870912 \ -+-device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \ - -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ - -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ - -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args -index 5d87f4a3ef..72c2803c5e 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args -@@ -17,10 +17,6 @@ QEMU_AUDIO_DRV=none \ - -realtime mlock=off \ - -smp 2,sockets=2,cores=1,threads=1 \ - -numa node,nodeid=0,cpus=0-1,mem=214 \ ---object memory-backend-ram,id=memdimm0,size=536870912 \ ---device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ ---object memory-backend-file,id=memdimm1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ ---device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -32,6 +28,10 @@ QEMU_AUDIO_DRV=none \ - -no-acpi \ - -boot strict=on \ - -usb \ -+-object memory-backend-ram,id=memdimm0,size=536870912 \ -+-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ -+-object memory-backend-file,id=memdimm1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ -+-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ - -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ - -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ - -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args -index 3664150c51..94aeadabce 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ ---device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ -+-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args -index 6c28c86004..0b29a6fded 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object memory-backend-ram,id=ram-node0,size=224395264 \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912,align=2097152 \ ---device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912,align=2097152 \ -+-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args -index aa77849079..5045cc8318 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912,"align":2097152}' \ ---device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912,"align":2097152}' \ -+-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args -index c45b401af5..7c67161b78 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object memory-backend-ram,id=ram-node0,size=224395264 \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ ---device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ -+-device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args -index 07863ba87c..9466877699 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ ---device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ -+-device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args -index 3f35d4dca2..c4dae0cfd1 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object memory-backend-ram,id=ram-node0,size=224395264 \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,size=536870912,pmem=on \ ---device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,size=536870912,pmem=on \ -+-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args -index 4ed86feb01..9324535ac3 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"size":536870912,"pmem":true}' \ ---device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"size":536870912,"pmem":true}' \ -+-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args -index ebdb0429d0..55b16c9dc2 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args -@@ -17,8 +17,6 @@ QEMU_AUDIO_DRV=none \ - -realtime mlock=off \ - -smp 2,sockets=2,cores=1,threads=1 \ - -numa node,nodeid=0,cpus=0-1,mem=1024 \ ---object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ ---device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -28,4 +26,6 @@ QEMU_AUDIO_DRV=none \ - -rtc base=utc \ - -no-shutdown \ - -boot strict=on \ -+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ -+-device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -msg timestamp=on -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args -index ebdb0429d0..55b16c9dc2 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args -@@ -17,8 +17,6 @@ QEMU_AUDIO_DRV=none \ - -realtime mlock=off \ - -smp 2,sockets=2,cores=1,threads=1 \ - -numa node,nodeid=0,cpus=0-1,mem=1024 \ ---object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ ---device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -28,4 +26,6 @@ QEMU_AUDIO_DRV=none \ - -rtc base=utc \ - -no-shutdown \ - -boot strict=on \ -+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ -+-device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -msg timestamp=on -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args -index bca2f286ba..b1873c100f 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object memory-backend-ram,id=ram-node0,size=224395264 \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ ---device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ -+-device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args -index 8be7f35cec..4f11d22e00 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ ---device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ -+-device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args -index 307698749e..434a0f91cf 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","prealloc":true,"size":536870912}' \ ---device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","prealloc":true,"size":536870912}' \ -+-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args -index 5380c9e805..e8a6451841 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args -@@ -16,10 +16,6 @@ QEMU_AUDIO_DRV=none \ - -m size=1048576k,slots=16,maxmem=4194304k \ - -realtime mlock=off \ - -smp 1,sockets=1,cores=1,threads=1 \ ---object memory-backend-ram,id=memdimm0,size=536870912 \ ---device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ ---object memory-backend-ram,id=memdimm1,size=536870912 \ ---device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ - -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ - -display none \ - -no-user-config \ -@@ -29,4 +25,8 @@ QEMU_AUDIO_DRV=none \ - -rtc base=utc \ - -no-shutdown \ - -boot strict=on \ -+-object memory-backend-ram,id=memdimm0,size=536870912 \ -+-device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ -+-object memory-backend-ram,id=memdimm1,size=536870912 \ -+-device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ - -msg timestamp=on -diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args -index acff36eb78..181409cde0 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args -@@ -16,10 +16,6 @@ QEMU_AUDIO_DRV=none \ - -m size=1310720k,slots=16,maxmem=4194304k \ - -realtime mlock=off \ - -smp 1,sockets=1,cores=1,threads=1 \ ---object memory-backend-ram,id=memdimm0,size=536870912 \ ---device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ ---object memory-backend-ram,id=memdimm1,size=536870912 \ ---device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ - -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ - -display none \ - -no-user-config \ -@@ -29,4 +25,8 @@ QEMU_AUDIO_DRV=none \ - -rtc base=utc \ - -no-shutdown \ - -boot strict=on \ -+-object memory-backend-ram,id=memdimm0,size=536870912 \ -+-device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ -+-object memory-backend-ram,id=memdimm1,size=536870912 \ -+-device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ - -msg timestamp=on -diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args -index 8747b249da..30b635d365 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args -@@ -18,10 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ ---device virtio-mem-pci,node=0,block-size=2097152,requested-size=536870912,memdev=memvirtiomem0,id=virtiomem0,bus=pci.0,addr=0x2 \ ---object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ ---device virtio-mem-pci,node=0,block-size=2097152,requested-size=1073741824,memdev=memvirtiomem1,id=virtiomem1,bus=pci.0,addr=0x3 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -33,6 +29,10 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ -+-device virtio-mem-pci,node=0,block-size=2097152,requested-size=536870912,memdev=memvirtiomem0,id=virtiomem0,bus=pci.0,addr=0x2 \ -+-object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ -+-device virtio-mem-pci,node=0,block-size=2097152,requested-size=1073741824,memdev=memvirtiomem1,id=virtiomem1,bus=pci.0,addr=0x3 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args -index 17fd98fb88..8fa678c209 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object memory-backend-ram,id=ram-node0,size=2145386496 \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object memory-backend-file,id=memvirtiopmem0,mem-path=/tmp/virtio_pmem,share=on,size=536870912 \ ---device virtio-pmem-pci,memdev=memvirtiopmem0,id=virtiopmem0,bus=pci.0,addr=0x5 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object memory-backend-file,id=memvirtiopmem0,mem-path=/tmp/virtio_pmem,share=on,size=536870912 \ -+-device virtio-pmem-pci,memdev=memvirtiopmem0,id=virtiopmem0,bus=pci.0,addr=0x5 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args -index e5a91b6d33..95ff490cef 100644 ---- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args -+++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args -@@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -smp 2,sockets=2,dies=1,cores=1,threads=1 \ - -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ - -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ ---object '{"qom-type":"memory-backend-file","id":"memvirtiopmem0","mem-path":"/tmp/virtio_pmem","share":true,"size":536870912}' \ ---device virtio-pmem-pci,memdev=memvirtiopmem0,id=virtiopmem0,bus=pci.0,addr=0x5 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -display none \ - -no-user-config \ -@@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ - -no-acpi \ - -boot strict=on \ - -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -+-object '{"qom-type":"memory-backend-file","id":"memvirtiopmem0","mem-path":"/tmp/virtio_pmem","share":true,"size":536870912}' \ -+-device virtio-pmem-pci,memdev=memvirtiopmem0,id=virtiopmem0,bus=pci.0,addr=0x5 \ - -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ - -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ - -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args -index 2ebe9c1350..e63c908549 100644 ---- a/tests/qemuxml2argvdata/pages-dimm-discard.args -+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args -@@ -17,10 +17,6 @@ QEMU_AUDIO_DRV=none \ - -realtime mlock=off \ - -smp 2,sockets=2,cores=1,threads=1 \ - -numa node,nodeid=0,cpus=0-1,mem=1024 \ ---object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=on,size=1073741824,host-nodes=1-3,policy=bind \ ---device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ ---object memory-backend-file,id=memdimm1,mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=on,share=off,size=536870912 \ ---device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ - -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ - -display none \ - -no-user-config \ -@@ -32,4 +28,8 @@ QEMU_AUDIO_DRV=none \ - -no-acpi \ - -boot strict=on \ - -usb \ -+-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=on,size=1073741824,host-nodes=1-3,policy=bind \ -+-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ -+-object memory-backend-file,id=memdimm1,mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=on,share=off,size=536870912 \ -+-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ - -msg timestamp=on --- -2.35.1 - diff --git a/libvirt-remove-sysconfig-files.patch b/libvirt-remove-sysconfig-files.patch deleted file mode 100644 index 0a6fc8d..0000000 --- a/libvirt-remove-sysconfig-files.patch +++ /dev/null @@ -1,846 +0,0 @@ -From fabb2642be1ef180b221af36e5810f819622fc58 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Olaf Hering -Date: Wed, 12 Jan 2022 11:45:08 +0100 -Subject: [PATCH] remove sysconfig files - -sysconfig files are owned by the admin of the host. They have the -liberty to put anything they want into these files. This makes it -difficult to provide different built-in defaults. - -Remove the sysconfig file and place the current desired default into -the service file. - -Local customizations can now go either into /etc/sysconfig/name -or /etc/systemd/system/name.service.d/my-knobs.conf - -Attempt to handle upgrades in libvirt.spec. -Dirty files which are marked as %config will be renamed to file.rpmsave. -To restore them automatically, move stale .rpmsave files away, and -catch any new rpmsave files in %posttrans. - -Signed-off-by: Olaf Hering -Reviewed-by: Andrea Bolognani -(cherry picked from commit 8eb4461645c5738674232ee26c15f5555230b7ff) - -https://bugzilla.redhat.com/show_bug.cgi?id=2042529 ---- - docs/daemons.rst | 21 ++++++++ - docs/remote.html.in | 6 +-- - libvirt.spec.in | 69 +++++++++++++++++++------ - src/ch/meson.build | 5 -- - src/ch/virtchd.service.in | 1 + - src/ch/virtchd.sysconf | 3 -- - src/interface/meson.build | 5 -- - src/interface/virtinterfaced.service.in | 1 + - src/interface/virtinterfaced.sysconf | 3 -- - src/libxl/meson.build | 5 -- - src/libxl/virtxend.service.in | 1 + - src/libxl/virtxend.sysconf | 3 -- - src/locking/meson.build | 5 -- - src/locking/virtlockd.service.in | 1 + - src/locking/virtlockd.sysconf | 3 -- - src/logging/meson.build | 5 -- - src/logging/virtlogd.sysconf | 3 -- - src/lxc/meson.build | 5 -- - src/lxc/virtlxcd.service.in | 1 + - src/lxc/virtlxcd.sysconf | 3 -- - src/meson.build | 16 ------ - src/network/meson.build | 5 -- - src/network/virtnetworkd.service.in | 1 + - src/network/virtnetworkd.sysconf | 3 -- - src/node_device/meson.build | 5 -- - src/node_device/virtnodedevd.service.in | 1 + - src/node_device/virtnodedevd.sysconf | 3 -- - src/nwfilter/meson.build | 5 -- - src/nwfilter/virtnwfilterd.service.in | 1 + - src/nwfilter/virtnwfilterd.sysconf | 3 -- - src/qemu/meson.build | 5 -- - src/qemu/virtqemud.service.in | 1 + - src/qemu/virtqemud.sysconf | 12 ----- - src/remote/libvirtd.service.in | 1 + - src/remote/libvirtd.sysconf | 21 -------- - src/remote/meson.build | 10 ---- - src/remote/virtproxyd.service.in | 1 + - src/remote/virtproxyd.sysconf | 3 -- - src/secret/meson.build | 5 -- - src/secret/virtsecretd.service.in | 1 + - src/secret/virtsecretd.sysconf | 3 -- - src/storage/meson.build | 5 -- - src/storage/virtstoraged.service.in | 1 + - src/storage/virtstoraged.sysconf | 3 -- - src/vbox/meson.build | 5 -- - src/vbox/virtvboxd.service.in | 1 + - src/vbox/virtvboxd.sysconf | 3 -- - src/vz/meson.build | 5 -- - src/vz/virtvzd.service.in | 1 + - src/vz/virtvzd.sysconf | 3 -- - tools/libvirt-guests.sysconf | 50 ------------------ - tools/meson.build | 6 --- - 52 files changed, 93 insertions(+), 245 deletions(-) - delete mode 100644 src/ch/virtchd.sysconf - delete mode 100644 src/interface/virtinterfaced.sysconf - delete mode 100644 src/libxl/virtxend.sysconf - delete mode 100644 src/locking/virtlockd.sysconf - delete mode 100644 src/logging/virtlogd.sysconf - delete mode 100644 src/lxc/virtlxcd.sysconf - delete mode 100644 src/network/virtnetworkd.sysconf - delete mode 100644 src/node_device/virtnodedevd.sysconf - delete mode 100644 src/nwfilter/virtnwfilterd.sysconf - delete mode 100644 src/qemu/virtqemud.sysconf - delete mode 100644 src/remote/libvirtd.sysconf - delete mode 100644 src/remote/virtproxyd.sysconf - delete mode 100644 src/secret/virtsecretd.sysconf - delete mode 100644 src/storage/virtstoraged.sysconf - delete mode 100644 src/vbox/virtvboxd.sysconf - delete mode 100644 src/vz/virtvzd.sysconf - delete mode 100644 tools/libvirt-guests.sysconf - -diff --git a/docs/daemons.rst b/docs/daemons.rst -index c8ae3b0cef..1f9bc34260 100644 ---- a/docs/daemons.rst -+++ b/docs/daemons.rst -@@ -686,3 +686,24 @@ socket unit names into the service. When using these old versions, the - ``unix_sock_dir`` setting in ``virtlockd.conf`` must be changed in - lock-step with the equivalent setting in the unit files to ensure that - ``virtlockd`` can identify the sockets. -+ -+Changing command line options for daemons -+========================================= -+ -+Two ways exist to override the defaults in the provided service files: -+either a systemd "drop-in" configuration file, or a ``/etc/sysconfig/$daemon`` -+file must be created. For example, to change the command line option -+for a debug session of ``libvirtd``, create a file -+``/etc/systemd/system/libvirtd.service.d/debug.conf`` with the following content: -+ -+ :: -+ -+ [Unit] -+ Description=Virtualization daemon, with override from debug.conf -+ -+ [Service] -+ Environment=G_DEBUG=fatal-warnings -+ Environment=LIBVIRTD_ARGS="--listen --verbose" -+ -+After changes to systemd "drop-in" configuration files it is required to run -+``systemctl daemon-reload``. -diff --git a/docs/remote.html.in b/docs/remote.html.in -index efdb2b3253..47fb2d4df3 100644 ---- a/docs/remote.html.in -+++ b/docs/remote.html.in -@@ -138,9 +138,9 @@ Blank lines and comments beginning with # are ignored. - 1 (on) - - Listen for secure TLS connections on the public TCP/IP port. -- Note: it is also necessary to start the server in listening mode by -- running it with --listen or editing /etc/sysconfig/libvirtd by uncommenting the LIBVIRTD_ARGS="--listen" line -- to cause the server to come up in listening mode whenever it is started. -+ Note: it is also necessary to start the server in listening mode -+ by running it with --listen or adding a LIBVIRTD_ARGS="--listen" -+ line to /etc/sysconfig/libvirtd. - - - -diff --git a/src/ch/meson.build b/src/ch/meson.build -index e0afdb390a..a4bf0c6649 100644 ---- a/src/ch/meson.build -+++ b/src/ch/meson.build -@@ -63,11 +63,6 @@ if conf.has('WITH_CH') - 'sockets': [ 'main', 'ro', 'admin' ], - } - -- sysconf_files += { -- 'name': 'virtchd', -- 'file': files('virtchd.sysconf'), -- } -- - virt_install_dirs += [ - localstatedir / 'lib' / 'libvirt' / 'ch', - runstatedir / 'libvirt' / 'ch', -diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in -index cc1e85d1df..f08339f211 100644 ---- a/src/ch/virtchd.service.in -+++ b/src/ch/virtchd.service.in -@@ -18,6 +18,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTCHD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtchd - ExecStart=@sbindir@/virtchd $VIRTCHD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/ch/virtchd.sysconf b/src/ch/virtchd.sysconf -deleted file mode 100644 -index 5ee44be5cf..0000000000 ---- a/src/ch/virtchd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtchd.service systemd unit -- --VIRTCHD_ARGS="--timeout 120" -diff --git a/src/interface/meson.build b/src/interface/meson.build -index 2d4e30362c..f9f378aeb0 100644 ---- a/src/interface/meson.build -+++ b/src/interface/meson.build -@@ -54,9 +54,4 @@ if conf.has('WITH_INTERFACE') - 'name': 'virtinterfaced', - 'in_file': files('virtinterfaced.init.in') - } -- -- sysconf_files += { -- 'name': 'virtinterfaced', -- 'file': files('virtinterfaced.sysconf'), -- } - endif -diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in -index 73d409b81b..3d944e17a9 100644 ---- a/src/interface/virtinterfaced.service.in -+++ b/src/interface/virtinterfaced.service.in -@@ -13,6 +13,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTINTERFACED_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced - ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/interface/virtinterfaced.sysconf b/src/interface/virtinterfaced.sysconf -deleted file mode 100644 -index 0685da31b8..0000000000 ---- a/src/interface/virtinterfaced.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtinterfaced.service systemd unit -- --VIRTINTERFACED_ARGS="--timeout 120" -diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 9793899106..8347a3c966 100644 ---- a/src/libxl/meson.build -+++ b/src/libxl/meson.build -@@ -78,11 +78,6 @@ if conf.has('WITH_LIBXL') - 'in_file': files('virtxend.init.in'), - } - -- sysconf_files += { -- 'name': 'virtxend', -- 'file': files('virtxend.sysconf'), -- } -- - virt_install_dirs += [ - localstatedir / 'lib' / 'libvirt' / 'libxl', - runstatedir / 'libvirt' / 'libxl', -diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in -index 19b19ce3e6..2b5163e179 100644 ---- a/src/libxl/virtxend.service.in -+++ b/src/libxl/virtxend.service.in -@@ -18,6 +18,7 @@ ConditionPathExists=/proc/xen/capabilities - - [Service] - Type=notify -+Environment=VIRTXEND_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtxend - ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/libxl/virtxend.sysconf b/src/libxl/virtxend.sysconf -deleted file mode 100644 -index 301da47e8d..0000000000 ---- a/src/libxl/virtxend.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtxend.service systemd unit -- --VIRTXEND_ARGS="--timeout 120" -diff --git a/src/locking/meson.build b/src/locking/meson.build -index 184d3c3f56..72f7780438 100644 ---- a/src/locking/meson.build -+++ b/src/locking/meson.build -@@ -156,11 +156,6 @@ if conf.has('WITH_LIBVIRTD') - 'in_file': files('virtlockd.init.in'), - } - -- sysconf_files += { -- 'name': 'virtlockd', -- 'file': files('virtlockd.sysconf'), -- } -- - if conf.has('WITH_SANLOCK') - virt_helpers += { - 'name': 'libvirt_sanlock_helper', -diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index 4a6fab05ab..19271d1e7d 100644 ---- a/src/locking/virtlockd.service.in -+++ b/src/locking/virtlockd.service.in -@@ -7,6 +7,7 @@ Documentation=man:virtlockd(8) - Documentation=https://libvirt.org - - [Service] -+Environment=VIRTLOCKD_ARGS= - EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd - ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS - ExecReload=/bin/kill -USR1 $MAINPID -diff --git a/src/locking/virtlockd.sysconf b/src/locking/virtlockd.sysconf -deleted file mode 100644 -index 03aea9e1bc..0000000000 ---- a/src/locking/virtlockd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtlockd.service systemd unit -- --VIRTLOCKD_ARGS="" -diff --git a/src/logging/meson.build b/src/logging/meson.build -index 89e06a0d5a..7066f16fad 100644 ---- a/src/logging/meson.build -+++ b/src/logging/meson.build -@@ -101,11 +101,6 @@ if conf.has('WITH_LIBVIRTD') - 'name': 'virtlogd', - 'in_file': files('virtlogd.init.in'), - } -- -- sysconf_files += { -- 'name': 'virtlogd', -- 'file': files('virtlogd.sysconf'), -- } - endif - - log_inc_dir = include_directories('.') -diff --git a/src/logging/virtlogd.sysconf b/src/logging/virtlogd.sysconf -deleted file mode 100644 -index 67993e83ce..0000000000 ---- a/src/logging/virtlogd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtlogd.service systemd unit -- --VIRTLOGD_ARGS="" -diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index ad5c659dba..c1f71b43e1 100644 ---- a/src/lxc/meson.build -+++ b/src/lxc/meson.build -@@ -175,11 +175,6 @@ if conf.has('WITH_LXC') - 'in_file': files('virtlxcd.init.in'), - } - -- sysconf_files += { -- 'name': 'virtlxcd', -- 'file': files('virtlxcd.sysconf'), -- } -- - virt_install_dirs += [ - localstatedir / 'lib' / 'libvirt' / 'lxc', - runstatedir / 'libvirt' / 'lxc', -diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in -index 3af7c1a52d..d58bde9f5d 100644 ---- a/src/lxc/virtlxcd.service.in -+++ b/src/lxc/virtlxcd.service.in -@@ -18,6 +18,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTLXCD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd - ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/lxc/virtlxcd.sysconf b/src/lxc/virtlxcd.sysconf -deleted file mode 100644 -index 119a4a23f3..0000000000 ---- a/src/lxc/virtlxcd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtlxcd.service systemd unit -- --VIRTLXCD_ARGS="--timeout 120" -diff --git a/src/meson.build b/src/meson.build -index 2408344ef7..fc6c77f5d1 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -208,12 +208,6 @@ virt_daemon_units = [] - # * in_file - source init file (required) - openrc_init_files = [] - --# sysconf_files --# install libvirt daemon sysconf files --# * name - daemon name (required) --# * file - source sysconf file (required) --sysconf_files = [] -- - # virt_install_dirs: - # list of directories to create during installation - virt_install_dirs = [] -@@ -868,16 +862,6 @@ if conf.has('WITH_LIBVIRTD') - endif - endif - --if init_script != 'none' -- foreach sysconf : sysconf_files -- install_data( -- sysconf['file'], -- install_dir: sysconfdir / 'sysconfig', -- rename: [ sysconf['name'] ], -- ) -- endforeach --endif -- - if conf.has('WITH_DTRACE_PROBES') - custom_target( - 'libvirt_functions.stp', -diff --git a/src/network/meson.build b/src/network/meson.build -index d6fb624bb7..e7c43bc4c4 100644 ---- a/src/network/meson.build -+++ b/src/network/meson.build -@@ -72,11 +72,6 @@ if conf.has('WITH_NETWORK') - 'in_file': files('virtnetworkd.init.in'), - } - -- sysconf_files += { -- 'name': 'virtnetworkd', -- 'file': files('virtnetworkd.sysconf'), -- } -- - virt_install_dirs += [ - localstatedir / 'lib' / 'libvirt' / 'network', - localstatedir / 'lib' / 'libvirt' / 'dnsmasq', -diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in -index 4c39d2a5d7..3decfbbf1d 100644 ---- a/src/network/virtnetworkd.service.in -+++ b/src/network/virtnetworkd.service.in -@@ -16,6 +16,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTNETWORKD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd - ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/network/virtnetworkd.sysconf b/src/network/virtnetworkd.sysconf -deleted file mode 100644 -index 93f3a7a327..0000000000 ---- a/src/network/virtnetworkd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtnetworkd.service systemd unit -- --VIRTNETWORKD_ARGS="--timeout 120" -diff --git a/src/node_device/meson.build b/src/node_device/meson.build -index 15f9c3ad29..5013d825b3 100644 ---- a/src/node_device/meson.build -+++ b/src/node_device/meson.build -@@ -62,9 +62,4 @@ if conf.has('WITH_NODE_DEVICES') - 'name': 'virtnodedevd', - 'in_file': files('virtnodedevd.init.in'), - } -- -- sysconf_files += { -- 'name': 'virtnodedevd', -- 'file': files('virtnodedevd.sysconf'), -- } - endif -diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in -index d2453dd620..688cf89822 100644 ---- a/src/node_device/virtnodedevd.service.in -+++ b/src/node_device/virtnodedevd.service.in -@@ -13,6 +13,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTNODEDEVD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd - ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/node_device/virtnodedevd.sysconf b/src/node_device/virtnodedevd.sysconf -deleted file mode 100644 -index fa7faa3a79..0000000000 ---- a/src/node_device/virtnodedevd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtnodedevd.service systemd unit -- --VIRTNODEDEVD_ARGS="--timeout 120" -diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build -index a21e575925..ebbe712906 100644 ---- a/src/nwfilter/meson.build -+++ b/src/nwfilter/meson.build -@@ -61,10 +61,5 @@ if conf.has('WITH_NWFILTER') - 'in_file': files('virtnwfilterd.init.in'), - } - -- sysconf_files += { -- 'name': 'virtnwfilterd', -- 'file': files('virtnwfilterd.sysconf'), -- } -- - subdir('xml') - endif -diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in -index dda7c01a3d..36d00b58f0 100644 ---- a/src/nwfilter/virtnwfilterd.service.in -+++ b/src/nwfilter/virtnwfilterd.service.in -@@ -13,6 +13,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTNWFILTERD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd - ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/nwfilter/virtnwfilterd.sysconf b/src/nwfilter/virtnwfilterd.sysconf -deleted file mode 100644 -index 80cc645ba5..0000000000 ---- a/src/nwfilter/virtnwfilterd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtnwfilterd.service systemd unit -- --VIRTNWFILTERD_ARGS="--timeout 120" -diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 66ef594006..5f82f687c1 100644 ---- a/src/qemu/meson.build -+++ b/src/qemu/meson.build -@@ -165,11 +165,6 @@ if conf.has('WITH_QEMU') - 'in_file': files('virtqemud.init.in'), - } - -- sysconf_files += { -- 'name': 'virtqemud', -- 'file': files('virtqemud.sysconf'), -- } -- - if conf.has('WITH_SYSCTL') - install_data( - 'postcopy-migration.sysctl', -diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in -index 20e1b43a6e..551eb4d405 100644 ---- a/src/qemu/virtqemud.service.in -+++ b/src/qemu/virtqemud.service.in -@@ -20,6 +20,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTQEMUD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud - ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf -deleted file mode 100644 -index 87b626e3ed..0000000000 ---- a/src/qemu/virtqemud.sysconf -+++ /dev/null -@@ -1,12 +0,0 @@ --# Customizations for the virtqemud.service systemd unit -- --VIRTQEMUD_ARGS="--timeout 120" -- --# Override the QEMU/SDL default audio driver probing when --# starting virtual machines using SDL graphics --# --# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio --# is enabled in /etc/libvirt/qemu.conf --#QEMU_AUDIO_DRV=sdl --# --#SDL_AUDIODRIVER=pulse -diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index cc0d4e3693..5d4d412fcc 100644 ---- a/src/remote/libvirtd.service.in -+++ b/src/remote/libvirtd.service.in -@@ -28,6 +28,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=LIBVIRTD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd - ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/remote/libvirtd.sysconf b/src/remote/libvirtd.sysconf -deleted file mode 100644 -index 18aec1ba67..0000000000 ---- a/src/remote/libvirtd.sysconf -+++ /dev/null -@@ -1,21 +0,0 @@ --# Customizations for the libvirtd.service systemd unit -- --# Default behaviour is for libvirtd.service to start on boot --# so that VM autostart can be performed. We then want it to --# shutdown again if nothing was started and rely on systemd --# socket activation to start it again when some client app --# connects. --LIBVIRTD_ARGS="--timeout 120" -- --# If systemd socket activation is disabled, then the following --# can be used to listen on TCP/TLS sockets --#LIBVIRTD_ARGS="--listen" -- --# Override the QEMU/SDL default audio driver probing when --# starting virtual machines using SDL graphics --# --# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio --# is enabled in /etc/libvirt/qemu.conf --#QEMU_AUDIO_DRV=sdl --# --#SDL_AUDIODRIVER=pulse -diff --git a/src/remote/meson.build b/src/remote/meson.build -index 0a188268b5..fc98d0e5be 100644 ---- a/src/remote/meson.build -+++ b/src/remote/meson.build -@@ -204,11 +204,6 @@ if conf.has('WITH_REMOTE') - 'confd': files('libvirtd.confd'), - } - -- sysconf_files += { -- 'name': 'libvirtd', -- 'file': files('libvirtd.sysconf'), -- } -- - virt_daemons += { - 'name': 'virtproxyd', - 'c_args': [ -@@ -239,11 +234,6 @@ if conf.has('WITH_REMOTE') - 'confd': files('virtproxyd.confd'), - } - -- sysconf_files += { -- 'name': 'virtproxyd', -- 'file': files('virtproxyd.sysconf'), -- } -- - virt_install_dirs += [ - localstatedir / 'log' / 'libvirt', - ] -diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in -index f43ce9ee6e..10e8cf7263 100644 ---- a/src/remote/virtproxyd.service.in -+++ b/src/remote/virtproxyd.service.in -@@ -13,6 +13,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTPROXYD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd - ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/remote/virtproxyd.sysconf b/src/remote/virtproxyd.sysconf -deleted file mode 100644 -index 0fc5c61096..0000000000 ---- a/src/remote/virtproxyd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtproxyd.service systemd unit -- --VIRTPROXYD_ARGS="--timeout 120" -diff --git a/src/secret/meson.build b/src/secret/meson.build -index a487055cde..efc0ebb1e6 100644 ---- a/src/secret/meson.build -+++ b/src/secret/meson.build -@@ -43,9 +43,4 @@ if conf.has('WITH_SECRETS') - 'name': 'virtsecretd', - 'in_file': files('virtsecretd.init.in'), - } -- -- sysconf_files += { -- 'name': 'virtsecretd', -- 'file': files('virtsecretd.sysconf'), -- } - endif -diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in -index 8444142a3a..cbd63fe0b2 100644 ---- a/src/secret/virtsecretd.service.in -+++ b/src/secret/virtsecretd.service.in -@@ -13,6 +13,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTSECRETD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd - ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/secret/virtsecretd.sysconf b/src/secret/virtsecretd.sysconf -deleted file mode 100644 -index 2247d05964..0000000000 ---- a/src/secret/virtsecretd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtsecretd.service systemd unit -- --VIRTSECRETD_ARGS="--timeout 120" -diff --git a/src/storage/meson.build b/src/storage/meson.build -index d1aa66b147..c43707461d 100644 ---- a/src/storage/meson.build -+++ b/src/storage/meson.build -@@ -125,11 +125,6 @@ if conf.has('WITH_STORAGE') - 'name': 'virtstoraged', - 'in_file': files('virtstoraged.init.in'), - } -- -- sysconf_files += { -- 'name': 'virtstoraged', -- 'file': files('virtstoraged.sysconf'), -- } - endif - - if conf.has('WITH_STORAGE_DISK') -diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in -index fc3e9a1b69..f72f8426fd 100644 ---- a/src/storage/virtstoraged.service.in -+++ b/src/storage/virtstoraged.service.in -@@ -15,6 +15,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTSTORAGED_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged - ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/storage/virtstoraged.sysconf b/src/storage/virtstoraged.sysconf -deleted file mode 100644 -index 122373eb7c..0000000000 ---- a/src/storage/virtstoraged.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtstoraged.service systemd unit -- --VIRTSTORAGED_ARGS="--timeout 120" -diff --git a/src/vbox/meson.build b/src/vbox/meson.build -index df0cfb40e8..240f2389a9 100644 ---- a/src/vbox/meson.build -+++ b/src/vbox/meson.build -@@ -68,9 +68,4 @@ if conf.has('WITH_VBOX') - 'name': 'virtvboxd', - 'in_file': files('virtvboxd.init.in'), - } -- -- sysconf_files += { -- 'name': 'virtvboxd', -- 'file': files('virtvboxd.sysconf'), -- } - endif -diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in -index ebb31dde07..cfdafc39d2 100644 ---- a/src/vbox/virtvboxd.service.in -+++ b/src/vbox/virtvboxd.service.in -@@ -14,6 +14,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTVBOXD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd - ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/vbox/virtvboxd.sysconf b/src/vbox/virtvboxd.sysconf -deleted file mode 100644 -index 37ad353d54..0000000000 ---- a/src/vbox/virtvboxd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtvboxd.service systemd unit -- --VIRTVBOXD_ARGS="--timeout 120" -diff --git a/src/vz/meson.build b/src/vz/meson.build -index 14f7280f66..d102696943 100644 ---- a/src/vz/meson.build -+++ b/src/vz/meson.build -@@ -58,9 +58,4 @@ if conf.has('WITH_VZ') - 'name': 'virtvzd', - 'in_file': files('virtvzd.init.in'), - } -- -- sysconf_files += { -- 'name': 'virtvzd', -- 'file': files('virtvzd.sysconf'), -- } - endif -diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in -index f551cb8fbf..7636bf2b9e 100644 ---- a/src/vz/virtvzd.service.in -+++ b/src/vz/virtvzd.service.in -@@ -14,6 +14,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify -+Environment=VIRTVZD_ARGS="--timeout 120" - EnvironmentFile=-@sysconfdir@/sysconfig/virtvzd - ExecStart=@sbindir@/virtvzd $VIRTVZD_ARGS - ExecReload=/bin/kill -HUP $MAINPID -diff --git a/src/vz/virtvzd.sysconf b/src/vz/virtvzd.sysconf -deleted file mode 100644 -index a86b9dfb6c..0000000000 ---- a/src/vz/virtvzd.sysconf -+++ /dev/null -@@ -1,3 +0,0 @@ --# Customizations for the virtvzd.service systemd unit -- --VIRTVZD_ARGS="--timeout 120" -diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf -deleted file mode 100644 -index 4f83edab90..0000000000 ---- a/tools/libvirt-guests.sysconf -+++ /dev/null -@@ -1,50 +0,0 @@ --# Customizations for the libvirt-guests.service systemd unit -- --# URIs to check for running guests --# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' --#URIS=default -- --# action taken on host boot --# - start all guests which were running on shutdown are started on boot --# regardless on their autostart settings --# - ignore libvirt-guests init script won't start any guest on boot, however, --# guests marked as autostart will still be automatically started by --# libvirtd --#ON_BOOT=start -- --# Number of seconds to wait between each guest start. Set to 0 to allow --# parallel startup. --#START_DELAY=0 -- --# action taken on host shutdown --# - suspend all running guests are suspended using virsh managedsave --# - shutdown all running guests are asked to shutdown. Please be careful with --# this settings since there is no way to distinguish between a --# guest which is stuck or ignores shutdown requests and a guest --# which just needs a long time to shutdown. When setting --# ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a --# value suitable for your guests. --#ON_SHUTDOWN=suspend -- --# Number of guests will be shutdown concurrently, taking effect when --# "ON_SHUTDOWN" is set to "shutdown". If Set to 0, guests will be shutdown one --# after another. Number of guests on shutdown at any time will not exceed number --# set in this variable. --#PARALLEL_SHUTDOWN=0 -- --# Number of seconds we're willing to wait for a guest to shut down. If parallel --# shutdown is enabled, this timeout applies as a timeout for shutting down all --# guests on a single URI defined in the variable URIS. If this is 0, then there --# is no time out (use with caution, as guests might not respond to a shutdown --# request). The default value is 300 seconds (5 minutes). --#SHUTDOWN_TIMEOUT=300 -- --# If non-zero, try to bypass the file system cache when saving and --# restoring guests, even though this may give slower operation for --# some file systems. --#BYPASS_CACHE=0 -- --# If non-zero, try to sync guest time on domain resume. Be aware, that --# this requires guest agent with support for time synchronization --# running in the guest. By default, this functionality is turned off. --#SYNC_TIME=1 -diff --git a/tools/meson.build b/tools/meson.build -index 2d0aecb90b..f4b4a16c29 100644 ---- a/tools/meson.build -+++ b/tools/meson.build -@@ -308,12 +308,6 @@ if conf.has('WITH_LIBVIRTD') - ) - - if init_script == 'systemd' -- install_data( -- 'libvirt-guests.sysconf', -- install_dir: sysconfdir / 'sysconfig', -- rename: 'libvirt-guests', -- ) -- - configure_file( - input: 'libvirt-guests.service.in', - output: '@BASENAME@', --- -2.35.0 - diff --git a/libvirt-util-Fix-machined-servicename.patch b/libvirt-util-Fix-machined-servicename.patch deleted file mode 100644 index bdab8fb..0000000 --- a/libvirt-util-Fix-machined-servicename.patch +++ /dev/null @@ -1,71 +0,0 @@ -From f38b129e38b73cb20a2d858de7b593d09380e548 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Martin Kletzander -Date: Wed, 23 Feb 2022 10:45:28 +0100 -Subject: [PATCH] util: Fix machined servicename - -Commit 4e42686adef8 wrongly assumed how g_variant_new_parsed() works and broke -starting of domains on systems with systemd (machined). - -Signed-off-by: Martin Kletzander -Reviewed-by: Jiri Denemark -(cherry picked from commit a64e666a112d4d6299d1b73704d176283bc42b19) - -https://bugzilla.redhat.com/show_bug.cgi?id=1868537 - -Signed-off-by: Martin Kletzander ---- - src/util/virsystemd.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c -index f156c2f39a..a8af80c495 100644 ---- a/src/util/virsystemd.c -+++ b/src/util/virsystemd.c -@@ -360,6 +360,7 @@ int virSystemdCreateMachine(const char *name, - g_autofree char *creatorname = NULL; - g_autofree char *slicename = NULL; - g_autofree char *scopename = NULL; -+ g_autofree char *servicename = NULL; - static int hasCreateWithNetwork = 1; - - if ((rc = virSystemdHasMachined()) < 0) -@@ -369,6 +370,7 @@ int virSystemdCreateMachine(const char *name, - return -1; - - creatorname = g_strdup_printf("libvirt-%s", drivername); -+ servicename = g_strdup_printf("virt%sd.service", drivername); - - if (partition) { - if (!(slicename = virSystemdMakeSliceName(partition))) -@@ -440,11 +442,10 @@ int virSystemdCreateMachine(const char *name, - gnicindexes = g_variant_new_fixed_array(G_VARIANT_TYPE("i"), - nicindexes, nnicindexes, sizeof(int)); - gprops = g_variant_new_parsed("[('Slice', <%s>)," -- " ('After', <['libvirtd.service']>)," -- " ('After', <['virt%sd.service']>)," -+ " ('After', <['libvirtd.service', %s]>)," - " ('Before', <['virt-guest-shutdown.target']>)]", - slicename, -- drivername); -+ servicename); - message = g_variant_new("(s@ayssus@ai@a(sv))", - name, - guuid, -@@ -490,11 +491,10 @@ int virSystemdCreateMachine(const char *name, - guuid = g_variant_new_fixed_array(G_VARIANT_TYPE("y"), - uuid, 16, sizeof(unsigned char)); - gprops = g_variant_new_parsed("[('Slice', <%s>)," -- " ('After', <['libvirtd.service']>)," -- " ('After', <['virt%sd.service']>)," -+ " ('After', <['libvirtd.service', %s]>)," - " ('Before', <['virt-guest-shutdown.target']>)]", - slicename, -- drivername); -+ servicename); - message = g_variant_new("(s@ayssus@a(sv))", - name, - guuid, --- -2.35.1 - diff --git a/libvirt.spec b/libvirt.spec index 0825ce5..0720d4f 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -227,8 +227,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 8.0.0 -Release: 5%{?dist}%{?extra_release} +Version: 8.1.0 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ URL: https://libvirt.org/ @@ -239,16 +239,7 @@ Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz Source1: symlinks Patch1: libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch -Patch2: libvirt-build-Only-install-libvirt-guests-when-building-libvirtd.patch -Patch3: libvirt-docs-Add-man-page-for-libvirt-guests.patch -Patch4: libvirt-remove-sysconfig-files.patch -Patch5: libvirt-qemu-fix-inactive-snapshot-revert.patch -Patch6: libvirt-Revert-report-error-when-virProcessGetStatInfo-is-unable-to-parse-data.patch -Patch7: libvirt-qemuDomainSetupDisk-Initialize-targetPaths.patch -Patch8: libvirt-qemu_command-Generate-memory-only-after-controllers.patch -Patch9: libvirt-qemu-Validate-domain-definition-even-on-migration.patch -Patch10: libvirt-Make-systemd-unit-ordering-more-robust.patch -Patch11: libvirt-util-Fix-machined-servicename.patch +Patch2: libvirt-qemu-segmentation-fault-in-virtqemud-executing-qemuDomainUndefineFlags.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -312,7 +303,6 @@ BuildRequires: sanlock-devel >= 2.4 BuildRequires: libpcap-devel >= 1.5.0 BuildRequires: libnl3-devel BuildRequires: libselinux-devel -BuildRequires: dnsmasq >= 2.41 BuildRequires: iptables BuildRequires: ebtables BuildRequires: module-init-tools @@ -1226,20 +1216,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) %meson_install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.a -%if %{with_wireshark} -rm -f $RPM_BUILD_ROOT%{wireshark_plugindir}/libvirt.la -%endif - # We don't want to install /etc/libvirt/qemu/networks in the main %%files list # because if the admin wants to delete the default network completely, we don't # want to end up re-incarnating it on every RPM upgrade. @@ -1696,8 +1672,6 @@ exit 0 %files daemon -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ - %{_unitdir}/libvirtd.service %{_unitdir}/libvirtd.socket %{_unitdir}/libvirtd-ro.socket @@ -1729,7 +1703,9 @@ exit 0 %dir %{_datadir}/libvirt/ %ghost %dir %{_rundir}/libvirt/ +%ghost %dir %{_rundir}/libvirt/common/ +%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/ @@ -1804,6 +1780,7 @@ exit 0 %{_unitdir}/virtinterfaced-ro.socket %{_unitdir}/virtinterfaced-admin.socket %attr(0755, root, root) %{_sbindir}/virtinterfaced +%ghost %dir %{_rundir}/libvirt/interface/ %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so %{_mandir}/man8/virtinterfaced.8* @@ -1839,6 +1816,7 @@ exit 0 %{_unitdir}/virtnodedevd-ro.socket %{_unitdir}/virtnodedevd-admin.socket %attr(0755, root, root) %{_sbindir}/virtnodedevd +%ghost %dir %{_rundir}/libvirt/nodedev/ %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so %{_mandir}/man8/virtnodedevd.8* @@ -1853,6 +1831,8 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtnwfilterd %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %ghost %dir %{_rundir}/libvirt/network/ +%ghost %dir %{_rundir}/libvirt/nwfilter-binding/ +%ghost %dir %{_rundir}/libvirt/nwfilter/ %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so %{_mandir}/man8/virtnwfilterd.8* @@ -1865,6 +1845,8 @@ exit 0 %{_unitdir}/virtsecretd-ro.socket %{_unitdir}/virtsecretd-admin.socket %attr(0755, root, root) %{_sbindir}/virtsecretd +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/ +%ghost %dir %{_rundir}/libvirt/secrets/ %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so %{_mandir}/man8/virtsecretd.8* @@ -1880,6 +1862,9 @@ exit 0 %{_unitdir}/virtstoraged-admin.socket %attr(0755, root, root) %{_sbindir}/virtstoraged %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/autostart/ +%ghost %dir %{_rundir}/libvirt/storage/ %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so %{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so @@ -1938,12 +1923,24 @@ exit 0 %{_unitdir}/virtqemud-admin.socket %attr(0755, root, root) %{_sbindir}/virtqemud %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/autostart/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %ghost %dir %{_rundir}/libvirt/qemu/ +%ghost %dir %{_rundir}/libvirt/qemu/dbus/ +%ghost %dir %{_rundir}/libvirt/qemu/slirp/ +%ghost %dir %{_rundir}/libvirt/qemu/swtpm/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/checkpoint/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/dump/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/nvram/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ram/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/save/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/snapshot/ %dir %attr(0750, root, root) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug @@ -1966,6 +1963,8 @@ exit 0 %{_unitdir}/virtlxcd-admin.socket %attr(0755, root, root) %{_sbindir}/virtlxcd %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/lxc/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/lxc/autostart/ %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc %ghost %dir %{_rundir}/libvirt/lxc/ @@ -1990,11 +1989,17 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/libxl/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/libxl/autostart/ %{_datadir}/augeas/lenses/libvirtd_libxl.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ %ghost %dir %{_rundir}/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/channel/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/channel/target/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/dump/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/save/ %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so %{_mandir}/man8/virtxend.8* %endif @@ -2064,6 +2069,7 @@ exit 0 %files libs -f %{name}.lang %license COPYING COPYING.LESSER +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf %{_libdir}/libvirt.so.* @@ -2072,7 +2078,6 @@ exit 0 %{_libdir}/libvirt-admin.so.* %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/ -%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %{_datadir}/systemtap/tapset/libvirt_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp @@ -2140,6 +2145,13 @@ exit 0 %changelog +* Fri Mar 4 2022 Jiri Denemark - 8.1.0-1 +- Rebased to libvirt-8.1.0 (rhbz#2060313) +- The rebase also fixes the following bugs: + rhbz#1643868, rhbz#2045953, rhbz#1910856, rhbz#2051451, rhbz#1745868 + rhbz#2040548, rhbz#2041665, rhbz#1999372, rhbz#2038045, rhbz#2045959 + rhbz#2046024, rhbz#2040555, rhbz#2057067, rhbz#2037146, rhbz#2036300 + * Thu Feb 24 2022 Jiri Denemark - 8.0.0-5 - Make systemd unit ordering more robust (rhbz#1868537) - util: Fix machined servicename (rhbz#1868537) diff --git a/sources b/sources index 776e466..50c72df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-8.0.0.tar.xz) = e84cf2753d3c57cfe5aadbb6601fa76e0ba750471c1c24631720fe64376c3599ea252863ec671a50527e4fb380ffe0c2f02f07705b4b87d373ccf3e516ff4b1c +SHA512 (libvirt-8.1.0.tar.xz) = 5db227b78f48e35f917030eeb45ce9d0f7e868c5ce75da496ca06fad175ad6b026173b2fb78415c0103a61af24aec78d89bcebdf60b817d8ff6e84dc926faa97 diff --git a/symlinks b/symlinks index 54c634d..90f181c 100644 --- a/symlinks +++ b/symlinks @@ -86,8 +86,8 @@ tests/qemuxml2argvdata/aarch64-gic-none.args aarch64-gic-v2.args tests/qemuxml2argvdata/cpu-check-full.args cpu-check-none.args tests/qemuxml2argvdata/cpu-check-partial.args cpu-check-none.args tests/qemuxml2argvdata/cpu-numa-memshared-1.xml cpu-numa-memshared.xml -tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args disk-backing-chains-noindex.x86_64-2.12.0.args tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args disk-backing-chains-noindex.x86_64-latest.args +tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args disk-backing-chains-index.x86_64-4.1.0.args tests/qemuxml2argvdata/mach-virt-console-native.args mach-virt-serial-native.args tests/qemuxml2argvdata/mach-virt-serial+console-native.args mach-virt-serial-native.args tests/qemuxml2argvdata/mach-virt-serial-compat.args mach-virt-serial-native.args