commit b41b0442891e9a58ac532faaf149851993622aa2 Author: James Antill Date: Mon Aug 8 14:10:43 2022 -0400 Import rpm: 4aa5c416e0e962f82ce124cae00474e2f39d7d2e diff --git a/.abignore b/.abignore new file mode 100644 index 0000000..7cd584b --- /dev/null +++ b/.abignore @@ -0,0 +1,31 @@ +[suppress_function] +symbol_version_regexp = LIBVIRT_PRIVATE.* +soname_regexp = libvirt\\.so.* + +[suppress_function] +symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.* +soname_regexp = libvirt-admin\\.so.* + +[suppress_variable] +symbol_version_regexp = LIBVIRT_PRIVATE.* +soname_regexp = libvirt\\.so.* + +[suppress_variable] +symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.* +soname_regexp = libvirt-admin\\.so.* + +[suppress_function] +symbol_version_regexp = .* +soname_regexp = libvirt_storage_.*\\.so.* + +[suppress_variable] +symbol_version_regexp = .* +soname_regexp = libvirt_storage_.*\\.so.* + +[suppress_function] +symbol_version_regexp = .* +soname_regexp = libvirt_driver_.*\\.so.* + +[suppress_variable] +symbol_version_regexp = .* +soname_regexp = libvirt_driver_.*\\.so.* diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fbb5a7e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libvirt-8.0.0.tar.xz diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..9693dda --- /dev/null +++ b/gating.yaml @@ -0,0 +1,9 @@ +# recipients: libvirt-qe +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +subject_type: brew-build +rules: + - !PassingTestCaseRule {test_case_name: libvirt-ci.libvirt.brew-build.gating.x86_64.tier1.functional} + - !PassingTestCaseRule {test_case_name: libvirt-ci.libvirt-python.brew-build.gating.x86_64.tier1.functional} diff --git a/libvirt-RHEL-Add-rhel-machine-types-to-qemuDomainMachineNeedsFDC.patch b/libvirt-RHEL-Add-rhel-machine-types-to-qemuDomainMachineNeedsFDC.patch new file mode 100644 index 0000000..df16973 --- /dev/null +++ b/libvirt-RHEL-Add-rhel-machine-types-to-qemuDomainMachineNeedsFDC.patch @@ -0,0 +1,47 @@ +From f0d0a6a9701522eee013682eb0ef566ef7cdac61 Mon Sep 17 00:00:00 2001 +Message-Id: +From: =?UTF-8?q?J=C3=A1n=20Tomko?= +Date: Mon, 22 Feb 2016 12:51:51 +0100 +Subject: [PATCH] RHEL: Add rhel machine types to qemuDomainMachineNeedsFDC + +RHEL-only. + +pc-q35-rhel7.0.0 and pc-q35-rhel7.1.0 do not need an explicit +isa-fdc controller. + +https://bugzilla.redhat.com/show_bug.cgi?id=1227880 + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_domain.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c +index a8401bac30..40fe9985e6 100644 +--- a/src/qemu/qemu_domain.c ++++ b/src/qemu/qemu_domain.c +@@ -8767,8 +8767,19 @@ qemuDomainHasBuiltinIDE(const virDomainDef *def) + bool + qemuDomainNeedsFDC(const virDomainDef *def) + { +- /* all supported Q35 machines need explicit FDC */ +- return qemuDomainIsQ35(def); ++ const char *p; ++ ++ /* all supported Q35 machines need explicit FDC except for old RHEL-7 ++ * machine types */ ++ if (!qemuDomainIsQ35(def)) ++ return false; ++ ++ if ((p = STRSKIP(def->os.machine, "pc-q35-")) && ++ (STRPREFIX(p, "rhel7.0.0") || ++ STRPREFIX(p, "rhel7.1.0"))) ++ return false; ++ ++ return true; + } + + +-- +2.34.1 + diff --git a/libvirt-RHEL-Enable-usage-of-x-blockdev-reopen.patch b/libvirt-RHEL-Enable-usage-of-x-blockdev-reopen.patch new file mode 100644 index 0000000..1505def --- /dev/null +++ b/libvirt-RHEL-Enable-usage-of-x-blockdev-reopen.patch @@ -0,0 +1,257 @@ +From b2529d5ff3a18a2b0022da75431cea5bf037819e Mon Sep 17 00:00:00 2001 +Message-Id: +From: Peter Krempa +Date: Wed, 28 Jul 2021 17:37:21 +0200 +Subject: [PATCH] RHEL: Enable usage of x-blockdev-reopen +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RHEL-only + +Introduce a new capability QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API +based on the presence of '__com.redhat_rhel-av-8_2_0-api' feature for +'x-blockdev-reopen' which states that reopen works for what libvirt +is going to use it and wire up code to call the x- prefixed command. + +This implementation will become dormant once qemu starts supporting +upstream-stable blockdev-reopen. + +https://bugzilla.redhat.com/show_bug.cgi?id=1799013 + +Starting with libvirt-7.6, upstream has adapted to the new format of +arguments so this patch was modified to support blockdev-reopen which +takes an array of nodes to reopen. + +https://bugzilla.redhat.com/show_bug.cgi?id=1929765 +Message-Id: <3fcde2fc6add36d5276ae224caf18adc8bca7d48.1627486352.git.pkrempa@redhat.com> +Reviewed-by: Ján Tomko +--- + src/qemu/qemu_block.c | 24 +++++++++++++++--------- + src/qemu/qemu_block.h | 3 ++- + src/qemu/qemu_capabilities.c | 13 +++++++++++++ + src/qemu/qemu_capabilities.h | 3 +++ + src/qemu/qemu_monitor.c | 5 +++-- + src/qemu/qemu_monitor.h | 3 ++- + src/qemu/qemu_monitor_json.c | 12 +++++++++--- + src/qemu/qemu_monitor_json.h | 3 ++- + tests/qemumonitorjsontest.c | 2 +- + 9 files changed, 50 insertions(+), 18 deletions(-) + +diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c +index e5ff653a60..aa566d0097 100644 +--- a/src/qemu/qemu_block.c ++++ b/src/qemu/qemu_block.c +@@ -3331,7 +3331,8 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSource *topsrc, + + int + qemuBlockReopenFormatMon(qemuMonitor *mon, +- virStorageSource *src) ++ virStorageSource *src, ++ bool downstream) + { + g_autoptr(virJSONValue) reopenprops = NULL; + g_autoptr(virJSONValue) srcprops = NULL; +@@ -3340,15 +3341,19 @@ qemuBlockReopenFormatMon(qemuMonitor *mon, + if (!(srcprops = qemuBlockStorageSourceGetBlockdevProps(src, src->backingStore))) + return -1; + +- if (virJSONValueArrayAppend(reopenoptions, &srcprops) < 0) +- return -1; ++ if (downstream) { ++ reopenprops = g_steal_pointer(&srcprops); ++ } else { ++ if (virJSONValueArrayAppend(reopenoptions, &srcprops) < 0) ++ return -1; + +- if (virJSONValueObjectAdd(&reopenprops, +- "a:options", &reopenoptions, +- NULL) < 0) +- return -1; ++ if (virJSONValueObjectAdd(&reopenprops, ++ "a:options", &reopenoptions, ++ NULL) < 0) ++ return -1; ++ } + +- if (qemuMonitorBlockdevReopen(mon, &reopenprops) < 0) ++ if (qemuMonitorBlockdevReopen(mon, &reopenprops, downstream) < 0) + return -1; + + return 0; +@@ -3372,6 +3377,7 @@ qemuBlockReopenFormat(virDomainObj *vm, + { + qemuDomainObjPrivate *priv = vm->privateData; + virQEMUDriver *driver = priv->driver; ++ bool downstream = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API); + int rc; + + /* If we are lacking the object here, qemu might have opened an image with +@@ -3385,7 +3391,7 @@ qemuBlockReopenFormat(virDomainObj *vm, + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + return -1; + +- rc = qemuBlockReopenFormatMon(priv->mon, src); ++ rc = qemuBlockReopenFormatMon(priv->mon, src, downstream); + + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) +diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h +index 184a549d5c..130cfcdefd 100644 +--- a/src/qemu/qemu_block.h ++++ b/src/qemu/qemu_block.h +@@ -267,7 +267,8 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSource *topsrc, + /* only for use in qemumonitorjsontest */ + int + qemuBlockReopenFormatMon(qemuMonitor *mon, +- virStorageSource *src); ++ virStorageSource *src, ++ bool downstream); + + int + qemuBlockReopenReadWrite(virDomainObj *vm, +diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c +index 5f1eb5014c..8ae80ef8d7 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -654,6 +654,9 @@ VIR_ENUM_IMPL(virQEMUCaps, + "rbd-encryption", /* QEMU_CAPS_RBD_ENCRYPTION */ + "sev-guest-kernel-hashes", /* QEMU_CAPS_SEV_GUEST_KERNEL_HASHES */ + "sev-inject-launch-secret", /* QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET */ ++ ++ /* 420 */ ++ "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api", /* QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API */ + ); + + +@@ -1540,6 +1543,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVhostUserFS[] = + /* see documentation for virQEMUQAPISchemaPathGet for the query format */ + static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { + { "block-commit/arg-type/*top", QEMU_CAPS_ACTIVE_COMMIT }, ++ { "x-blockdev-reopen/$__com.redhat_rhel-av-8_2_0-api", QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API }, + { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL}, + { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL}, + { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS}, +@@ -5235,6 +5239,15 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) + qemuCaps->arch == VIR_ARCH_MIPS) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_SCSI_NCR53C90); + ++ /* RHEL-only: ++ * - if upstream blockdev-reopen is enabled, clear the downstream flag ++ * - if the downstream flag is present but not the upstream, assert the upstream flag too ++ */ ++ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) ++ virQEMUCapsClear(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API); ++ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API)) ++ virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN); ++ + virQEMUCapsInitProcessCapsInterlock(qemuCaps); + } + +diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h +index e3a3ab4445..cde6c18b4c 100644 +--- a/src/qemu/qemu_capabilities.h ++++ b/src/qemu/qemu_capabilities.h +@@ -634,6 +634,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ + QEMU_CAPS_SEV_GUEST_KERNEL_HASHES, /* sev-guest.kernel-hashes= */ + QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET, /* 'sev-inject-launch-secret' qmp command present */ + ++ /* 420 */ ++ QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API, /* downstream support for blockdev reopen in rhel-av-8.2.0 */ ++ + QEMU_CAPS_LAST /* this must always be the last item */ + } virQEMUCapsFlags; + +diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c +index babf9e62fb..23638d3fe8 100644 +--- a/src/qemu/qemu_monitor.c ++++ b/src/qemu/qemu_monitor.c +@@ -4247,14 +4247,15 @@ qemuMonitorBlockdevAdd(qemuMonitor *mon, + + int + qemuMonitorBlockdevReopen(qemuMonitor *mon, +- virJSONValue **props) ++ virJSONValue **props, ++ bool downstream) + { + VIR_DEBUG("props=%p (node-name=%s)", *props, + NULLSTR(virJSONValueObjectGetString(*props, "node-name"))); + + QEMU_CHECK_MONITOR(mon); + +- return qemuMonitorJSONBlockdevReopen(mon, props); ++ return qemuMonitorJSONBlockdevReopen(mon, props, downstream); + } + + +diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h +index 9b2e4e1421..d2037914be 100644 +--- a/src/qemu/qemu_monitor.h ++++ b/src/qemu/qemu_monitor.h +@@ -1426,7 +1426,8 @@ int qemuMonitorBlockdevAdd(qemuMonitor *mon, + virJSONValue **props); + + int qemuMonitorBlockdevReopen(qemuMonitor *mon, +- virJSONValue **props); ++ virJSONValue **props, ++ bool downstream); + + int qemuMonitorBlockdevDel(qemuMonitor *mon, + const char *nodename); +diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c +index b0b513683b..34a46b9b41 100644 +--- a/src/qemu/qemu_monitor_json.c ++++ b/src/qemu/qemu_monitor_json.c +@@ -8051,13 +8051,19 @@ qemuMonitorJSONBlockdevAdd(qemuMonitor *mon, + + int + qemuMonitorJSONBlockdevReopen(qemuMonitor *mon, +- virJSONValue **props) ++ virJSONValue **props, ++ bool downstream) + { + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; + +- if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-reopen", props))) +- return -1; ++ if (downstream) { ++ if (!(cmd = qemuMonitorJSONMakeCommandInternal("x-blockdev-reopen", props))) ++ return -1; ++ } else { ++ if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-reopen", props))) ++ return -1; ++ } + + if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) + return -1; +diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h +index 64d9ebdaa3..15ce03d7af 100644 +--- a/src/qemu/qemu_monitor_json.h ++++ b/src/qemu/qemu_monitor_json.h +@@ -748,7 +748,8 @@ qemuMonitorJSONBlockdevAdd(qemuMonitor *mon, + + int + qemuMonitorJSONBlockdevReopen(qemuMonitor *mon, +- virJSONValue **props) ++ virJSONValue **props, ++ bool downstream) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + + int +diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c +index 48e2a457ab..8624a547b5 100644 +--- a/tests/qemumonitorjsontest.c ++++ b/tests/qemumonitorjsontest.c +@@ -2780,7 +2780,7 @@ testQemuMonitorJSONBlockdevReopen(const void *opaque) + if (qemuMonitorTestAddItem(test, "blockdev-reopen", "{\"return\":{}}") < 0) + return -1; + +- if (qemuBlockReopenFormatMon(qemuMonitorTestGetMonitor(test), src) < 0) ++ if (qemuBlockReopenFormatMon(qemuMonitorTestGetMonitor(test), src, false) < 0) + return -1; + + return 0; +-- +2.34.1 + diff --git a/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch b/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch new file mode 100644 index 0000000..4fd27b2 --- /dev/null +++ b/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch @@ -0,0 +1,46 @@ +From 29eb7b77805cf5fb756c964cdbe7fb7fb2c01f5f Mon Sep 17 00:00:00 2001 +Message-Id: <29eb7b77805cf5fb756c964cdbe7fb7fb2c01f5f@dist-git> +From: =?UTF-8?q?J=C3=A1n=20Tomko?= +Date: Mon, 27 Aug 2018 13:09:38 +0200 +Subject: [PATCH] RHEL: Fix virConnectGetMaxVcpus output +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://bugzilla.redhat.com/show_bug.cgi?id=1092363 + +RHEL-only. + +Ignore the maximum vcpu limit (KVM_CAP_MAX_VCPUS) on RHEL, +since RHEL QEMU treats the recommended limit (KVM_CAP_NR_VCPUS) +as the maximum, see: +https://bugzilla.redhat.com/show_bug.cgi?id=998708 + +(cherry picked from commit 7dff909fa34bdd93ad200dbffe70c0c1ee931925) +Signed-off-by: Ján Tomko + +https: //bugzilla.redhat.com/show_bug.cgi?id=1582222 +Reviewed-by: Andrea Bolognani +--- + src/util/virhostcpu.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c +index a07c00a0e9..35f41daef2 100644 +--- a/src/util/virhostcpu.c ++++ b/src/util/virhostcpu.c +@@ -1166,6 +1166,11 @@ virHostCPUGetKVMMaxVCPUs(void) + return -1; + } + ++/* Ignore KVM_CAP_MAX_VCPUS on RHEL - the recommended maximum ++ * is treated as a hard limit. ++ */ ++# undef KVM_CAP_MAX_VCPUS ++ + # ifdef KVM_CAP_MAX_VCPUS + /* 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 + diff --git a/libvirt-RHEL-Hack-around-changed-Broadwell-Haswell-CPUs.patch b/libvirt-RHEL-Hack-around-changed-Broadwell-Haswell-CPUs.patch new file mode 100644 index 0000000..77ba3f8 --- /dev/null +++ b/libvirt-RHEL-Hack-around-changed-Broadwell-Haswell-CPUs.patch @@ -0,0 +1,185 @@ +From 1d93a3944a200b7c955800faa598e0e11da098f8 Mon Sep 17 00:00:00 2001 +Message-Id: <1d93a3944a200b7c955800faa598e0e11da098f8@dist-git> +From: Jiri Denemark +Date: Fri, 27 Mar 2015 12:48:40 +0100 +Subject: [PATCH] RHEL: Hack around changed Broadwell/Haswell CPUs + +RHEL-only + +Upstream tried to solve the change of Broadwell and Haswell CPUs by +removing rtm and hle features from the corresponding CPU models for new +machine types. Then they reverted this and introduced new *-noTSX models +instead. However, the original fix was backported to RHEL. + +This patch makes sure Broadwell and Haswell will always contain rtm and +hle features regardless on RHEL version or machine type used. + +https://bugzilla.redhat.com/show_bug.cgi?id=1199446 + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_command.c | 22 +++++++++++++++++++ + tests/qemuxml2argvdata/cpu-Haswell.args | 2 +- + .../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- + .../cpu-translation.x86_64-4.0.0.args | 2 +- + .../cpu-translation.x86_64-latest.args | 2 +- + tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- + tests/qemuxml2argvdata/q35-acpi-nouefi.args | 2 +- + tests/qemuxml2argvdata/q35-acpi-uefi.args | 2 +- + tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 2 +- + 9 files changed, 30 insertions(+), 8 deletions(-) + +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index d822533ccb..6b4647a711 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -6521,6 +6521,8 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, + { + size_t i; + virCPUDef *cpu = def->cpu; ++ bool hle = false; ++ bool rtm = false; + + switch ((virCPUMode) cpu->mode) { + case VIR_CPU_MODE_HOST_PASSTHROUGH: +@@ -6587,6 +6589,12 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, + for (i = 0; i < cpu->nfeatures; i++) { + const char *featname = + virQEMUCapsCPUFeatureToQEMU(qemuCaps, cpu->features[i].name); ++ ++ if (STREQ("rtm", cpu->features[i].name)) ++ rtm = true; ++ if (STREQ("hle", cpu->features[i].name)) ++ hle = true; ++ + switch ((virCPUFeaturePolicy) cpu->features[i].policy) { + case VIR_CPU_FEATURE_FORCE: + case VIR_CPU_FEATURE_REQUIRE: +@@ -6604,6 +6612,20 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, + } + } + ++ /* Some versions of qemu-kvm in RHEL provide Broadwell and Haswell CPU ++ * models which lack rtm and hle features when used with some machine ++ * types. Let's make sure Broadwell and Haswell will always have these ++ * features. But only if the features were not explicitly mentioned in ++ * the guest CPU definition. ++ */ ++ if (STREQ_NULLABLE(cpu->model, "Broadwell") || ++ STREQ_NULLABLE(cpu->model, "Haswell")) { ++ if (!rtm) ++ virBufferAddLit(buf, ",rtm=on"); ++ if (!hle) ++ virBufferAddLit(buf, ",hle=on"); ++ } ++ + return 0; + } + +diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args +index b57fdfddc5..965274c1f0 100644 +--- a/tests/qemuxml2argvdata/cpu-Haswell.args ++++ b/tests/qemuxml2argvdata/cpu-Haswell.args +@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ + -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ + -machine pc,usb=off,dump-guest-core=off \ + -accel kvm \ +--cpu Haswell \ ++-cpu Haswell,rtm=on,hle=on \ + -m 214 \ + -realtime mlock=off \ + -smp 6,sockets=6,cores=1,threads=1 \ +diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args +index 0de04e877d..602f70de86 100644 +--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args ++++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args +@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ + -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ + -machine pc,usb=off,dump-guest-core=off \ + -accel tcg \ +--cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on \ ++-cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,rtm=on,hle=on \ + -m 214 \ + -realtime mlock=off \ + -smp 6,sockets=6,cores=1,threads=1 \ +diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args +index 09141106d5..ace08d5d76 100644 +--- a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args ++++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args +@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ + -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ + -machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ + -accel tcg \ +--cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \ ++-cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,rtm=on,hle=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \ + -m 214 \ + -overcommit mem-lock=off \ + -smp 1,sockets=1,cores=1,threads=1 \ +diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +index 2dab572a6b..a9f7c4b910 100644 +--- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ + -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ + -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ + -accel tcg \ +--cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \ ++-cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,rtm=on,hle=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \ + -m 214 \ + -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args +index 4a032f5d85..48fb75abcc 100644 +--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args ++++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args +@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ + -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ + -machine pc,usb=off,dump-guest-core=off \ + -accel kvm \ +--cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,invtsc=on,tsc-frequency=4567890000 \ ++-cpu Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,invtsc=on,rtm=on,hle=on,tsc-frequency=4567890000 \ + -m 214 \ + -realtime mlock=off \ + -smp 1,sockets=1,cores=1,threads=1 \ +diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args b/tests/qemuxml2argvdata/q35-acpi-nouefi.args +index 3faee48c77..a1f742712d 100644 +--- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args ++++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args +@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ + -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \ + -machine q35,usb=off,dump-guest-core=off \ + -accel tcg \ +--cpu Haswell \ ++-cpu Haswell,rtm=on,hle=on \ + -m 1024 \ + -realtime mlock=off \ + -smp 1,sockets=1,cores=1,threads=1 \ +diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argvdata/q35-acpi-uefi.args +index 60da1e282a..620056223a 100644 +--- a/tests/qemuxml2argvdata/q35-acpi-uefi.args ++++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args +@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ + -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \ + -machine q35,usb=off,dump-guest-core=off \ + -accel tcg \ +--cpu Haswell \ ++-cpu Haswell,rtm=on,hle=on \ + -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \ + -drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,unit=1 \ + -m 1024 \ +diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args +index 14e5bbc22a..ea66536c2a 100644 +--- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args ++++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args +@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ + -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \ + -machine q35,usb=off,dump-guest-core=off \ + -accel tcg \ +--cpu Haswell \ ++-cpu Haswell,rtm=on,hle=on \ + -m 1024 \ + -realtime mlock=off \ + -smp 1,sockets=1,cores=1,threads=1 \ +-- +2.34.1 + diff --git a/libvirt-RHEL-Remove-glib-2.64.0-workaround-for-GSource-race.patch b/libvirt-RHEL-Remove-glib-2.64.0-workaround-for-GSource-race.patch new file mode 100644 index 0000000..5808523 --- /dev/null +++ b/libvirt-RHEL-Remove-glib-2.64.0-workaround-for-GSource-race.patch @@ -0,0 +1,89 @@ +From b550b671bace6d979a0763a837ce97ddf72e8fc8 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Martin Kletzander +Date: Fri, 28 Jan 2022 20:33:12 +0100 +Subject: [PATCH] RHEL: Remove +Reviewed-by: Peter Krempa +--- + src/util/glibcompat.c | 46 ++++++++----------------------------------- + 1 file changed, 8 insertions(+), 38 deletions(-) + +diff --git a/src/util/glibcompat.c b/src/util/glibcompat.c +index eb6dcc0111..bf890f10d2 100644 +--- a/src/util/glibcompat.c ++++ b/src/util/glibcompat.c +@@ -212,51 +212,21 @@ vir_g_strdup_vprintf(const char *msg, va_list args) + return ret; + } + +- + /* +- * If the last reference to a GSource is released in a non-main +- * thread we're exposed to a race condition that causes a +- * crash: +- * +- * https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1358 ++ * This is a leftover of a hack that works around glib older than 2.64.0, but ++ * the fix in glib as backported in RHEL-8 to glib2-2.56.4-12 in BZ 1948988: + * +- * Thus we're using an idle func to release our ref... ++ * https://bugzilla.redhat.com/show_bug.cgi?id=1948988 + * +- * ...but this imposes a significant performance penalty on +- * I/O intensive workloads which are sensitive to the iterations +- * of the event loop, so avoid the workaround if we know we have +- * new enough glib. ++ * and our workaround coupled with that glib fix started causing leaks, which ++ * surfaced with us not unreferencing the qemu monitor socket in BZ 2045879: + * +- * The function below is used from a header file definition. ++ * https://bugzilla.redhat.com/show_bug.cgi?id=2045879 + * +- * Drop when min glib >= 2.64.0 ++ * Keeping this wrapper makes it easier to follow with other backports without ++ * conflicts in callers due to the function name change. + */ +-#if GLIB_CHECK_VERSION(2, 64, 0) + void vir_g_source_unref(GSource *src, GMainContext *ctx G_GNUC_UNUSED) + { + g_source_unref(src); + } +-#else +- +-static gboolean +-virEventGLibSourceUnrefIdle(gpointer data) +-{ +- GSource *src = data; +- +- g_source_unref(src); +- +- return FALSE; +-} +- +-void vir_g_source_unref(GSource *src, GMainContext *ctx) +-{ +- GSource *idle = g_idle_source_new(); +- +- g_source_set_callback(idle, virEventGLibSourceUnrefIdle, src, NULL); +- +- g_source_attach(idle, ctx); +- +- g_source_unref(idle); +-} +- +-#endif +-- +2.35.1 + diff --git a/libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch b/libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch new file mode 100644 index 0000000..0dddc76 --- /dev/null +++ b/libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch @@ -0,0 +1,81 @@ +From d6956a1aaa8757fab60132c3ee46c2bb199a78a8 Mon Sep 17 00:00:00 2001 +Message-Id: +From: John Ferlan +Date: Mon, 17 Dec 2018 20:42:30 -0500 +Subject: [PATCH] RHEL: qemu: Add ability to set sgio values for hostdev +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://bugzilla.redhat.com/show_bug.cgi?id=1582424 + +RHEL-only + +Add necessary checks in order to allow setting sgio values for a scsi +host device + +Signed-off-by: John Ferlan +Signed-off-by: Ján Tomko +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_conf.c | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c +index 6077457ff4..ba85fc6e22 100644 +--- a/src/qemu/qemu_conf.c ++++ b/src/qemu/qemu_conf.c +@@ -1841,8 +1841,9 @@ qemuSetUnprivSGIO(virDomainDeviceDef *dev) + virDomainDiskDef *disk = NULL; + virDomainHostdevDef *hostdev = NULL; + g_autofree char *sysfs_path = NULL; ++ g_autofree char *hostdev_path = NULL; + const char *path = NULL; +- int val = -1; ++ int val = 0; + + /* "sgio" is only valid for block disk; cdrom + * and floopy disk can have empty source. +@@ -1858,17 +1859,14 @@ qemuSetUnprivSGIO(virDomainDeviceDef *dev) + } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { + hostdev = dev->data.hostdev; + +- if (!qemuIsSharedHostdev(hostdev)) ++ if (hostdev->source.subsys.u.scsi.protocol == ++ VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) + return 0; + +- if (hostdev->source.subsys.u.scsi.sgio) { +- virReportError(VIR_ERR_INTERNAL_ERROR, "%s", +- _("'sgio' is not supported for SCSI " +- "generic device yet ")); ++ if (!(hostdev_path = qemuGetHostdevPath(hostdev))) + return -1; +- } + +- return 0; ++ path = hostdev_path; + } else { + return 0; + } +@@ -1877,7 +1875,16 @@ qemuSetUnprivSGIO(virDomainDeviceDef *dev) + return -1; + + /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. */ +- val = (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED); ++ if (dev->type == VIR_DOMAIN_DEVICE_DISK) { ++ if (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED) ++ val = 1; ++ } else { ++ /* Only settable if was present for hostdev */ ++ if (qemuIsSharedHostdev(hostdev) && ++ hostdev->source.subsys.u.scsi.sgio == ++ VIR_DOMAIN_DEVICE_SGIO_UNFILTERED) ++ val = 1; ++ } + + /* Do not do anything if unpriv_sgio is not supported by the kernel and the + * whitelist is enabled. But if requesting unfiltered access, always call +-- +2.34.1 + diff --git a/libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch b/libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch new file mode 100644 index 0000000..b6ad4ea --- /dev/null +++ b/libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch @@ -0,0 +1,66 @@ +From f562b4c83d342002291f6bd7c5776eaecbd3147f Mon Sep 17 00:00:00 2001 +Message-Id: +From: John Ferlan +Date: Mon, 17 Dec 2018 20:42:31 -0500 +Subject: [PATCH] RHEL: qemu: Add check for unpriv sgio for SCSI generic host + device +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://bugzilla.redhat.com/show_bug.cgi?id=1582424 + +RHEL-only + +Check if the hostdev has set the sgio filtered/unfiltered and handle +appropriately. + +This restores functionality removed by upstream commit id 'ce346623' +to remove sgio support for the SCSI generic host device. + +Signed-off-by: John Ferlan +Signed-off-by: Ján Tomko +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_conf.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c +index ba85fc6e22..28c334761b 100644 +--- a/src/qemu/qemu_conf.c ++++ b/src/qemu/qemu_conf.c +@@ -1749,13 +1749,29 @@ qemuSharedHostdevAddRemoveInternal(virQEMUDriver *driver, + { + g_autofree char *dev_path = NULL; + g_autofree char *key = NULL; ++ virDomainHostdevSubsysSCSI *scsisrc = &hostdev->source.subsys.u.scsi; ++ virDomainHostdevSubsysSCSIHost *scsihostsrc = &scsisrc->u.host; + int ret = -1; + + if (!qemuIsSharedHostdev(hostdev)) + return 0; + +- if (!(dev_path = qemuGetHostdevPath(hostdev)) || +- !(key = qemuGetSharedDeviceKey(dev_path))) ++ if (!(dev_path = qemuGetHostdevPath(hostdev))) ++ return -1; ++ ++ if ((ret = qemuCheckUnprivSGIO(driver->sharedDevices, dev_path, ++ scsisrc->sgio)) < 0) { ++ if (ret == -2) { ++ virReportError(VIR_ERR_OPERATION_INVALID, ++ _("sgio of shared scsi host device '%s-%u-%u-%llu' " ++ "conflicts with other active domains"), ++ scsihostsrc->adapter, scsihostsrc->bus, ++ scsihostsrc->target, scsihostsrc->unit); ++ } ++ return -1; ++ } ++ ++ if (!(key = qemuGetSharedDeviceKey(dev_path))) + return -1; + + qemuDriverLock(driver); +-- +2.34.1 + diff --git a/libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch b/libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch new file mode 100644 index 0000000..c467444 --- /dev/null +++ b/libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch @@ -0,0 +1,215 @@ +From 9c5daeb8c99ca12a66387de448f585742887fd75 Mon Sep 17 00:00:00 2001 +Message-Id: <9c5daeb8c99ca12a66387de448f585742887fd75@dist-git> +From: Michal Privoznik +Date: Fri, 6 Mar 2020 15:52:21 +0100 +Subject: [PATCH] RHEL: virscsi: Check device type before getting it's /dev + node name + +Not all SCSI devices are block devices, therefore +/sys/bus/scsi/devices/X:X:X:X/block/ directory does not always +exist. Check if the SCSI device is a block device beforehand. + +https://bugzilla.redhat.com/show_bug.cgi?id=1808390 + +Signed-off-by: Michal Privoznik +Signed-off-by: Andrea Bolognani +Message-Id: <20200306145226.1610708-2-abologna@redhat.com> +Reviewed-by: Jiri Denemark +--- + src/util/virscsi.c | 140 ++++++++++++++++++++++++++++++--- + tests/virscsidata/0-0-0-0/type | 1 + + tests/virscsidata/1-0-0-0/type | 1 + + 3 files changed, 131 insertions(+), 11 deletions(-) + create mode 100644 tests/virscsidata/0-0-0-0/type + create mode 100644 tests/virscsidata/1-0-0-0/type + +diff --git a/src/util/virscsi.c b/src/util/virscsi.c +index 6a90d9002f..770f727cac 100644 +--- a/src/util/virscsi.c ++++ b/src/util/virscsi.c +@@ -47,6 +47,32 @@ struct _virUsedByInfo { + }; + typedef struct _virUsedByInfo virUsedByInfo; + ++ ++/* Keep in sync with scsi/scsi_proto.h */ ++typedef enum { ++ VIR_SCSI_DEVICE_TYPE_NONE = -1, ++ VIR_SCSI_DEVICE_TYPE_DISK = 0x00, ++ VIR_SCSI_DEVICE_TYPE_TAPE = 0x01, ++ VIR_SCSI_DEVICE_TYPE_PRINTER = 0x02, ++ VIR_SCSI_DEVICE_TYPE_PROCESSOR = 0x03, ++ VIR_SCSI_DEVICE_TYPE_WORM = 0x04, ++ VIR_SCSI_DEVICE_TYPE_ROM = 0x05, ++ VIR_SCSI_DEVICE_TYPE_SCANNER = 0x06, ++ VIR_SCSI_DEVICE_TYPE_MOD = 0x07, ++ VIR_SCSI_DEVICE_TYPE_MEDIUM_CHANGER = 0x08, ++ VIR_SCSI_DEVICE_TYPE_COMM = 0x09, ++ VIR_SCSI_DEVICE_TYPE_RAID = 0x0c, ++ VIR_SCSI_DEVICE_TYPE_ENCLOSURE = 0x0d, ++ VIR_SCSI_DEVICE_TYPE_RBC = 0x0e, ++ VIR_SCSI_DEVICE_TYPE_OSD = 0x11, ++ VIR_SCSI_DEVICE_TYPE_ZBC = 0x14, ++ VIR_SCSI_DEVICE_TYPE_WLUN = 0x1e, ++ VIR_SCSI_DEVICE_TYPE_NO_LUN = 0x7f, ++ ++ VIR_SCSI_DEVICE_TYPE_LAST, ++} virSCSIDeviceType; ++ ++ + struct _virSCSIDevice { + unsigned int adapter; + unsigned int bus; +@@ -126,6 +152,78 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix, + return NULL; + } + ++ ++static int ++virSCSIDeviceGetType(const char *prefix, ++ unsigned int adapter, ++ unsigned int bus, ++ unsigned int target, ++ unsigned long long unit, ++ virSCSIDeviceType *type) ++{ ++ int intType; ++ ++ if (virFileReadValueInt(&intType, ++ "%s/%d:%u:%u:%llu/type", ++ prefix, adapter, bus, target, unit) < 0) ++ return -1; ++ ++ switch (intType) { ++ case VIR_SCSI_DEVICE_TYPE_DISK: ++ case VIR_SCSI_DEVICE_TYPE_TAPE: ++ case VIR_SCSI_DEVICE_TYPE_PRINTER: ++ case VIR_SCSI_DEVICE_TYPE_PROCESSOR: ++ case VIR_SCSI_DEVICE_TYPE_WORM: ++ case VIR_SCSI_DEVICE_TYPE_ROM: ++ case VIR_SCSI_DEVICE_TYPE_SCANNER: ++ case VIR_SCSI_DEVICE_TYPE_MOD: ++ case VIR_SCSI_DEVICE_TYPE_MEDIUM_CHANGER: ++ case VIR_SCSI_DEVICE_TYPE_COMM: ++ case VIR_SCSI_DEVICE_TYPE_RAID: ++ case VIR_SCSI_DEVICE_TYPE_ENCLOSURE: ++ case VIR_SCSI_DEVICE_TYPE_RBC: ++ case VIR_SCSI_DEVICE_TYPE_OSD: ++ case VIR_SCSI_DEVICE_TYPE_ZBC: ++ case VIR_SCSI_DEVICE_TYPE_WLUN: ++ case VIR_SCSI_DEVICE_TYPE_NO_LUN: ++ *type = intType; ++ break; ++ ++ default: ++ virReportError(VIR_ERR_INTERNAL_ERROR, ++ _("unknown SCSI device type: %x"), ++ intType); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++ ++static char * ++virSCSIDeviceGetDevNameBlock(const char *prefix, ++ unsigned int adapter, ++ unsigned int bus, ++ unsigned int target, ++ unsigned long long unit) ++{ ++ g_autoptr(DIR) dir = NULL; ++ struct dirent *entry; ++ g_autofree char *path = NULL; ++ ++ path = g_strdup_printf("%s/%d:%u:%u:%llu/block", ++ prefix, adapter, bus, target, unit); ++ ++ if (virDirOpen(&dir, path) < 0) ++ return NULL; ++ ++ if (virDirRead(dir, &entry, path) > 0) ++ return g_strdup(entry->d_name); ++ ++ return NULL; ++} ++ ++ + /* Returns device name (e.g. "sdc") on success, or NULL + * on failure. + */ +@@ -136,25 +234,45 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix, + unsigned int target, + unsigned long long unit) + { +- g_autoptr(DIR) dir = NULL; +- struct dirent *entry; +- g_autofree char *path = NULL; + unsigned int adapter_id; ++ virSCSIDeviceType type; + const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_DEVICES; + + if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0) + return NULL; + +- path = g_strdup_printf("%s/%d:%u:%u:%llu/block", prefix, adapter_id, bus, +- target, unit); +- +- if (virDirOpen(&dir, path) < 0) ++ if (virSCSIDeviceGetType(prefix, adapter_id, ++ bus, target, unit, &type) < 0) + return NULL; + +- if (virDirRead(dir, &entry, path) > 0) +- return g_strdup(entry->d_name); +- +- return NULL; ++ switch (type) { ++ case VIR_SCSI_DEVICE_TYPE_DISK: ++ return virSCSIDeviceGetDevNameBlock(prefix, adapter_id, bus, target, unit); ++ ++ case VIR_SCSI_DEVICE_TYPE_TAPE: ++ case VIR_SCSI_DEVICE_TYPE_PRINTER: ++ case VIR_SCSI_DEVICE_TYPE_PROCESSOR: ++ case VIR_SCSI_DEVICE_TYPE_WORM: ++ case VIR_SCSI_DEVICE_TYPE_ROM: ++ case VIR_SCSI_DEVICE_TYPE_SCANNER: ++ case VIR_SCSI_DEVICE_TYPE_MOD: ++ case VIR_SCSI_DEVICE_TYPE_MEDIUM_CHANGER: ++ case VIR_SCSI_DEVICE_TYPE_COMM: ++ case VIR_SCSI_DEVICE_TYPE_RAID: ++ case VIR_SCSI_DEVICE_TYPE_ENCLOSURE: ++ case VIR_SCSI_DEVICE_TYPE_RBC: ++ case VIR_SCSI_DEVICE_TYPE_OSD: ++ case VIR_SCSI_DEVICE_TYPE_ZBC: ++ case VIR_SCSI_DEVICE_TYPE_WLUN: ++ case VIR_SCSI_DEVICE_TYPE_NO_LUN: ++ case VIR_SCSI_DEVICE_TYPE_NONE: ++ case VIR_SCSI_DEVICE_TYPE_LAST: ++ default: ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, ++ _("unsupported SCSI device type: %x"), ++ type); ++ return NULL; ++ } + } + + virSCSIDevice * +diff --git a/tests/virscsidata/0-0-0-0/type b/tests/virscsidata/0-0-0-0/type +new file mode 100644 +index 0000000000..573541ac97 +--- /dev/null ++++ b/tests/virscsidata/0-0-0-0/type +@@ -0,0 +1 @@ ++0 +diff --git a/tests/virscsidata/1-0-0-0/type b/tests/virscsidata/1-0-0-0/type +new file mode 100644 +index 0000000000..573541ac97 +--- /dev/null ++++ b/tests/virscsidata/1-0-0-0/type +@@ -0,0 +1 @@ ++0 +-- +2.34.1 + diff --git a/libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch b/libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch new file mode 100644 index 0000000..ad3f8bc --- /dev/null +++ b/libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch @@ -0,0 +1,272 @@ +From 1ce4faffcd4616bbcea4d198c3f60cbcfddd784e Mon Sep 17 00:00:00 2001 +Message-Id: <1ce4faffcd4616bbcea4d198c3f60cbcfddd784e@dist-git> +From: Michal Privoznik +Date: Fri, 6 Mar 2020 15:52:23 +0100 +Subject: [PATCH] RHEL: virscsi: Introduce and use + virSCSIDeviceGetUnprivSGIOSysfsPath() + +When constructing a path to the 'unpriv_sgio' file of given SCSI +device we don't need to go through /dev/* and major() + minor() +path. The generated path points to +/sys/dev/block/MAJ:MIN/queue/unpriv_sgio which is wrong if the +SCSI device in question is not a block device. We can generate a +different path: /sys/bus/scsi/devices/X:X:X:X/unpriv_sgio where +the file is directly accessible regardless of the SCSI device +type. + +https://bugzilla.redhat.com/show_bug.cgi?id=1808390 + +Signed-off-by: Michal Privoznik +Signed-off-by: Andrea Bolognani +Message-Id: <20200306145226.1610708-4-abologna@redhat.com> +Reviewed-by: Jiri Denemark +--- + src/libvirt_private.syms | 1 + + src/qemu/qemu_conf.c | 31 +++++++++++++++++++------------ + src/util/virscsi.c | 19 +++++++++++++++++++ + src/util/virscsi.h | 5 +++++ + src/util/virutil.c | 24 ++++++------------------ + src/util/virutil.h | 2 -- + 6 files changed, 50 insertions(+), 32 deletions(-) + +diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms +index 5b76e66e61..2c42e2a5e8 100644 +--- a/src/libvirt_private.syms ++++ b/src/libvirt_private.syms +@@ -3191,6 +3191,7 @@ virSCSIDeviceGetSgName; + virSCSIDeviceGetShareable; + virSCSIDeviceGetTarget; + virSCSIDeviceGetUnit; ++virSCSIDeviceGetUnprivSGIOSysfsPath; + virSCSIDeviceIsAvailable; + virSCSIDeviceListAdd; + virSCSIDeviceListCount; +diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c +index 28c334761b..a0b8076d6b 100644 +--- a/src/qemu/qemu_conf.c ++++ b/src/qemu/qemu_conf.c +@@ -1506,7 +1506,7 @@ qemuCheckUnprivSGIO(GHashTable *sharedDevices, + if (!(virHashLookup(sharedDevices, key))) + return 0; + +- if (virGetDeviceUnprivSGIO(device_path, NULL, &val) < 0) ++ if (virGetDeviceUnprivSGIO(sysfs_path, &val) < 0) + return -1; + + /* Error message on failure needs to be handled in caller +@@ -1857,39 +1857,46 @@ qemuSetUnprivSGIO(virDomainDeviceDef *dev) + virDomainDiskDef *disk = NULL; + virDomainHostdevDef *hostdev = NULL; + g_autofree char *sysfs_path = NULL; +- g_autofree char *hostdev_path = NULL; +- const char *path = NULL; + int val = 0; + + /* "sgio" is only valid for block disk; cdrom + * and floopy disk can have empty source. + */ + if (dev->type == VIR_DOMAIN_DEVICE_DISK) { ++ const char *path; ++ + disk = dev->data.disk; ++ path = virDomainDiskGetSource(disk); + + if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN || + !virStorageSourceIsBlockLocal(disk->src)) + return 0; + +- path = virDomainDiskGetSource(disk); ++ if (!(sysfs_path = virGetUnprivSGIOSysfsPath(path, NULL))) ++ return -1; ++ + } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { ++ virDomainHostdevSubsysSCSI *scsisrc; ++ virDomainHostdevSubsysSCSIHost *scsihostsrc; ++ + hostdev = dev->data.hostdev; ++ scsisrc = &hostdev->source.subsys.u.scsi; ++ scsihostsrc = &scsisrc->u.host; + + if (hostdev->source.subsys.u.scsi.protocol == + VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) + return 0; + +- if (!(hostdev_path = qemuGetHostdevPath(hostdev))) ++ if (!(sysfs_path = virSCSIDeviceGetUnprivSGIOSysfsPath(NULL, ++ scsihostsrc->adapter, ++ scsihostsrc->bus, ++ scsihostsrc->target, ++ scsihostsrc->unit))) + return -1; +- +- path = hostdev_path; + } else { + return 0; + } + +- if (!(sysfs_path = virGetUnprivSGIOSysfsPath(path, NULL))) +- return -1; +- + /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. */ + if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + if (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED) +@@ -1909,11 +1916,11 @@ qemuSetUnprivSGIO(virDomainDeviceDef *dev) + if (virFileExists(sysfs_path) || val == 1) { + int curr_val; + +- if (virGetDeviceUnprivSGIO(path, NULL, &curr_val) < 0) ++ if (virGetDeviceUnprivSGIO(sysfs_path, &curr_val) < 0) + return -1; + + if (curr_val != val && +- virSetDeviceUnprivSGIO(path, NULL, val) < 0) { ++ virSetDeviceUnprivSGIO(sysfs_path, val) < 0) { + return -1; + } + } +diff --git a/src/util/virscsi.c b/src/util/virscsi.c +index 6165196423..b437fdcac0 100644 +--- a/src/util/virscsi.c ++++ b/src/util/virscsi.c +@@ -302,6 +302,25 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix, + } + } + ++ ++char * ++virSCSIDeviceGetUnprivSGIOSysfsPath(const char *sysfs_prefix, ++ const char *adapter, ++ unsigned int bus, ++ unsigned int target, ++ unsigned long long unit) ++{ ++ unsigned int adapter_id; ++ const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_DEVICES; ++ ++ if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0) ++ return NULL; ++ ++ return g_strdup_printf("%s/%d:%u:%u:%llu/unpriv_sgio", ++ prefix, adapter_id, bus, target, unit); ++} ++ ++ + virSCSIDevice * + virSCSIDeviceNew(const char *sysfs_prefix, + const char *adapter, +diff --git a/src/util/virscsi.h b/src/util/virscsi.h +index 65ad15ed76..5721985939 100644 +--- a/src/util/virscsi.h ++++ b/src/util/virscsi.h +@@ -40,6 +40,11 @@ char *virSCSIDeviceGetDevName(const char *sysfs_prefix, + unsigned int bus, + unsigned int target, + unsigned long long unit); ++char *virSCSIDeviceGetUnprivSGIOSysfsPath(const char *sysfs_prefix, ++ const char *adapter, ++ unsigned int bus, ++ unsigned int target, ++ unsigned long long unit); + + virSCSIDevice *virSCSIDeviceNew(const char *sysfs_prefix, + const char *adapter, +diff --git a/src/util/virutil.c b/src/util/virutil.c +index e04f1343d8..b1e37b45c5 100644 +--- a/src/util/virutil.c ++++ b/src/util/virutil.c +@@ -1377,18 +1377,13 @@ virGetUnprivSGIOSysfsPath(const char *path, + + int + virSetDeviceUnprivSGIO(const char *path, +- const char *sysfs_dir, + int unpriv_sgio) + { +- char *sysfs_path = NULL; + char *val = NULL; + int ret = -1; + int rc; + +- if (!(sysfs_path = virGetUnprivSGIOSysfsPath(path, sysfs_dir))) +- return -1; +- +- if (!virFileExists(sysfs_path)) { ++ if (!virFileExists(path)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("unpriv_sgio is not supported by this kernel")); + goto cleanup; +@@ -1396,38 +1391,32 @@ virSetDeviceUnprivSGIO(const char *path, + + val = g_strdup_printf("%d", unpriv_sgio); + +- if ((rc = virFileWriteStr(sysfs_path, val, 0)) < 0) { +- virReportSystemError(-rc, _("failed to set %s"), sysfs_path); ++ if ((rc = virFileWriteStr(path, val, 0)) < 0) { ++ virReportSystemError(-rc, _("failed to set %s"), path); + goto cleanup; + } + + ret = 0; + cleanup: +- VIR_FREE(sysfs_path); + VIR_FREE(val); + return ret; + } + + int + virGetDeviceUnprivSGIO(const char *path, +- const char *sysfs_dir, + int *unpriv_sgio) + { +- char *sysfs_path = NULL; + char *buf = NULL; + char *tmp = NULL; + int ret = -1; + +- if (!(sysfs_path = virGetUnprivSGIOSysfsPath(path, sysfs_dir))) +- return -1; +- +- if (!virFileExists(sysfs_path)) { ++ if (!virFileExists(path)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("unpriv_sgio is not supported by this kernel")); + goto cleanup; + } + +- if (virFileReadAll(sysfs_path, 1024, &buf) < 0) ++ if (virFileReadAll(path, 1024, &buf) < 0) + goto cleanup; + + if ((tmp = strchr(buf, '\n'))) +@@ -1435,13 +1424,12 @@ virGetDeviceUnprivSGIO(const char *path, + + if (virStrToLong_i(buf, NULL, 10, unpriv_sgio) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, +- _("failed to parse value of %s"), sysfs_path); ++ _("failed to parse value of %s"), path); + goto cleanup; + } + + ret = 0; + cleanup: +- VIR_FREE(sysfs_path); + VIR_FREE(buf); + return ret; + } +diff --git a/src/util/virutil.h b/src/util/virutil.h +index 854b494890..da267c6446 100644 +--- a/src/util/virutil.h ++++ b/src/util/virutil.h +@@ -120,10 +120,8 @@ int virGetDeviceID(const char *path, + int *maj, + int *min) G_GNUC_NO_INLINE; + int virSetDeviceUnprivSGIO(const char *path, +- const char *sysfs_dir, + int unpriv_sgio); + int virGetDeviceUnprivSGIO(const char *path, +- const char *sysfs_dir, + int *unpriv_sgio); + char *virGetUnprivSGIOSysfsPath(const char *path, + const char *sysfs_dir); +-- +2.34.1 + diff --git a/libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch b/libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch new file mode 100644 index 0000000..c9a8660 --- /dev/null +++ b/libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch @@ -0,0 +1,200 @@ +From 5b96a8773d33af9822f6b6ccddc8f372841895a6 Mon Sep 17 00:00:00 2001 +Message-Id: <5b96a8773d33af9822f6b6ccddc8f372841895a6@dist-git> +From: Michal Privoznik +Date: Fri, 6 Mar 2020 15:52:22 +0100 +Subject: [PATCH] RHEL: virscsi: Support TAPEs in virSCSIDeviceGetDevName() + +If the SCSI device we want to get /dev node name for is TAPE +device we need to look at 'tape' symlink in the sysfs dir +corresponding to the device. + +https://bugzilla.redhat.com/show_bug.cgi?id=1808390 + +Signed-off-by: Michal Privoznik +Signed-off-by: Andrea Bolognani +Message-Id: <20200306145226.1610708-3-abologna@redhat.com> +Reviewed-by: Jiri Denemark +--- + src/util/virscsi.c | 27 +++++++++++++++ + tests/virscsidata/2-0-0-0/model | 1 + + tests/virscsidata/2-0-0-0/scsi_tape/st0/dev | 1 + + tests/virscsidata/2-0-0-0/sg3/dev | 1 + + tests/virscsidata/2-0-0-0/tape | 1 + + tests/virscsidata/2-0-0-0/type | 1 + + tests/virscsidata/2-0-0-0/vendor | 1 + + tests/virscsidata/sg3 | 0 + tests/virscsitest.c | 38 ++++++++++++++++++--- + 9 files changed, 66 insertions(+), 5 deletions(-) + create mode 100644 tests/virscsidata/2-0-0-0/model + create mode 100644 tests/virscsidata/2-0-0-0/scsi_tape/st0/dev + create mode 100644 tests/virscsidata/2-0-0-0/sg3/dev + create mode 120000 tests/virscsidata/2-0-0-0/tape + create mode 100644 tests/virscsidata/2-0-0-0/type + create mode 100644 tests/virscsidata/2-0-0-0/vendor + create mode 100644 tests/virscsidata/sg3 + +diff --git a/src/util/virscsi.c b/src/util/virscsi.c +index 770f727cac..6165196423 100644 +--- a/src/util/virscsi.c ++++ b/src/util/virscsi.c +@@ -224,6 +224,31 @@ virSCSIDeviceGetDevNameBlock(const char *prefix, + } + + ++static char * ++virSCSIDeviceGetDevNameTape(const char *prefix, ++ unsigned int adapter, ++ unsigned int bus, ++ unsigned int target, ++ unsigned long long unit) ++{ ++ g_autofree char *path = NULL; ++ g_autofree char *resolvedPath = NULL; ++ g_autoptr(GError) err = NULL; ++ ++ path = g_strdup_printf("%s/%d:%u:%u:%llu/tape", ++ prefix, adapter, bus, target, unit); ++ ++ if (!(resolvedPath = g_file_read_link(path, &err))) { ++ virReportError(VIR_ERR_SYSTEM_ERROR, ++ _("Unable to read link: %s"), ++ err->message); ++ return NULL; ++ } ++ ++ return g_path_get_basename(resolvedPath); ++} ++ ++ + /* Returns device name (e.g. "sdc") on success, or NULL + * on failure. + */ +@@ -250,6 +275,8 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix, + return virSCSIDeviceGetDevNameBlock(prefix, adapter_id, bus, target, unit); + + case VIR_SCSI_DEVICE_TYPE_TAPE: ++ return virSCSIDeviceGetDevNameTape(prefix, adapter_id, bus, target, unit); ++ + case VIR_SCSI_DEVICE_TYPE_PRINTER: + case VIR_SCSI_DEVICE_TYPE_PROCESSOR: + case VIR_SCSI_DEVICE_TYPE_WORM: +diff --git a/tests/virscsidata/2-0-0-0/model b/tests/virscsidata/2-0-0-0/model +new file mode 100644 +index 0000000000..d2ab4715c3 +--- /dev/null ++++ b/tests/virscsidata/2-0-0-0/model +@@ -0,0 +1 @@ ++scsi_debug +diff --git a/tests/virscsidata/2-0-0-0/scsi_tape/st0/dev b/tests/virscsidata/2-0-0-0/scsi_tape/st0/dev +new file mode 100644 +index 0000000000..3dd777e840 +--- /dev/null ++++ b/tests/virscsidata/2-0-0-0/scsi_tape/st0/dev +@@ -0,0 +1 @@ ++9:0 +diff --git a/tests/virscsidata/2-0-0-0/sg3/dev b/tests/virscsidata/2-0-0-0/sg3/dev +new file mode 100644 +index 0000000000..b369a59b3e +--- /dev/null ++++ b/tests/virscsidata/2-0-0-0/sg3/dev +@@ -0,0 +1 @@ ++21:3 +diff --git a/tests/virscsidata/2-0-0-0/tape b/tests/virscsidata/2-0-0-0/tape +new file mode 120000 +index 0000000000..6ca7f77539 +--- /dev/null ++++ b/tests/virscsidata/2-0-0-0/tape +@@ -0,0 +1 @@ ++scsi_tape/st0 +\ No newline at end of file +diff --git a/tests/virscsidata/2-0-0-0/type b/tests/virscsidata/2-0-0-0/type +new file mode 100644 +index 0000000000..d00491fd7e +--- /dev/null ++++ b/tests/virscsidata/2-0-0-0/type +@@ -0,0 +1 @@ ++1 +diff --git a/tests/virscsidata/2-0-0-0/vendor b/tests/virscsidata/2-0-0-0/vendor +new file mode 100644 +index 0000000000..9b075671ea +--- /dev/null ++++ b/tests/virscsidata/2-0-0-0/vendor +@@ -0,0 +1 @@ ++Linux +diff --git a/tests/virscsidata/sg3 b/tests/virscsidata/sg3 +new file mode 100644 +index 0000000000..e69de29bb2 +diff --git a/tests/virscsitest.c b/tests/virscsitest.c +index c96699e157..924b77af08 100644 +--- a/tests/virscsitest.c ++++ b/tests/virscsitest.c +@@ -33,17 +33,33 @@ VIR_LOG_INIT("tests.scsitest"); + + static char *virscsi_prefix; + ++typedef struct { ++ const char *adapter; ++ unsigned int bus; ++ unsigned int target; ++ unsigned int unit; ++ const char *expectedName; ++} testGetDevNameData; ++ + static int +-test1(const void *data G_GNUC_UNUSED) ++testGetDevName(const void *opaque) + { ++ const testGetDevNameData *data = opaque; + g_autofree char *name = NULL; + + if (!(name = virSCSIDeviceGetDevName(virscsi_prefix, +- "scsi_host1", 0, 0, 0))) ++ data->adapter, ++ data->bus, ++ data->target, ++ data->unit))) + return -1; + +- if (STRNEQ(name, "sdh")) ++ if (STRNEQ(name, data->expectedName)) { ++ fprintf(stderr, ++ "SCSI dev name mismatch, expected %s got %s", ++ data->expectedName, name); + return -1; ++ } + + return 0; + } +@@ -200,15 +216,27 @@ mymain(void) + + CREATE_SYMLINK("0-0-0-0", "0:0:0:0"); + CREATE_SYMLINK("1-0-0-0", "1:0:0:0"); ++ CREATE_SYMLINK("2-0-0-0", "2:0:0:0"); + CREATE_SYMLINK("sg0", "sg0"); ++ CREATE_SYMLINK("sg3", "sg3"); + CREATE_SYMLINK("sg8", "sg8"); + + VIR_FREE(virscsi_prefix); + + virscsi_prefix = g_strdup(tmpdir); + +- if (virTestRun("test1", test1, NULL) < 0) +- ret = -1; ++#define TEST_GET_DEV_NAME(adapter, bus, target, unit, expectedName) \ ++ do { \ ++ testGetDevNameData data = {adapter, bus, target, unit, expectedName}; \ ++ if (virTestRun("test getDevname " expectedName, \ ++ testGetDevName, &data) < 0) \ ++ ret = -1; \ ++ } while (0) ++ ++ TEST_GET_DEV_NAME("scsi_host0", 0, 0, 0, "sda"); ++ TEST_GET_DEV_NAME("scsi_host1", 0, 0, 0, "sdh"); ++ TEST_GET_DEV_NAME("scsi_host2", 0, 0, 0, "st0"); ++ + if (virTestRun("test2", test2, NULL) < 0) + ret = -1; + +-- +2.34.1 + diff --git a/libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch b/libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch new file mode 100644 index 0000000..33400cc --- /dev/null +++ b/libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch @@ -0,0 +1,37 @@ +From ac8357ab7dd676af82b971673f8d7e862ff07624 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Fri, 6 Mar 2020 15:52:24 +0100 +Subject: [PATCH] RHEL: virutil: Accept non-block devices in virGetDeviceID() + +If a caller wants to learn major or minor number for a device, +let them. There's no need to check if the device is a block +device here. + +https://bugzilla.redhat.com/show_bug.cgi?id=1808390 + +Signed-off-by: Michal Privoznik +Signed-off-by: Andrea Bolognani +Message-Id: <20200306145226.1610708-5-abologna@redhat.com> +Reviewed-by: Jiri Denemark +--- + src/util/virutil.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/util/virutil.c b/src/util/virutil.c +index b1e37b45c5..ced8493516 100644 +--- a/src/util/virutil.c ++++ b/src/util/virutil.c +@@ -1333,9 +1333,6 @@ virGetDeviceID(const char *path, int *maj, int *min) + if (stat(path, &sb) < 0) + return -errno; + +- if (!S_ISBLK(sb.st_mode)) +- return -EINVAL; +- + if (maj) + *maj = major(sb.st_rdev); + if (min) +-- +2.34.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 new file mode 100644 index 0000000..7d5ce9a --- /dev/null +++ b/libvirt-Revert-report-error-when-virProcessGetStatInfo-is-unable-to-parse-data.patch @@ -0,0 +1,103 @@ +From 732113455fb7eadeea178c71cc77f0ffdf639f24 Mon Sep 17 00:00:00 2001 +Message-Id: <732113455fb7eadeea178c71cc77f0ffdf639f24@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) +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-conf-Introduce-memory-allocation-threads.patch b/libvirt-conf-Introduce-memory-allocation-threads.patch new file mode 100644 index 0000000..add140c --- /dev/null +++ b/libvirt-conf-Introduce-memory-allocation-threads.patch @@ -0,0 +1,155 @@ +From 19f7e6dc950baf346738f462ac5c6b815c04edcc Mon Sep 17 00:00:00 2001 +Message-Id: <19f7e6dc950baf346738f462ac5c6b815c04edcc@dist-git> +From: Michal Privoznik +Date: Mon, 21 Mar 2022 16:49:25 +0100 +Subject: [PATCH] conf: Introduce memory allocation threads + +Since its v5.0.0 release QEMU is capable of specifying number of +threads used to allocate memory. It defaults to 1, which may be +too low for humongous guests with gigantic pages. + +In general, on QEMU cmd line level it is possible to use +different number of threads per each memory-backend-* object, in +practical terms it's not useful. Therefore, use +to set guest wide value and let all memory devices 'inherit' it, +silently. IOW, don't introduce per device knob because that would +only complicate things for a little or no benefit. + +Signed-off-by: Michal Privoznik +Reviewed-by: Martin Kletzander +(cherry picked from commit ba7f98126fa84d354ce72929b77cc111a9a557a9) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2067126 +Signed-off-by: Michal Privoznik +--- + docs/formatdomain.rst | 8 +++++--- + docs/schemas/domaincommon.rng | 19 +++++++++++++------ + src/conf/domain_conf.c | 15 ++++++++++++++- + src/conf/domain_conf.h | 1 + + tests/qemuxml2argvdata/memfd-memory-numa.xml | 2 +- + 5 files changed, 34 insertions(+), 11 deletions(-) + +diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst +index 8128e43da4..17e89a0c0d 100644 +--- a/docs/formatdomain.rst ++++ b/docs/formatdomain.rst +@@ -977,7 +977,7 @@ Memory Backing + + + +- ++ + + + ... +@@ -1026,8 +1026,10 @@ influence how virtual memory pages are backed by host pages. + Using the ``mode`` attribute, specify if the memory is to be "shared" or + "private". This can be overridden per numa node by ``memAccess``. + ``allocation`` +- Using the ``mode`` attribute, specify when to allocate the memory by +- supplying either "immediate" or "ondemand". ++ Using the optional ``mode`` attribute, specify when to allocate the memory by ++ supplying either "immediate" or "ondemand". :since:`Since 8.2.0` it is ++ possible to set the number of threads that hypervisor uses to allocate ++ memory via ``threads`` attribute. + ``discard`` + When set and supported by hypervisor the memory content is discarded just + before guest shuts down (or when DIMM module is unplugged). Please note that +diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng +index 7fa5c2b8b5..c9c1529979 100644 +--- a/docs/schemas/domaincommon.rng ++++ b/docs/schemas/domaincommon.rng +@@ -745,12 +745,19 @@ + + + +- +- +- immediate +- ondemand +- +- ++ ++ ++ ++ immediate ++ ondemand ++ ++ ++ ++ ++ ++ ++ ++ + + + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 5691b8d2d5..805a15848e 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -19095,6 +19095,13 @@ virDomainDefParseMemory(virDomainDef *def, + VIR_FREE(tmp); + } + ++ if (virXPathUInt("string(./memoryBacking/allocation/@threads)", ++ ctxt, &def->mem.allocation_threads) == -2) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("Failed to parse memory allocation threads")); ++ return -1; ++ } ++ + if (virXPathNode("./memoryBacking/hugepages", ctxt)) { + /* hugepages will be used */ + if ((n = virXPathNodeSet("./memoryBacking/hugepages/page", ctxt, &nodes)) < 0) { +@@ -27639,6 +27646,7 @@ virDomainMemorybackingFormat(virBuffer *buf, + const virDomainMemtune *mem) + { + g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); ++ g_auto(virBuffer) allocAttrBuf = VIR_BUFFER_INITIALIZER; + + if (mem->nhugepages) + virDomainHugepagesFormat(&childBuf, mem->hugepages, mem->nhugepages); +@@ -27653,8 +27661,13 @@ virDomainMemorybackingFormat(virBuffer *buf, + virBufferAsprintf(&childBuf, "\n", + virDomainMemoryAccessTypeToString(mem->access)); + if (mem->allocation) +- virBufferAsprintf(&childBuf, "\n", ++ virBufferAsprintf(&allocAttrBuf, " mode='%s'", + virDomainMemoryAllocationTypeToString(mem->allocation)); ++ if (mem->allocation_threads > 0) ++ virBufferAsprintf(&allocAttrBuf, " threads='%u'", mem->allocation_threads); ++ ++ virXMLFormatElement(&childBuf, "allocation", &allocAttrBuf, NULL); ++ + if (mem->discard) + virBufferAddLit(&childBuf, "\n"); + +diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h +index 144ba4dd12..10af94e2e4 100644 +--- a/src/conf/domain_conf.h ++++ b/src/conf/domain_conf.h +@@ -2677,6 +2677,7 @@ struct _virDomainMemtune { + int source; /* enum virDomainMemorySource */ + int access; /* enum virDomainMemoryAccess */ + int allocation; /* enum virDomainMemoryAllocation */ ++ unsigned int allocation_threads; + + virTristateBool discard; + }; +diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml +index 1ebcee8939..1ac87e3aef 100644 +--- a/tests/qemuxml2argvdata/memfd-memory-numa.xml ++++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml +@@ -10,7 +10,7 @@ + + + +- ++ + + 8 + +-- +2.35.1 + diff --git a/libvirt-docs-Document-TPM-portion-of-domcaps.patch b/libvirt-docs-Document-TPM-portion-of-domcaps.patch new file mode 100644 index 0000000..e093c28 --- /dev/null +++ b/libvirt-docs-Document-TPM-portion-of-domcaps.patch @@ -0,0 +1,62 @@ +From b5a226f307b01bb1b58a88c95d29da34c246757f Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Tue, 12 Jul 2022 16:10:08 +0200 +Subject: [PATCH] docs: Document TPM portion of domcaps + +Surprisingly, we don't document TPM part of domain capabilities. +Fortunately, the information exposed is pretty much self +explanatory, but we should document it regardless. + +Signed-off-by: Michal Privoznik +Reviewed-by: Peter Krempa +(cherry picked from commit 6a00c565c4d0f0ec970e043ea2686bd30396ed79) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103119 +Signed-off-by: Michal Privoznik +--- + docs/formatdomaincaps.rst | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst +index 933469b2a2..3c425a9a4a 100644 +--- a/docs/formatdomaincaps.rst ++++ b/docs/formatdomaincaps.rst +@@ -494,6 +494,35 @@ instance: + ``driverType`` + Options for the ``type`` attribute of the element. + ++TPM device ++^^^^^^^^^^ ++ ++TPM device capabilities are exposed under the ``tpm`` element. For instance: ++ ++:: ++ ++ ++ ... ++ ++ ++ ++ tpm-tis ++ tpm-crb ++ ++ ++ passthrough ++ emulator ++ ++ ++ ... ++ ++ ++ ++``model`` ++ Options for the ``model`` attribute of the ```` element. ++``backendModel`` ++ Options for the ``type`` attribute of the ```` element. ++ + Features + ~~~~~~~~ + +-- +2.35.1 + diff --git a/libvirt-domain_conf-Format-defaultiothread-more-often.patch b/libvirt-domain_conf-Format-defaultiothread-more-often.patch new file mode 100644 index 0000000..46b436d --- /dev/null +++ b/libvirt-domain_conf-Format-defaultiothread-more-often.patch @@ -0,0 +1,96 @@ +From a39ce54007de67ce6909c1770a7759b09c41bfd6 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Thu, 7 Jul 2022 16:29:18 +0200 +Subject: [PATCH] domain_conf: Format more often +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The element is formatted inside +virDomainDefaultIOThreadDefFormat() which is called only from +virDomainDefIOThreadsFormat() (so that IOThread related stuff is +formatted calling one function). However, when there are no + defined (or only autoallocated ones are present), +then the outer formatting function exits early never calling the + formatter. + +Signed-off-by: Michal Privoznik +Reviewed-by: Ján Tomko +(cherry picked from commit 24fa7004e47ce86b92bc23c1f2ef9c3d6152c3a8) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2059511 +Signed-off-by: Michal Privoznik +--- + src/conf/domain_conf.c | 46 ++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 24 deletions(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 709ca53790..207a45d9ae 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -27763,40 +27763,38 @@ static void + virDomainDefIOThreadsFormat(virBuffer *buf, + const virDomainDef *def) + { +- g_auto(virBuffer) childrenBuf = VIR_BUFFER_INIT_CHILD(buf); +- size_t i; +- +- if (def->niothreadids == 0) +- return; ++ if (def->niothreadids > 0) { ++ virBufferAsprintf(buf, "%zu\n", ++ def->niothreadids); ++ } + +- virBufferAsprintf(buf, "%zu\n", +- def->niothreadids); ++ if (virDomainDefIothreadShouldFormat(def)) { ++ g_auto(virBuffer) childrenBuf = VIR_BUFFER_INIT_CHILD(buf); ++ size_t i; + +- if (!virDomainDefIothreadShouldFormat(def)) +- return; ++ for (i = 0; i < def->niothreadids; i++) { ++ virDomainIOThreadIDDef *iothread = def->iothreadids[i]; ++ g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; + +- for (i = 0; i < def->niothreadids; i++) { +- virDomainIOThreadIDDef *iothread = def->iothreadids[i]; +- g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; ++ virBufferAsprintf(&attrBuf, " id='%u'", ++ iothread->iothread_id); + +- virBufferAsprintf(&attrBuf, " id='%u'", +- iothread->iothread_id); ++ if (iothread->thread_pool_min >= 0) { ++ virBufferAsprintf(&attrBuf, " thread_pool_min='%d'", ++ iothread->thread_pool_min); ++ } + +- if (iothread->thread_pool_min >= 0) { +- virBufferAsprintf(&attrBuf, " thread_pool_min='%d'", +- iothread->thread_pool_min); +- } ++ if (iothread->thread_pool_max >= 0) { ++ virBufferAsprintf(&attrBuf, " thread_pool_max='%d'", ++ iothread->thread_pool_max); ++ } + +- if (iothread->thread_pool_max >= 0) { +- virBufferAsprintf(&attrBuf, " thread_pool_max='%d'", +- iothread->thread_pool_max); ++ virXMLFormatElement(&childrenBuf, "iothread", &attrBuf, NULL); + } + +- virXMLFormatElement(&childrenBuf, "iothread", &attrBuf, NULL); ++ virXMLFormatElement(buf, "iothreadids", NULL, &childrenBuf); + } + +- virXMLFormatElement(buf, "iothreadids", NULL, &childrenBuf); +- + virDomainDefaultIOThreadDefFormat(buf, def); + } + +-- +2.35.1 + diff --git a/libvirt-domain_conf-Format-iothread-IDs-more-often.patch b/libvirt-domain_conf-Format-iothread-IDs-more-often.patch new file mode 100644 index 0000000..3a3d874 --- /dev/null +++ b/libvirt-domain_conf-Format-iothread-IDs-more-often.patch @@ -0,0 +1,61 @@ +From 711cf329b9847c4d42994389d89a7e7b83c71596 Mon Sep 17 00:00:00 2001 +Message-Id: <711cf329b9847c4d42994389d89a7e7b83c71596@dist-git> +From: Michal Privoznik +Date: Thu, 7 Jul 2022 16:29:33 +0200 +Subject: [PATCH] domain_conf: Format iothread IDs more often +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When formatting IOThreads (in virDomainDefIOThreadsFormat()), we +may only output the number of IOThreads, or the full list of IOThreads too: + + 4 + + + + + + + +Now, the deciding factor here is whether those individual +IOThreads were so called 'autofill-ed' or user provided. Well, we +need to take another factor in: if an IOThread has pool size +limit set, then we ought to format the full list. + +But how can we get into a situation when a thread is autofilled +(i.e. not provided by user in the XML) and yet it has pool size +limit set? virDomainSetIOThreadParams() is the answer. + +Sure, we could also unset the autofill flag whenever a pool size +limit is being set. But this approach allows us to not format +anything if the limits are reset (we don't lose the autofill +information). + +Signed-off-by: Michal Privoznik +Reviewed-by: Ján Tomko +(cherry picked from commit 5aa24958546c94a48fb8f8d6022213ca7c07c8a7) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2059511 +Signed-off-by: Michal Privoznik +--- + src/conf/domain_conf.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 207a45d9ae..fbc285d981 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -27728,7 +27728,9 @@ virDomainDefIothreadShouldFormat(const virDomainDef *def) + size_t i; + + for (i = 0; i < def->niothreadids; i++) { +- if (!def->iothreadids[i]->autofill) ++ if (!def->iothreadids[i]->autofill || ++ def->iothreadids[i]->thread_pool_min >= 0 || ++ def->iothreadids[i]->thread_pool_max >= 0) + return true; + } + +-- +2.35.1 + diff --git a/libvirt-domcaps-Introduce-TPM-backendVersion.patch b/libvirt-domcaps-Introduce-TPM-backendVersion.patch new file mode 100644 index 0000000..3631a14 --- /dev/null +++ b/libvirt-domcaps-Introduce-TPM-backendVersion.patch @@ -0,0 +1,74 @@ +From 266e8c9174249b4d5a53dc8a43a3d7d9481d8b1c Mon Sep 17 00:00:00 2001 +Message-Id: <266e8c9174249b4d5a53dc8a43a3d7d9481d8b1c@dist-git> +From: Michal Privoznik +Date: Tue, 12 Jul 2022 15:58:12 +0200 +Subject: [PATCH] domcaps: Introduce TPM backendVersion + +We accept TPM version in the domain XML. However, supported +version depends on the host (swtpm_setup binary) and thus it may +be tricky for users (or mgmt applications) chose a version. +Introduce machinery for reporting supported version in domain +capabilities. + +Signed-off-by: Michal Privoznik +Reviewed-by: Peter Krempa +(cherry picked from commit 1277a9c884039e92765c977917420511f45e52e8) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103119 +Signed-off-by: Michal Privoznik +--- + docs/formatdomaincaps.rst | 6 ++++++ + src/conf/domain_capabilities.c | 1 + + src/conf/domain_capabilities.h | 1 + + 3 files changed, 8 insertions(+) + +diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst +index 3c425a9a4a..70f46b972a 100644 +--- a/docs/formatdomaincaps.rst ++++ b/docs/formatdomaincaps.rst +@@ -513,6 +513,10 @@ TPM device capabilities are exposed under the ``tpm`` element. For instance: + passthrough + emulator + ++ ++ 1.2 ++ 2.0 ++ + + ... + +@@ -522,6 +526,8 @@ TPM device capabilities are exposed under the ``tpm`` element. For instance: + Options for the ``model`` attribute of the ```` element. + ``backendModel`` + Options for the ``type`` attribute of the ```` element. ++``backendVersion`` ++ Options for the ``version`` attribute of the ```` element. + + Features + ~~~~~~~~ +diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c +index 895e8d00e8..33570a51db 100644 +--- a/src/conf/domain_capabilities.c ++++ b/src/conf/domain_capabilities.c +@@ -539,6 +539,7 @@ virDomainCapsDeviceTPMFormat(virBuffer *buf, + + ENUM_PROCESS(tpm, model, virDomainTPMModelTypeToString); + ENUM_PROCESS(tpm, backendModel, virDomainTPMBackendTypeToString); ++ ENUM_PROCESS(tpm, backendVersion, virDomainTPMVersionTypeToString); + + FORMAT_EPILOGUE(tpm); + } +diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h +index f2eed80b15..a526969cda 100644 +--- a/src/conf/domain_capabilities.h ++++ b/src/conf/domain_capabilities.h +@@ -127,6 +127,7 @@ struct _virDomainCapsDeviceTPM { + virTristateBool supported; + virDomainCapsEnum model; /* virDomainTPMModel */ + virDomainCapsEnum backendModel; /* virDomainTPMBackendType */ ++ virDomainCapsEnum backendVersion; /* virDomainTPMVersion */ + }; + + STATIC_ASSERT_ENUM(VIR_DOMAIN_FS_DRIVER_TYPE_LAST); +-- +2.35.1 + diff --git a/libvirt-node_device-Rework-udevKludgeStorageType.patch b/libvirt-node_device-Rework-udevKludgeStorageType.patch new file mode 100644 index 0000000..0635fd0 --- /dev/null +++ b/libvirt-node_device-Rework-udevKludgeStorageType.patch @@ -0,0 +1,84 @@ +From 71a79a215d278d83f3cd3da330e0378209983b6b Mon Sep 17 00:00:00 2001 +Message-Id: <71a79a215d278d83f3cd3da330e0378209983b6b@dist-git> +From: Michal Privoznik +Date: Wed, 26 Jan 2022 14:00:13 +0100 +Subject: [PATCH] node_device: Rework udevKludgeStorageType() + +The udevKludgeStorageType() function looks at devlink name +(/dev/XXX) and guesses the type of the (storage) device using a +series of STRPREFIX() calls. Well those can be turn into an array +and a for() loop, especially if we are about to add a new case +(in the next commit). + +Signed-off-by: Michal Privoznik +Reviewed-by: Peter Krempa +(cherry picked from commit ec9e2adb961f2e1a121f47e7985142e827f3347b) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2056673 +Signed-off-by: Michal Privoznik +--- + src/node_device/node_device_udev.c | 43 ++++++++++++++++-------------- + 1 file changed, 23 insertions(+), 20 deletions(-) + +diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c +index cd1722f934..dd18401e78 100644 +--- a/src/node_device/node_device_udev.c ++++ b/src/node_device/node_device_udev.c +@@ -890,32 +890,35 @@ udevProcessDASD(struct udev_device *device, + static int + udevKludgeStorageType(virNodeDeviceDef *def) + { ++ size_t i; ++ const struct { ++ const char *prefix; ++ const char *subst; ++ } fixups[] = { ++ /* virtio disk */ ++ { "/dev/vd", "disk" }, ++ ++ /* For Direct Access Storage Devices (DASDs) there are ++ * currently no identifiers in udev besides ID_PATH. Since ++ * ID_TYPE=disk does not exist on DASDs they fall through ++ * the udevProcessStorage detection logic. */ ++ { "/dev/dasd", "dasd" }, ++ }; ++ + VIR_DEBUG("Could not find definitive storage type for device " + "with sysfs path '%s', trying to guess it", + def->sysfs_path); + +- /* virtio disk */ +- if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) { +- def->caps->data.storage.drive_type = g_strdup("disk"); +- VIR_DEBUG("Found storage type '%s' for device " +- "with sysfs path '%s'", +- def->caps->data.storage.drive_type, +- def->sysfs_path); +- return 0; ++ for (i = 0; i < G_N_ELEMENTS(fixups); i++) { ++ if (STRPREFIX(def->caps->data.storage.block, fixups[i].prefix)) { ++ def->caps->data.storage.drive_type = g_strdup(fixups[i].subst); ++ VIR_DEBUG("Found storage type '%s' for device with sysfs path '%s'", ++ def->caps->data.storage.drive_type, ++ def->sysfs_path); ++ return 0; ++ } + } + +- /* For Direct Access Storage Devices (DASDs) there are +- * currently no identifiers in udev besides ID_PATH. Since +- * ID_TYPE=disk does not exist on DASDs they fall through +- * the udevProcessStorage detection logic. */ +- if (STRPREFIX(def->caps->data.storage.block, "/dev/dasd")) { +- def->caps->data.storage.drive_type = g_strdup("dasd"); +- VIR_DEBUG("Found storage type '%s' for device " +- "with sysfs path '%s'", +- def->caps->data.storage.drive_type, +- def->sysfs_path); +- return 0; +- } + VIR_DEBUG("Could not determine storage type " + "for device with sysfs path '%s'", def->sysfs_path); + return -1; +-- +2.35.1 + diff --git a/libvirt-node_device-Treat-NVMe-disks-as-regular-disks.patch b/libvirt-node_device-Treat-NVMe-disks-as-regular-disks.patch new file mode 100644 index 0000000..259e8d2 --- /dev/null +++ b/libvirt-node_device-Treat-NVMe-disks-as-regular-disks.patch @@ -0,0 +1,39 @@ +From c04c7a986bd3514730e4169bf1a70bbec1fda006 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Wed, 26 Jan 2022 13:47:33 +0100 +Subject: [PATCH] node_device: Treat NVMe disks as regular disks + +Unfortunately, udev doesn't set ID_TYPE attribute for NVMe disks, +therefore we have to add another case into udevKludgeStorageType() +to treat /dev/nvme* devlinks as any other disk. + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2045953 +Signed-off-by: Michal Privoznik +Reviewed-by: Peter Krempa +(cherry picked from commit f103976ff34a52298df1810d82ececa3e7da4291) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2056673 +Signed-off-by: Michal Privoznik +--- + src/node_device/node_device_udev.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c +index dd18401e78..a9e8bf10da 100644 +--- a/src/node_device/node_device_udev.c ++++ b/src/node_device/node_device_udev.c +@@ -903,6 +903,11 @@ udevKludgeStorageType(virNodeDeviceDef *def) + * ID_TYPE=disk does not exist on DASDs they fall through + * the udevProcessStorage detection logic. */ + { "/dev/dasd", "dasd" }, ++ ++ /* NVMe disk. While strictly speaking /dev/nvme is a ++ * controller not a disk, this function is called if and ++ * only if @def is of VIR_NODE_DEV_CAP_STORAGE type. */ ++ { "/dev/nvme", "disk" }, + }; + + VIR_DEBUG("Could not find definitive storage type for device " +-- +2.35.1 + diff --git a/libvirt-qemu-Always-assume-support-for-QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE.patch b/libvirt-qemu-Always-assume-support-for-QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE.patch new file mode 100644 index 0000000..7ecdf33 --- /dev/null +++ b/libvirt-qemu-Always-assume-support-for-QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE.patch @@ -0,0 +1,183 @@ +From b020ddee84458afd8de70d9f296b91fa2b6a95fd Mon Sep 17 00:00:00 2001 +Message-Id: +From: Peter Krempa +Date: Fri, 15 Jul 2022 14:16:54 +0200 +Subject: [PATCH] qemu: Always assume support for + QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE + +The 'xbzrle-cache-size' parameter was added in qemu-2.11 thus all +supported qemu versions now use the new code path. + +Signed-off-by: Peter Krempa +Reviewed-by: Michal Privoznik +(cherry picked from commit 06e0ba3da71ec6c58024efe57d0f55d3d1352d60) + +This commit is not strictly needed for fixing the following BZ, but it +removes a code which will be never executed in RHEL 9 and backporting it +avoids conflicts with the actual bug fix. + +https://bugzilla.redhat.com/show_bug.cgi?id=2107892 + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_driver.c | 56 +++++++++----------------------- + src/qemu/qemu_migration_params.c | 18 ---------- + 2 files changed, 16 insertions(+), 58 deletions(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 17e4c23199..256e126ae1 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -13172,10 +13172,8 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, + { + virQEMUDriver *driver = dom->conn->privateData; + virDomainObj *vm; +- qemuDomainObjPrivate *priv; + g_autoptr(qemuMigrationParams) migParams = NULL; + int ret = -1; +- int rc; + + virCheckFlags(0, -1); + +@@ -13191,8 +13189,6 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, + if (virDomainObjCheckActive(vm) < 0) + goto endjob; + +- priv = vm->privateData; +- + if (!qemuMigrationCapsGet(vm, QEMU_MIGRATION_CAP_XBZRLE)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Compressed migration is not supported by " +@@ -13200,22 +13196,14 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, + goto endjob; + } + +- if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) { +- if (qemuMigrationParamsFetch(driver, vm, VIR_ASYNC_JOB_NONE, +- &migParams) < 0) +- goto endjob; ++ if (qemuMigrationParamsFetch(driver, vm, VIR_ASYNC_JOB_NONE, ++ &migParams) < 0) ++ goto endjob; + +- if (qemuMigrationParamsGetULL(migParams, +- QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, +- cacheSize) < 0) +- goto endjob; +- } else { +- qemuDomainObjEnterMonitor(driver, vm); +- rc = qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize); +- qemuDomainObjExitMonitor(vm); +- if (rc < 0) +- goto endjob; +- } ++ if (qemuMigrationParamsGetULL(migParams, ++ QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, ++ cacheSize) < 0) ++ goto endjob; + + ret = 0; + +@@ -13234,10 +13222,8 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, + { + virQEMUDriver *driver = dom->conn->privateData; + virDomainObj *vm; +- qemuDomainObjPrivate *priv; + g_autoptr(qemuMigrationParams) migParams = NULL; + int ret = -1; +- int rc; + + virCheckFlags(0, -1); + +@@ -13253,8 +13239,6 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, + if (virDomainObjCheckActive(vm) < 0) + goto endjob; + +- priv = vm->privateData; +- + if (!qemuMigrationCapsGet(vm, QEMU_MIGRATION_CAP_XBZRLE)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Compressed migration is not supported by " +@@ -13263,25 +13247,17 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, + } + + VIR_DEBUG("Setting compression cache to %llu B", cacheSize); +- if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) { +- if (!(migParams = qemuMigrationParamsNew())) +- goto endjob; ++ if (!(migParams = qemuMigrationParamsNew())) ++ goto endjob; + +- if (qemuMigrationParamsSetULL(migParams, +- QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, +- cacheSize) < 0) +- goto endjob; ++ if (qemuMigrationParamsSetULL(migParams, ++ QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, ++ cacheSize) < 0) ++ goto endjob; + +- if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, +- migParams, 0) < 0) +- goto endjob; +- } else { +- qemuDomainObjEnterMonitor(driver, vm); +- rc = qemuMonitorSetMigrationCacheSize(priv->mon, cacheSize); +- qemuDomainObjExitMonitor(vm); +- if (rc < 0) +- goto endjob; +- } ++ if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, ++ migParams, 0) < 0) ++ goto endjob; + + ret = 0; + +diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c +index 6ea0bde13a..0bce358ac3 100644 +--- a/src/qemu/qemu_migration_params.c ++++ b/src/qemu/qemu_migration_params.c +@@ -886,10 +886,8 @@ qemuMigrationParamsApply(virQEMUDriver *driver, + unsigned long apiFlags) + { + qemuDomainObjPrivate *priv = vm->privateData; +- bool xbzrleCacheSize_old = false; + g_autoptr(virJSONValue) params = NULL; + g_autoptr(virJSONValue) caps = NULL; +- qemuMigrationParam xbzrle = QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE; + bool postcopyResume = !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME); + int ret = -1; + +@@ -917,19 +915,6 @@ qemuMigrationParamsApply(virQEMUDriver *driver, + } + } + +- /* If QEMU is too old to support xbzrle-cache-size migration parameter, +- * we need to set it via migrate-set-cache-size and tell +- * qemuMonitorSetMigrationParams to ignore this parameter. +- */ +- if (migParams->params[xbzrle].set && +- !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) { +- if (qemuMonitorSetMigrationCacheSize(priv->mon, +- migParams->params[xbzrle].value.ull) < 0) +- goto cleanup; +- xbzrleCacheSize_old = true; +- migParams->params[xbzrle].set = false; +- } +- + if (!(params = qemuMigrationParamsToJSON(migParams, postcopyResume))) + goto cleanup; + +@@ -942,9 +927,6 @@ qemuMigrationParamsApply(virQEMUDriver *driver, + cleanup: + qemuDomainObjExitMonitor(vm); + +- if (xbzrleCacheSize_old) +- migParams->params[xbzrle].set = true; +- + return ret; + } + +-- +2.35.1 + diff --git a/libvirt-qemu-Make-IOThread-changing-more-robust.patch b/libvirt-qemu-Make-IOThread-changing-more-robust.patch new file mode 100644 index 0000000..a94f31c --- /dev/null +++ b/libvirt-qemu-Make-IOThread-changing-more-robust.patch @@ -0,0 +1,195 @@ +From 5853ac5261b2934ca300b24a7bd78cc4b377c90c Mon Sep 17 00:00:00 2001 +Message-Id: <5853ac5261b2934ca300b24a7bd78cc4b377c90c@dist-git> +From: Michal Privoznik +Date: Thu, 7 Jul 2022 17:37:46 +0200 +Subject: [PATCH] qemu: Make IOThread changing more robust +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There are three APIs that allow changing IOThreads: + + virDomainAddIOThread() + virDomainDelIOThread() + virDomainSetIOThreadParams() + +In case of QEMU driver these are handled by +qemuDomainChgIOThread() which attempts to be versatile enough to +work on both inactive and live domain definitions at the same +time. However, it's a bit clumsy - when a change to live +definition succeeds but fails in inactive definition then there's +no rollback. And somewhat rightfully so - changes to live +definition are in general harder to roll back. Therefore, do what +we do elsewhere (qemuDomainAttachDeviceLiveAndConfig(), +qemuDomainDetachDeviceAliasLiveAndConfig(), ...): + + 1) do the change to inactive XML first, + 2) in fact, do the change to a copy of inactive XML, + 3) swap inactive XML and its copy only after everything + succeeded. + +Signed-off-by: Michal Privoznik +Reviewed-by: Ján Tomko +(cherry picked from commit 6db9c95a45d4e24cdcd5c009b7fe5da3745b5d59) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2059511 +Signed-off-by: Michal Privoznik +--- + src/qemu/qemu_driver.c | 74 ++++++++++++++++++++++++------------------ + 1 file changed, 43 insertions(+), 31 deletions(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 3b5c3db67c..2c627396f1 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -5594,6 +5594,7 @@ qemuDomainChgIOThread(virQEMUDriver *driver, + { + g_autoptr(virQEMUDriverConfig) cfg = NULL; + qemuDomainObjPrivate *priv; ++ g_autoptr(virDomainDef) defcopy = NULL; + virDomainDef *def; + virDomainDef *persistentDef; + virDomainIOThreadIDDef *iothreaddef = NULL; +@@ -5609,34 +5610,34 @@ qemuDomainChgIOThread(virQEMUDriver *driver, + if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) + goto endjob; + +- if (def) { +- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD)) { +- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", +- _("IOThreads not supported with this binary")); +- goto endjob; +- } ++ if (persistentDef) { ++ /* Make a copy of persistent definition and do all the changes there. ++ * Swap the definitions only after changes to live definition ++ * succeeded. */ ++ if (!(defcopy = virDomainObjCopyPersistentDef(vm, driver->xmlopt, ++ priv->qemuCaps))) ++ return -1; + + switch (action) { + case VIR_DOMAIN_IOTHREAD_ACTION_ADD: +- if (virDomainDriverAddIOThreadCheck(def, iothread.iothread_id) < 0) ++ if (virDomainDriverAddIOThreadCheck(defcopy, iothread.iothread_id) < 0) + goto endjob; + +- if (qemuDomainHotplugAddIOThread(driver, vm, iothread.iothread_id) < 0) ++ if (!virDomainIOThreadIDAdd(defcopy, iothread.iothread_id)) + goto endjob; + + break; + + case VIR_DOMAIN_IOTHREAD_ACTION_DEL: +- if (virDomainDriverDelIOThreadCheck(def, iothread.iothread_id) < 0) ++ if (virDomainDriverDelIOThreadCheck(defcopy, iothread.iothread_id) < 0) + goto endjob; + +- if (qemuDomainHotplugDelIOThread(driver, vm, iothread.iothread_id) < 0) +- goto endjob; ++ virDomainIOThreadIDDel(defcopy, iothread.iothread_id); + + break; + + case VIR_DOMAIN_IOTHREAD_ACTION_MOD: +- iothreaddef = virDomainIOThreadIDFind(def, iothread.iothread_id); ++ iothreaddef = virDomainIOThreadIDFind(defcopy, iothread.iothread_id); + + if (!iothreaddef) { + virReportError(VIR_ERR_INVALID_ARG, +@@ -5645,41 +5646,47 @@ qemuDomainChgIOThread(virQEMUDriver *driver, + goto endjob; + } + +- if (qemuDomainIOThreadValidate(iothreaddef, iothread, true) < 0) ++ if (qemuDomainIOThreadValidate(iothreaddef, iothread, false) < 0) + goto endjob; + +- if (qemuDomainHotplugModIOThread(driver, vm, iothread) < 0) ++ if (qemuDomainHotplugModIOThreadIDDef(iothreaddef, iothread) < 0) { ++ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", ++ _("configuring persistent polling values is not supported")); + goto endjob; ++ } + +- qemuDomainHotplugModIOThreadIDDef(iothreaddef, iothread); + break; +- + } +- +- qemuDomainSaveStatus(vm); + } + +- if (persistentDef) { ++ if (def) { ++ if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD)) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("IOThreads not supported with this binary")); ++ goto endjob; ++ } ++ + switch (action) { + case VIR_DOMAIN_IOTHREAD_ACTION_ADD: +- if (virDomainDriverAddIOThreadCheck(persistentDef, iothread.iothread_id) < 0) ++ if (virDomainDriverAddIOThreadCheck(def, iothread.iothread_id) < 0) + goto endjob; + +- if (!virDomainIOThreadIDAdd(persistentDef, iothread.iothread_id)) ++ if (qemuDomainHotplugAddIOThread(driver, vm, iothread.iothread_id) < 0) + goto endjob; + + break; + + case VIR_DOMAIN_IOTHREAD_ACTION_DEL: +- if (virDomainDriverDelIOThreadCheck(persistentDef, iothread.iothread_id) < 0) ++ if (virDomainDriverDelIOThreadCheck(def, iothread.iothread_id) < 0) + goto endjob; + +- virDomainIOThreadIDDel(persistentDef, iothread.iothread_id); ++ if (qemuDomainHotplugDelIOThread(driver, vm, iothread.iothread_id) < 0) ++ goto endjob; + + break; + + case VIR_DOMAIN_IOTHREAD_ACTION_MOD: +- iothreaddef = virDomainIOThreadIDFind(persistentDef, iothread.iothread_id); ++ iothreaddef = virDomainIOThreadIDFind(def, iothread.iothread_id); + + if (!iothreaddef) { + virReportError(VIR_ERR_INVALID_ARG, +@@ -5688,21 +5695,26 @@ qemuDomainChgIOThread(virQEMUDriver *driver, + goto endjob; + } + +- if (qemuDomainIOThreadValidate(iothreaddef, iothread, false) < 0) ++ if (qemuDomainIOThreadValidate(iothreaddef, iothread, true) < 0) + goto endjob; + +- if (qemuDomainHotplugModIOThreadIDDef(iothreaddef, iothread) < 0) { +- virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", +- _("configuring persistent polling values is not supported")); ++ if (qemuDomainHotplugModIOThread(driver, vm, iothread) < 0) + goto endjob; +- } + ++ qemuDomainHotplugModIOThreadIDDef(iothreaddef, iothread); + break; ++ + } + +- if (virDomainDefSave(persistentDef, driver->xmlopt, +- cfg->configDir) < 0) ++ qemuDomainSaveStatus(vm); ++ } ++ ++ /* Finally, if no error until here, we can save config. */ ++ if (defcopy) { ++ if (virDomainDefSave(defcopy, driver->xmlopt, cfg->configDir) < 0) + goto endjob; ++ ++ virDomainObjAssignDef(vm, &defcopy, false, NULL); + } + + ret = 0; +-- +2.35.1 + diff --git a/libvirt-qemu-Pass-migration-flags-to-qemuMigrationParamsApply.patch b/libvirt-qemu-Pass-migration-flags-to-qemuMigrationParamsApply.patch new file mode 100644 index 0000000..a94344e --- /dev/null +++ b/libvirt-qemu-Pass-migration-flags-to-qemuMigrationParamsApply.patch @@ -0,0 +1,148 @@ +From 4c906acec14efe3893491d749465ed7e285a825c Mon Sep 17 00:00:00 2001 +Message-Id: <4c906acec14efe3893491d749465ed7e285a825c@dist-git> +From: Jiri Denemark +Date: Wed, 29 Jun 2022 12:00:03 +0200 +Subject: [PATCH] qemu: Pass migration flags to qemuMigrationParamsApply + +The flags will later be used to determine which parameters should +actually be applied. + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 0eae541257cd4f01c9d90db62056ad8d03c5af23) + +https://bugzilla.redhat.com/show_bug.cgi?id=2111070 + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_driver.c | 6 +++--- + src/qemu/qemu_migration.c | 8 ++++---- + src/qemu/qemu_migration_params.c | 11 ++++++++--- + src/qemu/qemu_migration_params.h | 3 ++- + 4 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 847c96639d..17e4c23199 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -13091,7 +13091,7 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, + goto endjob; + + if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, +- migParams) < 0) ++ migParams, 0) < 0) + goto endjob; + } else { + qemuDomainObjEnterMonitor(driver, vm); +@@ -13273,7 +13273,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, + goto endjob; + + if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, +- migParams) < 0) ++ migParams, 0) < 0) + goto endjob; + } else { + qemuDomainObjEnterMonitor(driver, vm); +@@ -13360,7 +13360,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, + goto endjob; + + if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, +- migParams) < 0) ++ migParams, 0) < 0) + goto endjob; + } else { + int rc; +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 76903d612b..8cbd73a809 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -3259,7 +3259,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver, + } + + if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN, +- migParams) < 0) ++ migParams, flags) < 0) + goto error; + + if (mig->nbd && +@@ -4847,7 +4847,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, + goto error; + + if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_MIGRATION_OUT, +- migParams) < 0) ++ migParams, flags) < 0) + goto error; + + if (flags & VIR_MIGRATE_ZEROCOPY) { +@@ -6941,7 +6941,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, + QEMU_DOMAIN_MIG_BANDWIDTH_MAX * 1024 * 1024) < 0) + return -1; + +- if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams) < 0) ++ if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams, 0) < 0) + return -1; + + priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX; +@@ -7037,7 +7037,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, + QEMU_MIGRATION_PARAM_MAX_BANDWIDTH, + saveMigBandwidth * 1024 * 1024) == 0) + ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob, +- migParams)); ++ migParams, 0)); + } else { + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { + qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth); +diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c +index cc66ed8229..398c07efd0 100644 +--- a/src/qemu/qemu_migration_params.c ++++ b/src/qemu/qemu_migration_params.c +@@ -833,8 +833,10 @@ qemuMigrationCapsToJSON(virBitmap *caps, + * @vm: domain object + * @asyncJob: migration job + * @migParams: migration parameters to send to QEMU ++ * @apiFlags: migration flags, some of them may affect which parameters are applied + * +- * Send all parameters stored in @migParams to QEMU. ++ * Send parameters stored in @migParams to QEMU. If @apiFlags is non-zero, some ++ * parameters that do not make sense for the enabled flags will be ignored. + * + * Returns 0 on success, -1 on failure. + */ +@@ -842,7 +844,8 @@ int + qemuMigrationParamsApply(virQEMUDriver *driver, + virDomainObj *vm, + int asyncJob, +- qemuMigrationParams *migParams) ++ qemuMigrationParams *migParams, ++ unsigned long apiFlags G_GNUC_UNUSED) + { + qemuDomainObjPrivate *priv = vm->privateData; + bool xbzrleCacheSize_old = false; +@@ -1245,7 +1248,9 @@ qemuMigrationParamsReset(virQEMUDriver *driver, + if (!virDomainObjIsActive(vm) || !origParams) + goto cleanup; + +- if (qemuMigrationParamsApply(driver, vm, asyncJob, origParams) < 0) ++ /* Do not pass apiFlags to qemuMigrationParamsApply here to make sure all ++ * parameters and capabilities are reset. */ ++ if (qemuMigrationParamsApply(driver, vm, asyncJob, origParams, 0) < 0) + goto cleanup; + + qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags); +diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h +index d1184acded..9e990e09bd 100644 +--- a/src/qemu/qemu_migration_params.h ++++ b/src/qemu/qemu_migration_params.h +@@ -98,7 +98,8 @@ int + qemuMigrationParamsApply(virQEMUDriver *driver, + virDomainObj *vm, + int asyncJob, +- qemuMigrationParams *migParams); ++ qemuMigrationParams *migParams, ++ unsigned long apiFlags); + + int + qemuMigrationParamsEnableTLS(virQEMUDriver *driver, +-- +2.35.1 + diff --git a/libvirt-qemu-Properly-release-job-in-qemuDomainSaveInternal.patch b/libvirt-qemu-Properly-release-job-in-qemuDomainSaveInternal.patch new file mode 100644 index 0000000..dd92c38 --- /dev/null +++ b/libvirt-qemu-Properly-release-job-in-qemuDomainSaveInternal.patch @@ -0,0 +1,38 @@ +From b35eb8dd4800be4dba22eb0a38da4d4d1c54521f Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Denemark +Date: Wed, 27 Jul 2022 15:40:12 +0200 +Subject: [PATCH] qemu: Properly release job in qemuDomainSaveInternal + +The function would fail to release the job in case +qemuMigrationSrcIsAllowed failed. + +Fixes v8.5.0-157-g69e0e33873 + +Signed-off-by: Jiri Denemark +Reviewed-by: Pavel Hrdina +(cherry picked from commit 9c3d398df11024ef6c00a50c98fcc0f1f66c16a1) + +https://bugzilla.redhat.com/show_bug.cgi?id=1497907 + +Signed-off-by: Jiri Denemark +--- + 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 256e126ae1..ebd6365f52 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -2655,7 +2655,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, + goto cleanup; + + if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_SAVE, 0)) +- goto cleanup; ++ goto endjob; + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", +-- +2.35.1 + diff --git a/libvirt-qemu-Report-supported-TPM-version-in-domcaps.patch b/libvirt-qemu-Report-supported-TPM-version-in-domcaps.patch new file mode 100644 index 0000000..cb84c51 --- /dev/null +++ b/libvirt-qemu-Report-supported-TPM-version-in-domcaps.patch @@ -0,0 +1,49 @@ +From b3d2dae261768c00b5d92203351ff6dd7cde468e Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Tue, 12 Jul 2022 15:58:17 +0200 +Subject: [PATCH] qemu: Report supported TPM version in domcaps + +Now that we have everything prepared, we can start detecting +supported TPM versions and setting corresponding values in +backendModel struct. + +Resolves: https://gitlab.com/libvirt/libvirt/-/issues/340 +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103119 +Signed-off-by: Michal Privoznik +Reviewed-by: Peter Krempa +(cherry picked from commit 430ab88ab17727ac9774ee5b47f09f69c57add73) +Signed-off-by: Michal Privoznik +--- + src/qemu/qemu_capabilities.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c +index 2c3be3ecec..8586930266 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -6368,9 +6368,18 @@ virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps, + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH)) + VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel, VIR_DOMAIN_TPM_TYPE_PASSTHROUGH); +- if (virTPMHasSwtpm() && +- virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR)) +- VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel, VIR_DOMAIN_TPM_TYPE_EMULATOR); ++ if (virTPMHasSwtpm()) { ++ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR)) ++ VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel, VIR_DOMAIN_TPM_TYPE_EMULATOR); ++ if (virTPMSwtpmSetupCapsGet(VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2)) { ++ VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendVersion, VIR_DOMAIN_TPM_VERSION_1_2); ++ tpm->backendVersion.report = true; ++ } ++ if (virTPMSwtpmSetupCapsGet(VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0)) { ++ VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendVersion, VIR_DOMAIN_TPM_VERSION_2_0); ++ tpm->backendVersion.report = true; ++ } ++ } + + /* + * Need at least one frontend if it is to be usable by applications +-- +2.35.1 + diff --git a/libvirt-qemu-Restore-original-memory-locking-limit-on-reconnect.patch b/libvirt-qemu-Restore-original-memory-locking-limit-on-reconnect.patch new file mode 100644 index 0000000..6b22dd7 --- /dev/null +++ b/libvirt-qemu-Restore-original-memory-locking-limit-on-reconnect.patch @@ -0,0 +1,85 @@ +From a1d825e5dcb8cbe0854fa852d25e5997a52d57cd Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Denemark +Date: Wed, 27 Jul 2022 14:33:23 +0200 +Subject: [PATCH] qemu: Restore original memory locking limit on reconnect + +Commit v8.4.0-287-gd4d3bb8130 tried to make sure the original +pre-migration memory locking limit is restored at the end of migration, +but it missed the case when libvirt daemon is restarted during +migration which needs to be aborted on reconnect. + +And if this was not enough, I forgot to actually save the status XML +after setting the field in priv (in the commit mentioned above and also +in v8.4.0-291-gd375993ab3). + +https://bugzilla.redhat.com/show_bug.cgi?id=2107424 + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit bb9badb9168ad0d40bca86b6463ef504624f096d) + +Conflicts: + src/qemu/qemu_migration.c + - commit v8.5.0-2-gf9dcc01a0f not backported + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_migration.c | 13 +++++++++---- + src/qemu/qemu_process.c | 2 ++ + 2 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 9289df81eb..61fcaf4258 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -4672,10 +4672,12 @@ qemuMigrationSrcStart(virDomainObj *vm, + switch (spec->destType) { + case MIGRATION_DEST_HOST: + if (STREQ(spec->dest.host.protocol, "rdma") && +- vm->def->mem.hard_limit > 0 && +- qemuDomainSetMaxMemLock(vm, vm->def->mem.hard_limit << 10, +- &priv->preMigrationMemlock) < 0) { +- return -1; ++ vm->def->mem.hard_limit > 0) { ++ if (qemuDomainSetMaxMemLock(vm, vm->def->mem.hard_limit << 10, ++ &priv->preMigrationMemlock) < 0) ++ return -1; ++ /* Store the original memory locking limit */ ++ qemuDomainSaveStatus(vm); + } + return qemuMonitorMigrateToHost(priv->mon, migrateFlags, + spec->dest.host.protocol, +@@ -4870,6 +4872,9 @@ qemuMigrationSrcRun(virQEMUDriver *driver, + + if (qemuDomainSetMaxMemLock(vm, limit << 10, &priv->preMigrationMemlock) < 0) + goto error; ++ ++ /* Store the original memory locking limit */ ++ qemuDomainSaveStatus(vm); + } + + if (storageMigration) { +diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c +index 771a623ef7..1c28d4b102 100644 +--- a/src/qemu/qemu_process.c ++++ b/src/qemu/qemu_process.c +@@ -3677,6 +3677,7 @@ qemuProcessRecoverMigration(virQEMUDriver *driver, + { + virDomainJobStatus migStatus = VIR_DOMAIN_JOB_STATUS_NONE; + qemuDomainJobPrivate *jobPriv = job->privateData; ++ qemuDomainObjPrivate *priv = vm->privateData; + virDomainState state; + int reason; + int rc; +@@ -3726,6 +3727,7 @@ qemuProcessRecoverMigration(virQEMUDriver *driver, + + qemuMigrationParamsReset(driver, vm, VIR_ASYNC_JOB_NONE, + jobPriv->migParams, job->apiFlags); ++ qemuDomainSetMaxMemLock(vm, 0, &priv->preMigrationMemlock); + + return 0; + } +-- +2.35.1 + diff --git a/libvirt-qemu-Validate-domain-definition-even-on-migration.patch b/libvirt-qemu-Validate-domain-definition-even-on-migration.patch new file mode 100644 index 0000000..33d2f4d --- /dev/null +++ b/libvirt-qemu-Validate-domain-definition-even-on-migration.patch @@ -0,0 +1,72 @@ +From fa7cff4e684ededd184976d4fdf217cc155825b8 Mon Sep 17 00:00:00 2001 +Message-Id: +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) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2050702 +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-don-t-call-qemuMigrationSrcIsAllowedHostdev-from-qemuMigrationDstPrepareFresh.patch b/libvirt-qemu-don-t-call-qemuMigrationSrcIsAllowedHostdev-from-qemuMigrationDstPrepareFresh.patch new file mode 100644 index 0000000..537f227 --- /dev/null +++ b/libvirt-qemu-don-t-call-qemuMigrationSrcIsAllowedHostdev-from-qemuMigrationDstPrepareFresh.patch @@ -0,0 +1,61 @@ +From d51e6092ed7977daf662ed1def0f6cd5cc6ba33d Mon Sep 17 00:00:00 2001 +Message-Id: +From: Laine Stump +Date: Wed, 27 Jul 2022 12:14:10 -0400 +Subject: [PATCH] qemu: don't call qemuMigrationSrcIsAllowedHostdev() from + qemuMigrationDstPrepareFresh() + +This call to qemuMigrationSrcIsAllowedHostdev() (which does a +hardcoded fail of the migration if there is any PCI or mdev hostdev +device in the domain) while doing the destination side of migration +prep was found once the call to that same function was removed from +the source side migration prep (commit 25883cd5). + +According to jdenemar, for the V2 migration protocol, prep of the +destination is the first step, so this *was* the proper place to do +the check, but for V3 migration this is in a way redundant (since we +will have already done the check on the source side (updated by +25883cd5 to query QEMU rather than do a hardcoded fail)). + +Of course it's possible that the source could support migration of a +particular VFIO device, but the destination doesn't. But the current +check on the destination side is worthless even in that case, since it +is just *always* failing rather than querying QEMU; and QEMU can't be +queried at the point where the destination check is happening, since +it isn't yet running. + +Anyway QEMU should complain when it's started if it's going to fail, +so removing this check should just move the failure to happen a bit +later. So the best solution to this problem is to simply remove the +hardcoded check/fail from qemuMigrationDstPrepareFresh() and rely on +QEMU to fail if it needs to. + +Fixes: 25883cd5f0b188f2417f294b7d219a77b219f7c2 +Signed-off-by: Laine Stump +Reviewed-by: Jiri Denemark +(cherry picked from commit 640d185f01858b7a8db401235c929ac4798592d0) + +https://bugzilla.redhat.com/show_bug.cgi?id=1497907 + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_migration.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 61fcaf4258..e3ba4c3f78 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -3382,9 +3382,6 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver, + QEMU_MIGRATION_COOKIE_CAPS; + } + +- if (!qemuMigrationSrcIsAllowedHostdev(*def)) +- goto cleanup; +- + /* Let migration hook filter domain XML */ + if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { + g_autofree char *xml = NULL; +-- +2.35.1 + diff --git a/libvirt-qemu-don-t-try-to-query-QEMU-about-migration-blockers-during-offline-migration.patch b/libvirt-qemu-don-t-try-to-query-QEMU-about-migration-blockers-during-offline-migration.patch new file mode 100644 index 0000000..29ff19b --- /dev/null +++ b/libvirt-qemu-don-t-try-to-query-QEMU-about-migration-blockers-during-offline-migration.patch @@ -0,0 +1,87 @@ +From 80ac99d0f947f5e2fe4ff7fe9fb63b6dc6cbc1bb Mon Sep 17 00:00:00 2001 +Message-Id: <80ac99d0f947f5e2fe4ff7fe9fb63b6dc6cbc1bb@dist-git> +From: Laine Stump +Date: Thu, 21 Jul 2022 01:56:11 -0400 +Subject: [PATCH] qemu: don't try to query QEMU about migration blockers during + offline migration +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The new code that queries QEMU about migration blockers was put at the +top of qemuMigrationSrcIsAllowed(), but that function can also be +called in the case of offline migration (ie when the domain is +inactive / QEMU isn't running). This check should have been put inside +the "if (!(flags & VIR_MIGRATE_OFFLINE))" conditional, so let's move +it there. + +Fixes: 156e99f686690855be4e45d9b8b3194191a8bc31 +Signed-off-by: Laine Stump +Reviewed-by: Jiri Denemark +(cherry picked from commit 2dd5587f1dc8e2cf4e6e0a4e4cf576b8183b33cd) +Resolves: https://bugzilla.redhat.com/2092833 +Signed-off-by: Eugenio Pérez +--- + src/qemu/qemu_migration.c | 39 +++++++++++++++++++++------------------ + 1 file changed, 21 insertions(+), 18 deletions(-) + +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 735eb02673..96c4c0f1da 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -1458,24 +1458,6 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + int nsnapshots; + int pauseReason; + size_t i; +- bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps, +- QEMU_CAPS_MIGRATION_BLOCKED_REASONS); +- +- /* Ask qemu if it has a migration blocker */ +- if (blockedReasonsCap) { +- g_auto(GStrv) blockers = NULL; +- if (qemuDomainGetMigrationBlockers(driver, vm, +- VIR_ASYNC_JOB_MIGRATION_OUT, +- &blockers) < 0) +- return false; +- +- if (blockers && blockers[0]) { +- g_autofree char *reasons = g_strjoinv("; ", blockers); +- virReportError(VIR_ERR_OPERATION_INVALID, +- _("cannot migrate domain: %s"), reasons); +- return false; +- } +- } + + /* perform these checks only when migrating to remote hosts */ + if (remote) { +@@ -1493,6 +1475,27 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + + /* following checks don't make sense for offline migration */ + if (!(flags & VIR_MIGRATE_OFFLINE)) { ++ bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps, ++ QEMU_CAPS_MIGRATION_BLOCKED_REASONS); ++ ++ /* Ask qemu if it has a migration blocker */ ++ if (blockedReasonsCap) { ++ g_auto(GStrv) blockers = NULL; ++ ++ if (qemuDomainGetMigrationBlockers(driver, vm, ++ VIR_ASYNC_JOB_MIGRATION_OUT, ++ &blockers) < 0) { ++ return false; ++ } ++ ++ if (blockers && blockers[0]) { ++ g_autofree char *reasons = g_strjoinv("; ", blockers); ++ virReportError(VIR_ERR_OPERATION_INVALID, ++ _("cannot migrate domain: %s"), reasons); ++ return false; ++ } ++ } ++ + if (remote) { + /* cancel migration if disk I/O error is emitted while migrating */ + if (flags & VIR_MIGRATE_ABORT_ON_ERROR && +-- +2.35.1 + diff --git a/libvirt-qemu-fix-inactive-snapshot-revert.patch b/libvirt-qemu-fix-inactive-snapshot-revert.patch new file mode 100644 index 0000000..3c03910 --- /dev/null +++ b/libvirt-qemu-fix-inactive-snapshot-revert.patch @@ -0,0 +1,44 @@ +From 94bc9eaf3bbcaec47bd233378bbbb45f5f1523ca Mon Sep 17 00:00:00 2001 +Message-Id: <94bc9eaf3bbcaec47bd233378bbbb45f5f1523ca@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) + +https://bugzilla.redhat.com/show_bug.cgi?id=2043584 + +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-introduce-capability-QEMU_CAPS_MIGRATION_BLOCKED_REASONS.patch b/libvirt-qemu-introduce-capability-QEMU_CAPS_MIGRATION_BLOCKED_REASONS.patch new file mode 100644 index 0000000..5335271 --- /dev/null +++ b/libvirt-qemu-introduce-capability-QEMU_CAPS_MIGRATION_BLOCKED_REASONS.patch @@ -0,0 +1,206 @@ +From 81f8b07ed1e4e485ded7f366739c110351120785 Mon Sep 17 00:00:00 2001 +Message-Id: <81f8b07ed1e4e485ded7f366739c110351120785@dist-git> +From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= +Date: Thu, 21 Jul 2022 19:29:05 +0200 +Subject: [PATCH] qemu: introduce capability + QEMU_CAPS_MIGRATION_BLOCKED_REASONS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +since qemu 6.0, if migration is blocked for some reason, 'query-migrate' +will return an array of error strings describing the migration blockers. +This can be used to check whether there are any devices blocking +migration, etc. + +Signed-off-by: Jonathon Jongsma +Signed-off-by: Eugenio Pérez +Reviewed-by: Jiri Denemark +Reviewed-by: Laine Stump + +(cherry picked from commit 1e9d84d9f9513a73572842db30e3d1445e892291) +Resolves: https://bugzilla.redhat.com/2092833 +Signed-off-by: Eugenio Pérez +--- + src/qemu/qemu_capabilities.c | 2 ++ + src/qemu/qemu_capabilities.h | 1 + + tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + + tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 + + tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 + + tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 + + tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 + + tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 + + 13 files changed, 14 insertions(+) + +diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c +index 8586930266..48002f3b58 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -671,6 +671,7 @@ VIR_ENUM_IMPL(virQEMUCaps, + "chardev.qemu-vdagent", /* QEMU_CAPS_CHARDEV_QEMU_VDAGENT */ + "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */ + "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */ ++ "migration.blocked-reasons", /* QEMU_CAPS_MIGRATION_BLOCKED_REASONS */ + ); + + +@@ -1623,6 +1624,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { + { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_QEMU_VDAGENT }, + { "query-display-options/ret-type/+dbus", QEMU_CAPS_DISPLAY_DBUS }, + { "object-add/arg-type/+iothread/thread-pool-max", QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX }, ++ { "query-migrate/ret-type/blocked-reasons", QEMU_CAPS_MIGRATION_BLOCKED_REASONS }, + }; + + typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; +diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h +index 6f35ba1485..570e43292d 100644 +--- a/src/qemu/qemu_capabilities.h ++++ b/src/qemu/qemu_capabilities.h +@@ -650,6 +650,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ + QEMU_CAPS_CHARDEV_QEMU_VDAGENT, /* -chardev qemu-vdagent */ + QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */ + QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */ ++ QEMU_CAPS_MIGRATION_BLOCKED_REASONS, /* query-migrate returns 'blocked-reasons */ + + QEMU_CAPS_LAST /* this must always be the last item */ + } virQEMUCapsFlags; +diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +index 4b4cc2d3aa..3e48d17811 100644 +--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +@@ -189,6 +189,7 @@ + + + ++ + 6000000 + 0 + 61700242 +diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +index 06543071aa..790b7221d4 100644 +--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml ++++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +@@ -147,6 +147,7 @@ + + + ++ + 6000000 + 0 + 39100242 +diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +index 8c61bf8a84..86c3732c72 100644 +--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +@@ -231,6 +231,7 @@ + + + ++ + 6000000 + 0 + 43100242 +diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +index afd8f606eb..bd76a7a398 100644 +--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +@@ -236,6 +236,7 @@ + + + ++ + 6001000 + 0 + 43100243 +diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +index 86fc46918f..6ed51ec796 100644 +--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +@@ -201,6 +201,7 @@ + + + ++ + 6001050 + 0 + 61700244 +diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +index 983b54430d..1a98fe122e 100644 +--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +@@ -196,6 +196,7 @@ + + + ++ + 6002000 + 0 + 42900244 +diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +index 19605d93ae..a77efaaa37 100644 +--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +@@ -238,6 +238,7 @@ + + + ++ + 6002000 + 0 + 43100244 +diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +index e24e2235fb..6848a075a8 100644 +--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +@@ -209,6 +209,7 @@ + + + ++ + 6002092 + 0 + 61700243 +diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +index 83e0f50e3a..cf4286b78b 100644 +--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +@@ -213,6 +213,7 @@ + + + ++ + 7000000 + 0 + 42900243 +diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +index 05f844fd5b..8e2c1652f9 100644 +--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +@@ -243,6 +243,7 @@ + + + ++ + 7000000 + 0 + 43100243 +diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +index 3707d9b7c9..9bdb207c4e 100644 +--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +@@ -244,6 +244,7 @@ + + + ++ + 7000050 + 0 + 43100244 +-- +2.35.1 + diff --git a/libvirt-qemu-new-function-to-retrieve-migration-blocker-reasons-from-QEMU.patch b/libvirt-qemu-new-function-to-retrieve-migration-blocker-reasons-from-QEMU.patch new file mode 100644 index 0000000..827112d --- /dev/null +++ b/libvirt-qemu-new-function-to-retrieve-migration-blocker-reasons-from-QEMU.patch @@ -0,0 +1,140 @@ +From 90d326f60706a990db3ed49ba338d911471578c0 Mon Sep 17 00:00:00 2001 +Message-Id: <90d326f60706a990db3ed49ba338d911471578c0@dist-git> +From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= +Date: Thu, 21 Jul 2022 19:29:10 +0200 +Subject: [PATCH] qemu: new function to retrieve migration blocker reasons from + QEMU +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since QEMU 6.0, if migration is blocked for some reason, +'query-migrate' will return an array of error strings describing the +migration blockers. This can be used to check whether there are any +devices, or other conditions, that would cause migration to fail. + +This patch adds a function that sends this query via a QMP command and +returns the resulting array of reasons. qemuMigrationSrcIsAllowed() +will be able to use the new function to ask QEMU for migration +blockers, instead of the hardcoded guesses that libvirt currently has. + +Signed-off-by: Eugenio Pérez +Reviewed-by: Jiri Denemark +Reviewed-by: Laine Stump + +(cherry picked from commit 7e52c4839fabac2d19c6f22c99142e992e3d898e) +Resolves: https://bugzilla.redhat.com/2092833 +Signed-off-by: Eugenio Pérez +--- + src/qemu/qemu_monitor.c | 12 ++++++++++ + src/qemu/qemu_monitor.h | 4 ++++ + src/qemu/qemu_monitor_json.c | 46 ++++++++++++++++++++++++++++++++++++ + src/qemu/qemu_monitor_json.h | 3 +++ + 4 files changed, 65 insertions(+) + +diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c +index fda5d2f368..865a3e69ed 100644 +--- a/src/qemu/qemu_monitor.c ++++ b/src/qemu/qemu_monitor.c +@@ -4541,3 +4541,15 @@ qemuMonitorMigrateRecover(qemuMonitor *mon, + + return qemuMonitorJSONMigrateRecover(mon, uri); + } ++ ++ ++int ++qemuMonitorGetMigrationBlockers(qemuMonitor *mon, ++ char ***blockers) ++{ ++ VIR_DEBUG("blockers=%p", blockers); ++ ++ QEMU_CHECK_MONITOR(mon); ++ ++ return qemuMonitorJSONGetMigrationBlockers(mon, blockers); ++} +diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h +index 95267ec6c7..0c3f023419 100644 +--- a/src/qemu/qemu_monitor.h ++++ b/src/qemu/qemu_monitor.h +@@ -1554,3 +1554,7 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor *mon, + int + qemuMonitorMigrateRecover(qemuMonitor *mon, + const char *uri); ++ ++int ++qemuMonitorGetMigrationBlockers(qemuMonitor *mon, ++ char ***blockers); +diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c +index 3aad2ab212..84f4589c42 100644 +--- a/src/qemu/qemu_monitor_json.c ++++ b/src/qemu/qemu_monitor_json.c +@@ -3434,6 +3434,52 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon, + return 0; + } + ++ ++/* ++ * Get the exposed migration blockers. ++ * ++ * This function assume qemu has the capability of request them. ++ * ++ * It returns a NULL terminated array on blockers if there are any, or it set ++ * it to NULL otherwise. ++ */ ++int ++qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon, ++ char ***blockers) ++{ ++ g_autoptr(virJSONValue) cmd = NULL; ++ g_autoptr(virJSONValue) reply = NULL; ++ virJSONValue *data; ++ virJSONValue *jblockers; ++ size_t i; ++ ++ *blockers = NULL; ++ if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate", NULL))) ++ return -1; ++ ++ if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) ++ return -1; ++ ++ if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) ++ return -1; ++ ++ data = virJSONValueObjectGetObject(reply, "return"); ++ ++ if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons"))) ++ return 0; ++ ++ *blockers = g_new0(char *, virJSONValueArraySize(jblockers) + 1); ++ for (i = 0; i < virJSONValueArraySize(jblockers); i++) { ++ virJSONValue *jblocker = virJSONValueArrayGet(jblockers, i); ++ const char *blocker = virJSONValueGetString(jblocker); ++ ++ (*blockers)[i] = g_strdup(blocker); ++ } ++ ++ return 0; ++} ++ ++ + int qemuMonitorJSONMigrateCancel(qemuMonitor *mon) + { + g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("migrate_cancel", NULL); +diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h +index ad3853ae69..4e7d6a1a8d 100644 +--- a/src/qemu/qemu_monitor_json.h ++++ b/src/qemu/qemu_monitor_json.h +@@ -199,6 +199,9 @@ qemuMonitorJSONMigrate(qemuMonitor *mon, + unsigned int flags, + const char *uri); + int ++qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon, ++ char ***blockers); ++int + qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitor *mon, + bool *spice_migrated); + +-- +2.35.1 + diff --git a/libvirt-qemu-query-QEMU-for-migration-blockers-before-our-own-harcoded-checks.patch b/libvirt-qemu-query-QEMU-for-migration-blockers-before-our-own-harcoded-checks.patch new file mode 100644 index 0000000..89152e4 --- /dev/null +++ b/libvirt-qemu-query-QEMU-for-migration-blockers-before-our-own-harcoded-checks.patch @@ -0,0 +1,80 @@ +From 9764a6c484d4f3586b0e0be33e8c53de63b11edd Mon Sep 17 00:00:00 2001 +Message-Id: <9764a6c484d4f3586b0e0be33e8c53de63b11edd@dist-git> +From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= +Date: Thu, 21 Jul 2022 19:29:13 +0200 +Subject: [PATCH] qemu: query QEMU for migration blockers before our own + harcoded checks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since QEMU 6.0, if QEMU knows that a migration would fail, +'query-migrate' will return an array of error strings describing the +migration blockers. This can be used to check whether there are any +devices/conditions blocking migration. + +This patch adds a call to this query at the top of +qemuMigrationSrcIsAllowed(). + +Signed-off-by: Eugenio Pérez +Reviewed-by: Jiri Denemark +Reviewed-by: Laine Stump + +(cherry picked from commit 156e99f686690855be4e45d9b8b3194191a8bc31) +Resolves: https://bugzilla.redhat.com/2092833 +Signed-off-by: Eugenio Pérez +--- + src/qemu/qemu_migration.c | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 2a6b7b7819..cfb7626bb0 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -1415,6 +1415,22 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def) + } + + ++static int ++qemuDomainGetMigrationBlockers(virQEMUDriver *driver, ++ virDomainObj *vm, ++ char ***blockers) ++{ ++ qemuDomainObjPrivate *priv = vm->privateData; ++ int rc; ++ ++ qemuDomainObjEnterMonitor(driver, vm); ++ rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers); ++ qemuDomainObjExitMonitor(vm); ++ ++ return rc; ++} ++ ++ + /** + * qemuMigrationSrcIsAllowed: + * @driver: qemu driver struct +@@ -1440,6 +1456,20 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + int pauseReason; + size_t i; + ++ /* Ask qemu if it has a migration blocker */ ++ if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) { ++ g_auto(GStrv) blockers = NULL; ++ if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0) ++ return false; ++ ++ if (blockers && blockers[0]) { ++ g_autofree char *reasons = g_strjoinv("; ", blockers); ++ virReportError(VIR_ERR_OPERATION_INVALID, ++ _("cannot migrate domain: %s"), reasons); ++ return false; ++ } ++ } ++ + /* perform these checks only when migrating to remote hosts */ + if (remote) { + nsnapshots = virDomainSnapshotObjListNum(vm->snapshots, NULL, 0); +-- +2.35.1 + diff --git a/libvirt-qemu-remove-hardcoded-migration-fail-for-vDPA-devices-if-we-can-ask-QEMU.patch b/libvirt-qemu-remove-hardcoded-migration-fail-for-vDPA-devices-if-we-can-ask-QEMU.patch new file mode 100644 index 0000000..1db6c10 --- /dev/null +++ b/libvirt-qemu-remove-hardcoded-migration-fail-for-vDPA-devices-if-we-can-ask-QEMU.patch @@ -0,0 +1,58 @@ +From 0ba11af2300d0aaf80456575e03848f843ae29de Mon Sep 17 00:00:00 2001 +Message-Id: <0ba11af2300d0aaf80456575e03848f843ae29de@dist-git> +From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= +Date: Thu, 21 Jul 2022 19:29:15 +0200 +Subject: [PATCH] qemu: remove hardcoded migration fail for vDPA devices if we + can ask QEMU +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +vDPA devices will be migratable soon, so we shouldn't unconditionally +block migration of any domain with a vDPA device. Instead, we should +rely on QEMU to make the decision when that info is available from the +query-migrate QMP command (QEMU versions too old to have that info in +the results of query-migrate don't support migration of vDPA devices, +so in that case we will continue to unconditionally block migration). + +Signed-off-by: Eugenio Pérez +Reviewed-by: Jiri Denemark +Reviewed-by: Laine Stump + +(cherry picked from commit 2103807e330487952f423d86f541a7a28e003e95) +Resolves: https://bugzilla.redhat.com/2092833 +Signed-off-by: Eugenio Pérez +--- + src/qemu/qemu_migration.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index cfb7626bb0..2f77e45abf 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -1455,9 +1455,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + int nsnapshots; + int pauseReason; + size_t i; ++ bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps, ++ QEMU_CAPS_MIGRATION_BLOCKED_REASONS); + +- /* Ask qemu if it has a migration blocker */ +- if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) { ++ /* Ask qemu if it have a migration blocker */ ++ if (blockedReasonsCap) { + g_auto(GStrv) blockers = NULL; + if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0) + return false; +@@ -1576,7 +1578,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + virDomainNetDef *net = vm->def->nets[i]; + qemuSlirp *slirp; + +- if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) { ++ if (!blockedReasonsCap && net->type == VIR_DOMAIN_NET_TYPE_VDPA) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("vDPA devices cannot be migrated")); + return false; +-- +2.35.1 + diff --git a/libvirt-qemu-skip-hardcoded-hostdev-migration-check-if-QEMU-can-do-it-for-us.patch b/libvirt-qemu-skip-hardcoded-hostdev-migration-check-if-QEMU-can-do-it-for-us.patch new file mode 100644 index 0000000..633a169 --- /dev/null +++ b/libvirt-qemu-skip-hardcoded-hostdev-migration-check-if-QEMU-can-do-it-for-us.patch @@ -0,0 +1,62 @@ +From 8f2cd77dc208cfa90b37faa18b092ca4a76a0716 Mon Sep 17 00:00:00 2001 +Message-Id: <8f2cd77dc208cfa90b37faa18b092ca4a76a0716@dist-git> +From: Laine Stump +Date: Thu, 21 Jul 2022 02:03:49 -0400 +Subject: [PATCH] qemu: skip hardcoded hostdev migration check if QEMU can do + it for us + +libvirt currently will block migration for any vfio-assigned device +unless it is a network device that is associated with a virtio-net +failover device (ie. if the hostdev object has a teaming->type == +VIR_DOMAIN_NET_TEAMING_TYPE_TRANSIENT). + +In the future there will be other vfio devices that can be migrated, +so we don't want to rely on this hardcoded block. QEMU 6.0+ will +anyway inform us of any devices that will block migration (as a part +of qemuDomainGetMigrationBlockers()), so we only need to do the +hardcoded check in the case of old QEMU that can't provide that +information. + +Signed-off-by: Laine Stump +Reviewed-by: Jiri Denemark +(cherry picked from commit 25883cd5f0b188f2417f294b7d219a77b219f7c2) + +https://bugzilla.redhat.com/show_bug.cgi?id=1497907 + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_migration.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index f571c9eb27..76903d612b 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -1495,6 +1495,14 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + _("cannot migrate domain: %s"), reasons); + return false; + } ++ } else { ++ /* checks here are for anything that doesn't need to be ++ * checked by libvirt if running QEMU that can be queried ++ * about migration blockers. ++ */ ++ ++ if (!qemuMigrationSrcIsAllowedHostdev(vm->def)) ++ return false; + } + + if (remote) { +@@ -1521,9 +1529,6 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + return false; + } + +- if (!qemuMigrationSrcIsAllowedHostdev(vm->def)) +- return false; +- + if (vm->def->cpu) { + /* QEMU blocks migration and save with invariant TSC enabled + * unless TSC frequency is explicitly set. +-- +2.35.1 + diff --git a/libvirt-qemuDomainSetIOThreadParams-Accept-VIR_DOMAIN_AFFECT_CONFIG-flag.patch b/libvirt-qemuDomainSetIOThreadParams-Accept-VIR_DOMAIN_AFFECT_CONFIG-flag.patch new file mode 100644 index 0000000..936f85d --- /dev/null +++ b/libvirt-qemuDomainSetIOThreadParams-Accept-VIR_DOMAIN_AFFECT_CONFIG-flag.patch @@ -0,0 +1,41 @@ +From 9b00b5666a014999a3bc9e2e8a6a844ca7a4326f Mon Sep 17 00:00:00 2001 +Message-Id: <9b00b5666a014999a3bc9e2e8a6a844ca7a4326f@dist-git> +From: Michal Privoznik +Date: Fri, 8 Jul 2022 09:35:39 +0200 +Subject: [PATCH] qemuDomainSetIOThreadParams: Accept VIR_DOMAIN_AFFECT_CONFIG + flag +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It was always possible to modify the inactive XML, because +VIR_DOMAIN_AFFECT_CURRENT (= 0) is accepted implicitly. But now +that the logic when changing both config and live XMLs is more +robust we can accept VIR_DOMAIN_AFFECT_CONFIG flag too. + +Signed-off-by: Michal Privoznik +Reviewed-by: Ján Tomko +(cherry picked from commit 3096965ce78923b099fa39e4950279b2f21ab60a) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2059511 +Signed-off-by: Michal Privoznik +--- + src/qemu/qemu_driver.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 2c627396f1..654b5d65e5 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -5818,7 +5818,8 @@ qemuDomainSetIOThreadParams(virDomainPtr dom, + qemuMonitorIOThreadInfo iothread = {0}; + int ret = -1; + +- virCheckFlags(VIR_DOMAIN_AFFECT_LIVE, -1); ++ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | ++ VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (iothread_id == 0) { + virReportError(VIR_ERR_INVALID_ARG, "%s", +-- +2.35.1 + diff --git a/libvirt-qemuDomainSetupDisk-Initialize-targetPaths.patch b/libvirt-qemuDomainSetupDisk-Initialize-targetPaths.patch new file mode 100644 index 0000000..c57e027 --- /dev/null +++ b/libvirt-qemuDomainSetupDisk-Initialize-targetPaths.patch @@ -0,0 +1,41 @@ +From ab4488be3282dd5d0b9582e6a5d1dafbe7b90489 Mon Sep 17 00:00:00 2001 +Message-Id: +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=2046172 +--- + 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_capabilities-Detect-memory-backend-.prealloc-threads-property.patch b/libvirt-qemu_capabilities-Detect-memory-backend-.prealloc-threads-property.patch new file mode 100644 index 0000000..4916fd9 --- /dev/null +++ b/libvirt-qemu_capabilities-Detect-memory-backend-.prealloc-threads-property.patch @@ -0,0 +1,314 @@ +From c387e7680c07d7dbb934dbe972e99ab78cebad28 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Mon, 21 Mar 2022 16:55:05 +0100 +Subject: [PATCH] qemu_capabilities: Detect memory-backend-*.prealloc-threads + property + +The prealloc-threads is property of memory-backend class which is +parent to the other three classes memory-backend-{ram,file,memfd}. +Therefore the property is present for all, or none if QEMU is +older than v5.0.0-rc0~75^2~1^2~3 which introduced the property. + +Anyway, the .reserve property is the same story, and we chose +memory-backend-file to detect it, so stick with our earlier +decision and use the same backend to detect this new property. + +Signed-off-by: Michal Privoznik +Reviewed-by: Martin Kletzander +(cherry picked from commit a30dac15dcdb7a6c7a3e9b6cfc5cd77bae185081) + +Conflicts: +src/qemu/qemu_capabilities.c: Context +src/qemu/qemu_capabilities.h +tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2067126 +Signed-off-by: Michal Privoznik +--- + src/qemu/qemu_capabilities.c | 2 ++ + src/qemu/qemu_capabilities.h | 1 + + tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 + + tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + + tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 + + tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 + + tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + + tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 + + tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + + tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 + + tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + + tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + + tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 + + tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 + + 20 files changed, 21 insertions(+) + +diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c +index 8ae80ef8d7..c4f7db55c8 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -657,6 +657,7 @@ VIR_ENUM_IMPL(virQEMUCaps, + + /* 420 */ + "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api", /* QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API */ ++ "memory-backend-file.prealloc-threads", /* QEMU_CAPS_MEMORY_BACKEND_PREALLOC_THREADS */ + ); + + +@@ -1713,6 +1714,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = + * released qemu versions. */ + { "x-use-canonical-path-for-ramblock-id", QEMU_CAPS_X_USE_CANONICAL_PATH_FOR_RAMBLOCK_ID }, + { "reserve", QEMU_CAPS_MEMORY_BACKEND_RESERVE }, ++ { "prealloc-threads", QEMU_CAPS_MEMORY_BACKEND_PREALLOC_THREADS }, + }; + + static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendMemfd[] = { +diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h +index cde6c18b4c..8e65635e0d 100644 +--- a/src/qemu/qemu_capabilities.h ++++ b/src/qemu/qemu_capabilities.h +@@ -636,6 +636,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ + + /* 420 */ + QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API, /* downstream support for blockdev reopen in rhel-av-8.2.0 */ ++ QEMU_CAPS_MEMORY_BACKEND_PREALLOC_THREADS, /* -object memory-backend-*.prealloc-threads */ + + QEMU_CAPS_LAST /* this must always be the last item */ + } virQEMUCapsFlags; +diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +index bb6a7d5ee7..3b18f160db 100644 +--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +@@ -179,6 +179,7 @@ + + + ++ + 5000000 + 0 + 61700241 +diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +index f8317c1117..c90f2be296 100644 +--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +@@ -187,6 +187,7 @@ + + + ++ + 5000000 + 0 + 42900241 +diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +index 58c7eb6651..8fbe8f114f 100644 +--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +@@ -171,6 +171,7 @@ + + + ++ + 5000000 + 0 + 0 +diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +index 69f49020e7..b76c4346a4 100644 +--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +@@ -221,6 +221,7 @@ + + + ++ + 5000000 + 0 + 43100241 +diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +index 58af90b29f..7de7c291f5 100644 +--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml ++++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +@@ -90,6 +90,7 @@ + + + ++ + 5001000 + 0 + 0 +diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +index 578e16e8b0..9b5cb3cd7a 100644 +--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +@@ -224,6 +224,7 @@ + + + ++ + 5001000 + 0 + 43100242 +diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +index b943eaedaf..020c04c1c4 100644 +--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +@@ -184,6 +184,7 @@ + + + ++ + 5002000 + 0 + 61700243 +diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +index ec64e1cacf..5346b1552c 100644 +--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +@@ -190,6 +190,7 @@ + + + ++ + 5002000 + 0 + 42900243 +diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +index a11d15f91a..9f6974f85d 100644 +--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +@@ -174,6 +174,7 @@ + + + ++ + 5002000 + 0 + 0 +diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +index 552e1d43c9..44753b64c3 100644 +--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml ++++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +@@ -141,6 +141,7 @@ + + + ++ + 5002000 + 0 + 39100243 +diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +index bcc262551a..db11c99739 100644 +--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +@@ -227,6 +227,7 @@ + + + ++ + 5002000 + 0 + 43100243 +diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +index 0fefe64537..5f9a97df43 100644 +--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +@@ -192,6 +192,7 @@ + + + ++ + 6000000 + 0 + 61700242 +diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +index 61685066b8..46bd1d3d2d 100644 +--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml ++++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +@@ -149,6 +149,7 @@ + + + ++ + 6000000 + 0 + 39100242 +diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +index 0d6763e9a3..99bbb6e237 100644 +--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +@@ -236,6 +236,7 @@ + + + ++ + 6000000 + 0 + 43100242 +diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +index 228f397c67..ff0715e605 100644 +--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +@@ -240,6 +240,7 @@ + + + ++ + 6001000 + 0 + 43100243 +diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +index 6bf9933bc5..dd6f0e6919 100644 +--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +@@ -203,6 +203,7 @@ + + + ++ + 6001050 + 0 + 61700244 +diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +index 06cd7fb396..2646cdf88f 100644 +--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +@@ -199,6 +199,7 @@ + + + ++ + 6001050 + 0 + 42900244 +diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +index 75aaeed03c..f25ec1b84a 100644 +--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +@@ -241,6 +241,7 @@ + + + ++ + 6002000 + 0 + 43100244 +-- +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 new file mode 100644 index 0000000..492113e --- /dev/null +++ b/libvirt-qemu_command-Generate-memory-only-after-controllers.patch @@ -0,0 +1,663 @@ +From e4e8b74f2cf090c8b29efcd3ceac4e4c4d07b929 Mon Sep 17 00:00:00 2001 +Message-Id: +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). + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2050697 +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 6b4647a711..2acdcca2ff 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -10565,9 +10565,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); + +@@ -10617,6 +10614,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-qemu_command-Generate-prealloc-threads-property.patch b/libvirt-qemu_command-Generate-prealloc-threads-property.patch new file mode 100644 index 0000000..0a7bc32 --- /dev/null +++ b/libvirt-qemu_command-Generate-prealloc-threads-property.patch @@ -0,0 +1,66 @@ +From e52b12a986de8ac469b98135b2c1d2a8a63b9052 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Mon, 21 Mar 2022 17:10:15 +0100 +Subject: [PATCH] qemu_command: Generate prealloc-threads property + +Let's generate prealloc-threads property onto the cmd line if +domain configuration requests so. + +Signed-off-by: Michal Privoznik +Reviewed-by: Martin Kletzander +(cherry picked from commit b8d6ecc70c8a8e9c90bab48b6829b42d8b77c748) + +Conflicts: +tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args: +Upstream has moved some cmd line arguments +(v8.0.0-260-gaf23241cfe) but that is not backported. + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2067126 +Signed-off-by: Michal Privoznik +--- + src/qemu/qemu_command.c | 5 ++++- + tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args | 4 ++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index 2acdcca2ff..d23af97e0c 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -3856,7 +3856,10 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps, + return -1; + } else { + if (!priv->memPrealloc && +- virJSONValueObjectAdd(&props, "B:prealloc", prealloc, NULL) < 0) ++ virJSONValueObjectAdd(&props, ++ "B:prealloc", prealloc, ++ "p:prealloc-threads", def->mem.allocation_threads, ++ NULL) < 0) + return -1; + } + +diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +index 04a320d469..9b2e6086c3 100644 +--- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ + -m size=14680064k,slots=16,maxmem=1099511627776k \ + -overcommit mem-lock=off \ + -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"}' \ ++-object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"prealloc-threads":8,"size":15032385536,"host-nodes":[3],"policy":"preferred"}' \ + -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ + -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ + -display none \ +@@ -29,7 +29,7 @@ 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"}' \ ++-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"prealloc-threads":8,"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 \ +-- +2.35.1 + diff --git a/libvirt-qemu_migration-Acquire-correct-job-in-qemuMigrationSrcIsAllowed.patch b/libvirt-qemu_migration-Acquire-correct-job-in-qemuMigrationSrcIsAllowed.patch new file mode 100644 index 0000000..2321536 --- /dev/null +++ b/libvirt-qemu_migration-Acquire-correct-job-in-qemuMigrationSrcIsAllowed.patch @@ -0,0 +1,132 @@ +From d4c4660b097695916244307d1125a17c30c0c9ef Mon Sep 17 00:00:00 2001 +Message-Id: +From: Martin Kletzander +Date: Fri, 22 Jul 2022 12:20:04 +0200 +Subject: [PATCH] qemu_migration: Acquire correct job in + qemuMigrationSrcIsAllowed +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 62627524607f added the acquiring of a job, but it is not always +VIR_ASYNC_JOB_MIGRATION_OUT, so the code fails when doing save or anything else. +Correct the async job by passing it from the caller as another parameter. + +Signed-off-by: Martin Kletzander +Reviewed-by: Jiri Denemark +(cherry picked from commit 69e0e33873f1aec55df77f12fb0197d50dca3319) +Resolves: https://bugzilla.redhat.com/2092833 +Signed-off-by: Eugenio Pérez +--- + src/qemu/qemu_driver.c | 8 ++++---- + src/qemu/qemu_migration.c | 7 ++++--- + src/qemu/qemu_migration.h | 1 + + src/qemu/qemu_snapshot.c | 4 ++-- + 4 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 654b5d65e5..847c96639d 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -2650,13 +2650,13 @@ qemuDomainSaveInternal(virQEMUDriver *driver, + virQEMUSaveData *data = NULL; + g_autoptr(qemuDomainSaveCookie) cookie = NULL; + +- if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) +- goto cleanup; +- + if (qemuDomainObjBeginAsyncJob(driver, vm, VIR_ASYNC_JOB_SAVE, + VIR_DOMAIN_JOB_OPERATION_SAVE, flags) < 0) + goto cleanup; + ++ if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_SAVE, 0)) ++ goto cleanup; ++ + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); +@@ -3176,7 +3176,7 @@ doCoreDump(virQEMUDriver *driver, + goto cleanup; + } + +- if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) ++ if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_DUMP, 0)) + goto cleanup; + + if (qemuMigrationSrcToFile(driver, vm, fd, compressor, +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 96c4c0f1da..f571c9eb27 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -1452,6 +1452,7 @@ bool + qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + virDomainObj *vm, + bool remote, ++ int asyncJob, + unsigned int flags) + { + qemuDomainObjPrivate *priv = vm->privateData; +@@ -1483,7 +1484,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + g_auto(GStrv) blockers = NULL; + + if (qemuDomainGetMigrationBlockers(driver, vm, +- VIR_ASYNC_JOB_MIGRATION_OUT, ++ asyncJob, + &blockers) < 0) { + return false; + } +@@ -2632,7 +2633,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, + qemuMigrationJobStartPhase(vm, QEMU_MIGRATION_PHASE_BEGIN3) < 0) + return NULL; + +- if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags)) ++ if (!qemuMigrationSrcIsAllowed(driver, vm, true, priv->job.asyncJob, flags)) + return NULL; + + if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && +@@ -6033,7 +6034,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, + if (!(flags & VIR_MIGRATE_OFFLINE) && virDomainObjCheckActive(vm) < 0) + goto endjob; + +- if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags)) ++ if (!qemuMigrationSrcIsAllowed(driver, vm, true, VIR_ASYNC_JOB_MIGRATION_OUT, flags)) + goto endjob; + + if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && +diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h +index 81cc1e91c0..61d12d6eb1 100644 +--- a/src/qemu/qemu_migration.h ++++ b/src/qemu/qemu_migration.h +@@ -229,6 +229,7 @@ bool + qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + virDomainObj *vm, + bool remote, ++ int asyncJob, + unsigned int flags); + + int +diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c +index 833f880252..0733d44faa 100644 +--- a/src/qemu/qemu_snapshot.c ++++ b/src/qemu/qemu_snapshot.c +@@ -291,7 +291,7 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *driver, + virDomainSnapshotDef *snapdef = virDomainSnapshotObjGetDef(snap); + int ret = -1; + +- if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) ++ if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_SNAPSHOT, 0)) + goto cleanup; + + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { +@@ -1422,7 +1422,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver, + /* do the memory snapshot if necessary */ + if (memory) { + /* check if migration is possible */ +- if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) ++ if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_SNAPSHOT, 0)) + goto cleanup; + + qemuDomainJobSetStatsType(priv->job.current, +-- +2.35.1 + diff --git a/libvirt-qemu_migration-Apply-max-postcopy-bandwidth-on-post-copy-resume.patch b/libvirt-qemu_migration-Apply-max-postcopy-bandwidth-on-post-copy-resume.patch new file mode 100644 index 0000000..bb7d0c6 --- /dev/null +++ b/libvirt-qemu_migration-Apply-max-postcopy-bandwidth-on-post-copy-resume.patch @@ -0,0 +1,229 @@ +From b8c791a3fc2767e6d899e3e0c590a93cb0ee7e03 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Denemark +Date: Thu, 30 Jun 2022 12:52:38 +0200 +Subject: [PATCH] qemu_migration: Apply max-postcopy-bandwidth on post-copy + resume + +When resuming post-copy migration users may want to limit the bandwidth +used by the migration and use a value that is different from the one +specified when the migration was originally started. + +Resolves: https://gitlab.com/libvirt/libvirt/-/issues/333 + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 766abdc291ba606379a7d197bff477fef25fb508) + +https://bugzilla.redhat.com/show_bug.cgi?id=2111070 + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_migration.c | 12 ++++++-- + src/qemu/qemu_migration_params.c | 45 ++++++++++++++++++---------- + src/qemu/qemu_migration_paramspriv.h | 3 +- + tests/qemumigparamstest.c | 2 +- + tests/qemumigrationcookiexmltest.c | 2 +- + 5 files changed, 42 insertions(+), 22 deletions(-) + +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 285a49c5ff..8a2f5b09a1 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -5097,12 +5097,13 @@ qemuMigrationSrcRun(virQEMUDriver *driver, + + static int + qemuMigrationSrcResume(virDomainObj *vm, +- qemuMigrationParams *migParams G_GNUC_UNUSED, ++ qemuMigrationParams *migParams, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, +- qemuMigrationSpec *spec) ++ qemuMigrationSpec *spec, ++ unsigned long flags) + { + qemuDomainObjPrivate *priv = vm->privateData; + virQEMUDriver *driver = priv->driver; +@@ -5119,6 +5120,10 @@ qemuMigrationSrcResume(virDomainObj *vm, + if (!mig) + return -1; + ++ if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_MIGRATION_OUT, ++ migParams, flags) < 0) ++ return -1; ++ + if (qemuDomainObjEnterMonitorAsync(driver, vm, + VIR_ASYNC_JOB_MIGRATION_OUT) < 0) + return -1; +@@ -5200,6 +5205,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, + + if (STREQ(uribits->scheme, "unix")) { + if ((flags & VIR_MIGRATE_TLS) && ++ !(flags & VIR_MIGRATE_POSTCOPY_RESUME) && + !qemuMigrationParamsTLSHostnameIsSet(migParams)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Explicit destination hostname is required " +@@ -5231,7 +5237,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, + + if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { + ret = qemuMigrationSrcResume(vm, migParams, cookiein, cookieinlen, +- cookieout, cookieoutlen, &spec); ++ cookieout, cookieoutlen, &spec, flags); + } else { + ret = qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookieinlen, + cookieout, cookieoutlen, flags, resource, +diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c +index a68aed9aa4..6ea0bde13a 100644 +--- a/src/qemu/qemu_migration_params.c ++++ b/src/qemu/qemu_migration_params.c +@@ -141,6 +141,7 @@ struct _qemuMigrationParamsTPMapItem { + typedef struct _qemuMigrationParamInfoItem qemuMigrationParamInfoItem; + struct _qemuMigrationParamInfoItem { + qemuMigrationParamType type; ++ bool applyOnPostcopyResume; + }; + + /* Migration capabilities which should always be enabled as long as they +@@ -265,6 +266,7 @@ static const qemuMigrationParamInfoItem qemuMigrationParamInfo[] = { + }, + [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] = { + .type = QEMU_MIGRATION_PARAM_TYPE_ULL, ++ .applyOnPostcopyResume = true, + }, + [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] = { + .type = QEMU_MIGRATION_PARAM_TYPE_INT, +@@ -782,7 +784,8 @@ qemuMigrationParamsFromJSON(virJSONValue *params) + + + virJSONValue * +-qemuMigrationParamsToJSON(qemuMigrationParams *migParams) ++qemuMigrationParamsToJSON(qemuMigrationParams *migParams, ++ bool postcopyResume) + { + g_autoptr(virJSONValue) params = virJSONValueNewObject(); + size_t i; +@@ -795,6 +798,9 @@ qemuMigrationParamsToJSON(qemuMigrationParams *migParams) + if (!pv->set) + continue; + ++ if (postcopyResume && !qemuMigrationParamInfo[i].applyOnPostcopyResume) ++ continue; ++ + switch (qemuMigrationParamInfo[i].type) { + case QEMU_MIGRATION_PARAM_TYPE_INT: + rc = virJSONValueObjectAppendNumberInt(params, name, pv->value.i); +@@ -868,6 +874,7 @@ qemuMigrationCapsToJSON(virBitmap *caps, + * + * Send parameters stored in @migParams to QEMU. If @apiFlags is non-zero, some + * parameters that do not make sense for the enabled flags will be ignored. ++ * VIR_MIGRATE_POSTCOPY_RESUME is the only flag checked currently. + * + * Returns 0 on success, -1 on failure. + */ +@@ -876,32 +883,38 @@ qemuMigrationParamsApply(virQEMUDriver *driver, + virDomainObj *vm, + int asyncJob, + qemuMigrationParams *migParams, +- unsigned long apiFlags G_GNUC_UNUSED) ++ unsigned long apiFlags) + { + qemuDomainObjPrivate *priv = vm->privateData; + bool xbzrleCacheSize_old = false; + g_autoptr(virJSONValue) params = NULL; + g_autoptr(virJSONValue) caps = NULL; + qemuMigrationParam xbzrle = QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE; ++ bool postcopyResume = !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME); + int ret = -1; + + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + return -1; + +- if (asyncJob == VIR_ASYNC_JOB_NONE) { +- if (!virBitmapIsAllClear(migParams->caps)) { +- virReportError(VIR_ERR_INTERNAL_ERROR, "%s", +- _("Migration capabilities can only be set by " +- "a migration job")); +- goto cleanup; +- } +- } else { +- if (!(caps = qemuMigrationCapsToJSON(priv->migrationCaps, migParams->caps))) +- goto cleanup; ++ /* Changing capabilities is only allowed before migration starts, we need ++ * to skip them when resuming post-copy migration. ++ */ ++ if (!postcopyResume) { ++ if (asyncJob == VIR_ASYNC_JOB_NONE) { ++ if (!virBitmapIsAllClear(migParams->caps)) { ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", ++ _("Migration capabilities can only be set by " ++ "a migration job")); ++ goto cleanup; ++ } ++ } else { ++ if (!(caps = qemuMigrationCapsToJSON(priv->migrationCaps, migParams->caps))) ++ goto cleanup; + +- if (virJSONValueArraySize(caps) > 0 && +- qemuMonitorSetMigrationCapabilities(priv->mon, &caps) < 0) +- goto cleanup; ++ if (virJSONValueArraySize(caps) > 0 && ++ qemuMonitorSetMigrationCapabilities(priv->mon, &caps) < 0) ++ goto cleanup; ++ } + } + + /* If QEMU is too old to support xbzrle-cache-size migration parameter, +@@ -917,7 +930,7 @@ qemuMigrationParamsApply(virQEMUDriver *driver, + migParams->params[xbzrle].set = false; + } + +- if (!(params = qemuMigrationParamsToJSON(migParams))) ++ if (!(params = qemuMigrationParamsToJSON(migParams, postcopyResume))) + goto cleanup; + + if (virJSONValueObjectKeysNumber(params) > 0 && +diff --git a/src/qemu/qemu_migration_paramspriv.h b/src/qemu/qemu_migration_paramspriv.h +index f7e0f51fbd..34d51231ff 100644 +--- a/src/qemu/qemu_migration_paramspriv.h ++++ b/src/qemu/qemu_migration_paramspriv.h +@@ -26,7 +26,8 @@ + #pragma once + + virJSONValue * +-qemuMigrationParamsToJSON(qemuMigrationParams *migParams); ++qemuMigrationParamsToJSON(qemuMigrationParams *migParams, ++ bool postcopyResume); + + qemuMigrationParams * + qemuMigrationParamsFromJSON(virJSONValue *params); +diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c +index bcdee5f32b..5d45a9dd58 100644 +--- a/tests/qemumigparamstest.c ++++ b/tests/qemumigparamstest.c +@@ -155,7 +155,7 @@ qemuMigParamsTestJSON(const void *opaque) + if (!(migParams = qemuMigrationParamsFromJSON(paramsIn))) + return -1; + +- if (!(paramsOut = qemuMigrationParamsToJSON(migParams)) || ++ if (!(paramsOut = qemuMigrationParamsToJSON(migParams, false)) || + !(actualJSON = virJSONValueToString(paramsOut, true))) + return -1; + +diff --git a/tests/qemumigrationcookiexmltest.c b/tests/qemumigrationcookiexmltest.c +index 316bfedd15..9731348b53 100644 +--- a/tests/qemumigrationcookiexmltest.c ++++ b/tests/qemumigrationcookiexmltest.c +@@ -333,7 +333,7 @@ testQemuMigrationCookieBlockDirtyBitmaps(const void *opaque) + + qemuMigrationParamsSetBlockDirtyBitmapMapping(migParams, &migParamsBitmaps); + +- if (!(paramsOut = qemuMigrationParamsToJSON(migParams)) || ++ if (!(paramsOut = qemuMigrationParamsToJSON(migParams, false)) || + !(actualJSON = virJSONValueToString(paramsOut, true))) + return -1; + +-- +2.35.1 + diff --git a/libvirt-qemu_migration-Pass-migParams-to-qemuMigrationSrcResume.patch b/libvirt-qemu_migration-Pass-migParams-to-qemuMigrationSrcResume.patch new file mode 100644 index 0000000..a61b5e9 --- /dev/null +++ b/libvirt-qemu_migration-Pass-migParams-to-qemuMigrationSrcResume.patch @@ -0,0 +1,70 @@ +From d24586ede83472f850d1a0c520d482ac5f908696 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Denemark +Date: Thu, 30 Jun 2022 12:51:55 +0200 +Subject: [PATCH] qemu_migration: Pass migParams to qemuMigrationSrcResume + +So the we can apply selected migration parameters even when resuming +post-copy migration. + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 8c335b5530194dbcef719a4d88c89b8723b831a5) + +https://bugzilla.redhat.com/show_bug.cgi?id=2111070 + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_migration.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 8cbd73a809..285a49c5ff 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -5097,6 +5097,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, + + static int + qemuMigrationSrcResume(virDomainObj *vm, ++ qemuMigrationParams *migParams G_GNUC_UNUSED, + const char *cookiein, + int cookieinlen, + char **cookieout, +@@ -5229,7 +5230,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, + spec.fwdType = MIGRATION_FWD_DIRECT; + + if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { +- ret = qemuMigrationSrcResume(vm, cookiein, cookieinlen, ++ ret = qemuMigrationSrcResume(vm, migParams, cookiein, cookieinlen, + cookieout, cookieoutlen, &spec); + } else { + ret = qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookieinlen, +@@ -6124,6 +6125,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver, + virConnectPtr conn, + virDomainObj *vm, + const char *uri, ++ qemuMigrationParams *migParams, + const char *cookiein, + int cookieinlen, + char **cookieout, +@@ -6148,7 +6150,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver, + ret = qemuMigrationSrcPerformNative(driver, vm, NULL, uri, + cookiein, cookieinlen, + cookieout, cookieoutlen, flags, +- 0, NULL, NULL, 0, NULL, NULL, NULL); ++ 0, NULL, NULL, 0, NULL, migParams, NULL); + + if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn, + qemuMigrationAnyConnectionClosed) < 0) +@@ -6188,7 +6190,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, + int ret = -1; + + if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { +- return qemuMigrationSrcPerformResume(driver, conn, vm, uri, ++ return qemuMigrationSrcPerformResume(driver, conn, vm, uri, migParams, + cookiein, cookieinlen, + cookieout, cookieoutlen, flags); + } +-- +2.35.1 + diff --git a/libvirt-qemu_migration-Store-original-migration-params-in-status-XML.patch b/libvirt-qemu_migration-Store-original-migration-params-in-status-XML.patch new file mode 100644 index 0000000..bd47311 --- /dev/null +++ b/libvirt-qemu_migration-Store-original-migration-params-in-status-XML.patch @@ -0,0 +1,51 @@ +From c50cae68f0d083ad0c5ffcf85908cc62eeaa866d Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Denemark +Date: Tue, 19 Jul 2022 13:48:44 +0200 +Subject: [PATCH] qemu_migration: Store original migration params in status XML + +We keep original values of migration parameters so that we can restore +them at the end of migration to make sure later migration does not use +some random values. However, this does not really work when libvirt +daemon is restarted on the source host because we failed to explicitly +save the status XML after getting the migration parameters from QEMU. +Actually it might work if the status XML is written later for some other +reason such as domain state change, but that's not how it should work. + +https://bugzilla.redhat.com/show_bug.cgi?id=2107892 + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit c7238941357f0d2e94524cf8c5ad7d9c82dcf2f9) +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_migration.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 8a2f5b09a1..9289df81eb 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -3245,6 +3245,9 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver, + migParams, mig->caps->automatic) < 0) + goto error; + ++ /* Save original migration parameters */ ++ qemuDomainSaveStatus(vm); ++ + /* Migrations using TLS need to add the "tls-creds-x509" object and + * set the migration TLS parameters */ + if (flags & VIR_MIGRATE_TLS) { +@@ -4822,6 +4825,9 @@ qemuMigrationSrcRun(virQEMUDriver *driver, + migParams, mig->caps->automatic) < 0) + goto error; + ++ /* Save original migration parameters */ ++ qemuDomainSaveStatus(vm); ++ + if (flags & VIR_MIGRATE_TLS) { + const char *hostname = NULL; + +-- +2.35.1 + diff --git a/libvirt-qemu_migration-Use-EnterMonitorAsync-in-qemuDomainGetMigrationBlockers.patch b/libvirt-qemu_migration-Use-EnterMonitorAsync-in-qemuDomainGetMigrationBlockers.patch new file mode 100644 index 0000000..70f8efe --- /dev/null +++ b/libvirt-qemu_migration-Use-EnterMonitorAsync-in-qemuDomainGetMigrationBlockers.patch @@ -0,0 +1,64 @@ +From 25fe3cf8990b654fd568f580b8885102b3f92789 Mon Sep 17 00:00:00 2001 +Message-Id: <25fe3cf8990b654fd568f580b8885102b3f92789@dist-git> +From: Jiri Denemark +Date: Thu, 21 Jul 2022 15:00:28 +0200 +Subject: [PATCH] qemu_migration: Use EnterMonitorAsync in + qemuDomainGetMigrationBlockers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The code is run with an async job and thus needs to make sure a nested +job is acquired before entering the monitor. + +While touching the code in qemuMigrationSrcIsAllowed I also fixed the +grammar which was accidentally broken by v8.5.0-140-g2103807e33. + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 62627524607f214e724a48fcac575737f49a271c) +Resolves: https://bugzilla.redhat.com/2092833 +Signed-off-by: Eugenio Pérez +--- + src/qemu/qemu_migration.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 2f77e45abf..735eb02673 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -1418,12 +1418,15 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def) + static int + qemuDomainGetMigrationBlockers(virQEMUDriver *driver, + virDomainObj *vm, ++ int asyncJob, + char ***blockers) + { + qemuDomainObjPrivate *priv = vm->privateData; + int rc; + +- qemuDomainObjEnterMonitor(driver, vm); ++ if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) ++ return -1; ++ + rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers); + qemuDomainObjExitMonitor(vm); + +@@ -1458,10 +1461,12 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, + bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps, + QEMU_CAPS_MIGRATION_BLOCKED_REASONS); + +- /* Ask qemu if it have a migration blocker */ ++ /* Ask qemu if it has a migration blocker */ + if (blockedReasonsCap) { + g_auto(GStrv) blockers = NULL; +- if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0) ++ if (qemuDomainGetMigrationBlockers(driver, vm, ++ VIR_ASYNC_JOB_MIGRATION_OUT, ++ &blockers) < 0) + return false; + + if (blockers && blockers[0]) { +-- +2.35.1 + diff --git a/libvirt-qemu_migration_params-Avoid-deadlock-in-qemuMigrationParamsReset.patch b/libvirt-qemu_migration_params-Avoid-deadlock-in-qemuMigrationParamsReset.patch new file mode 100644 index 0000000..53bf233 --- /dev/null +++ b/libvirt-qemu_migration_params-Avoid-deadlock-in-qemuMigrationParamsReset.patch @@ -0,0 +1,62 @@ +From 0022c9aef2ecf60e9091e6df57e56065b14b67c5 Mon Sep 17 00:00:00 2001 +Message-Id: <0022c9aef2ecf60e9091e6df57e56065b14b67c5@dist-git> +From: Jiri Denemark +Date: Thu, 28 Jul 2022 15:35:45 +0200 +Subject: [PATCH] qemu_migration_params: Avoid deadlock in + qemuMigrationParamsReset + +In my recent comnmit v8.5.0-188-gc47f1abb81 I accidentally moved +qemuMigrationParamsResetTLS after qemuDomainObjEnterMonitorAsync not +noticing qemuMigrationParamsResetTLS will try to enter the monitor +again. The second call will time out and return with a domain object +locked. But we're still in monitor section and the object should be +unlocked which means qemuDomainObjExitMonitor will deadlock trying to +lock it again. + +Fixes: c47f1abb81194461377a0c608a7ecd87f9ce9146 +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 8cb19a9b9a56ab6ebefc1f913c545e0bb86d4364) + +https://bugzilla.redhat.com/show_bug.cgi?id=2107892 + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_migration_params.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c +index 4a824ff5e1..4766d16e64 100644 +--- a/src/qemu/qemu_migration_params.c ++++ b/src/qemu/qemu_migration_params.c +@@ -1291,6 +1291,7 @@ qemuMigrationParamsReset(virQEMUDriver *driver, + { + virErrorPtr err; + g_autoptr(virBitmap) clearCaps = NULL; ++ int rc; + + virErrorPreserveLast(&err); + +@@ -1305,11 +1306,16 @@ qemuMigrationParamsReset(virQEMUDriver *driver, + + clearCaps = virBitmapNew(0); + +- if (qemuMigrationParamsApplyCaps(vm, clearCaps) == 0 && +- qemuMigrationParamsApplyValues(vm, origParams, false) == 0) +- qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags); ++ rc = 0; ++ if (qemuMigrationParamsApplyCaps(vm, clearCaps) < 0 || ++ qemuMigrationParamsApplyValues(vm, origParams, false) < 0) ++ rc = -1; + + qemuDomainObjExitMonitor(vm); ++ if (rc < 0) ++ goto cleanup; ++ ++ qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags); + + cleanup: + virErrorRestore(&err); +-- +2.35.1 + diff --git a/libvirt-qemu_migration_params-Refactor-qemuMigrationParamsApply.patch b/libvirt-qemu_migration_params-Refactor-qemuMigrationParamsApply.patch new file mode 100644 index 0000000..c27146a --- /dev/null +++ b/libvirt-qemu_migration_params-Refactor-qemuMigrationParamsApply.patch @@ -0,0 +1,107 @@ +From 852927ea725deae6d4ef8a87383a78d9b0b1cd83 Mon Sep 17 00:00:00 2001 +Message-Id: <852927ea725deae6d4ef8a87383a78d9b0b1cd83@dist-git> +From: Jiri Denemark +Date: Thu, 21 Jul 2022 15:59:51 +0200 +Subject: [PATCH] qemu_migration_params: Refactor qemuMigrationParamsApply + +qemuMigrationParamsApply restricts when capabilities can be set, but +this is not useful in all cases. Let's create new helpers for setting +migration capabilities and parameters which can be reused in more places +without the restriction. + +https://bugzilla.redhat.com/show_bug.cgi?id=2107892 + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit c0824fd03802085db698c10fe62c98cc95a57941) +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_migration_params.c | 55 +++++++++++++++++++++++--------- + 1 file changed, 40 insertions(+), 15 deletions(-) + +diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c +index 0bce358ac3..7b9e5453f6 100644 +--- a/src/qemu/qemu_migration_params.c ++++ b/src/qemu/qemu_migration_params.c +@@ -864,6 +864,43 @@ qemuMigrationCapsToJSON(virBitmap *caps, + } + + ++static int ++qemuMigrationParamsApplyCaps(virDomainObj *vm, ++ virBitmap *states) ++{ ++ qemuDomainObjPrivate *priv = vm->privateData; ++ g_autoptr(virJSONValue) json = NULL; ++ ++ if (!(json = qemuMigrationCapsToJSON(priv->migrationCaps, states))) ++ return -1; ++ ++ if (virJSONValueArraySize(json) > 0 && ++ qemuMonitorSetMigrationCapabilities(priv->mon, &json) < 0) ++ return -1; ++ ++ return 0; ++} ++ ++ ++static int ++qemuMigrationParamsApplyValues(virDomainObj *vm, ++ qemuMigrationParams *params, ++ bool postcopyResume) ++{ ++ qemuDomainObjPrivate *priv = vm->privateData; ++ g_autoptr(virJSONValue) json = NULL; ++ ++ if (!(json = qemuMigrationParamsToJSON(params, postcopyResume))) ++ return -1; ++ ++ if (virJSONValueObjectKeysNumber(json) > 0 && ++ qemuMonitorSetMigrationParams(priv->mon, &json) < 0) ++ return -1; ++ ++ return 0; ++} ++ ++ + /** + * qemuMigrationParamsApply + * @driver: qemu driver +@@ -885,9 +922,6 @@ qemuMigrationParamsApply(virQEMUDriver *driver, + qemuMigrationParams *migParams, + unsigned long apiFlags) + { +- qemuDomainObjPrivate *priv = vm->privateData; +- g_autoptr(virJSONValue) params = NULL; +- g_autoptr(virJSONValue) caps = NULL; + bool postcopyResume = !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME); + int ret = -1; + +@@ -905,21 +939,12 @@ qemuMigrationParamsApply(virQEMUDriver *driver, + "a migration job")); + goto cleanup; + } +- } else { +- if (!(caps = qemuMigrationCapsToJSON(priv->migrationCaps, migParams->caps))) +- goto cleanup; +- +- if (virJSONValueArraySize(caps) > 0 && +- qemuMonitorSetMigrationCapabilities(priv->mon, &caps) < 0) +- goto cleanup; ++ } else if (qemuMigrationParamsApplyCaps(vm, migParams->caps) < 0) { ++ goto cleanup; + } + } + +- if (!(params = qemuMigrationParamsToJSON(migParams, postcopyResume))) +- goto cleanup; +- +- if (virJSONValueObjectKeysNumber(params) > 0 && +- qemuMonitorSetMigrationParams(priv->mon, ¶ms) < 0) ++ if (qemuMigrationParamsApplyValues(vm, migParams, postcopyResume) < 0) + goto cleanup; + + ret = 0; +-- +2.35.1 + diff --git a/libvirt-qemu_migration_params-Refactor-qemuMigrationParamsReset.patch b/libvirt-qemu_migration_params-Refactor-qemuMigrationParamsReset.patch new file mode 100644 index 0000000..638447f --- /dev/null +++ b/libvirt-qemu_migration_params-Refactor-qemuMigrationParamsReset.patch @@ -0,0 +1,63 @@ +From 2a05454cd2d6ba283c128158f44d84d65832ebf7 Mon Sep 17 00:00:00 2001 +Message-Id: <2a05454cd2d6ba283c128158f44d84d65832ebf7@dist-git> +From: Jiri Denemark +Date: Thu, 21 Jul 2022 16:49:09 +0200 +Subject: [PATCH] qemu_migration_params: Refactor qemuMigrationParamsReset + +Because qemuMigrationParamsReset used to call qemuMigrationParamsApply +for resetting migration capabilities and parameters, it did not work +well since commit v5.1.0-83-ga1dec315c9 which only allowed capabilities +to be set from an async job. However, when reconnecting to running +domains after daemon restart we do not have an async job. Thus the +capabilities were not properly reset in case the daemon was restarted +during an ongoing migration. We need to avoid calling +qemuMigrationParamsApply to make sure both parameters and capabilities +can be reset by a normal job. + +https://bugzilla.redhat.com/show_bug.cgi?id=2107892 + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit c47f1abb81194461377a0c608a7ecd87f9ce9146) +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_migration_params.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c +index 7b9e5453f6..4a824ff5e1 100644 +--- a/src/qemu/qemu_migration_params.c ++++ b/src/qemu/qemu_migration_params.c +@@ -1290,6 +1290,7 @@ qemuMigrationParamsReset(virQEMUDriver *driver, + unsigned long apiFlags) + { + virErrorPtr err; ++ g_autoptr(virBitmap) clearCaps = NULL; + + virErrorPreserveLast(&err); + +@@ -1299,13 +1300,16 @@ qemuMigrationParamsReset(virQEMUDriver *driver, + if (!virDomainObjIsActive(vm) || !origParams) + goto cleanup; + +- /* Do not pass apiFlags to qemuMigrationParamsApply here to make sure all +- * parameters and capabilities are reset. */ +- if (qemuMigrationParamsApply(driver, vm, asyncJob, origParams, 0) < 0) ++ if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + goto cleanup; + +- qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags); +- /* We don't reset 'block-bitmap-mapping' as it can't be unset */ ++ clearCaps = virBitmapNew(0); ++ ++ if (qemuMigrationParamsApplyCaps(vm, clearCaps) == 0 && ++ qemuMigrationParamsApplyValues(vm, origParams, false) == 0) ++ qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags); ++ ++ qemuDomainObjExitMonitor(vm); + + cleanup: + virErrorRestore(&err); +-- +2.35.1 + diff --git a/libvirt-qemu_migration_params-Replace-qemuMigrationParamTypes-array.patch b/libvirt-qemu_migration_params-Replace-qemuMigrationParamTypes-array.patch new file mode 100644 index 0000000..a620ace --- /dev/null +++ b/libvirt-qemu_migration_params-Replace-qemuMigrationParamTypes-array.patch @@ -0,0 +1,176 @@ +From aa4b6b4877d60218c24d4ae713786f5ee37ac6dc Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jiri Denemark +Date: Wed, 29 Jun 2022 15:12:20 +0200 +Subject: [PATCH] qemu_migration_params: Replace qemuMigrationParamTypes array + +We will need to annotate individual parameters a bit more than just +noting their type. Let's introduce qemuMigrationParamInfo replacing +simple qemuMigrationParamTypes with an array of structs. + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 184749691f27f30a39f6f6c77828ffb951af0255) + +https://bugzilla.redhat.com/show_bug.cgi?id=2111070 + +Signed-off-by: Jiri Denemark +--- + src/qemu/qemu_migration_params.c | 77 ++++++++++++++++++++++---------- + 1 file changed, 54 insertions(+), 23 deletions(-) + +diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c +index 398c07efd0..a68aed9aa4 100644 +--- a/src/qemu/qemu_migration_params.c ++++ b/src/qemu/qemu_migration_params.c +@@ -138,6 +138,11 @@ struct _qemuMigrationParamsTPMapItem { + int party; /* bit-wise OR of qemuMigrationParty */ + }; + ++typedef struct _qemuMigrationParamInfoItem qemuMigrationParamInfoItem; ++struct _qemuMigrationParamInfoItem { ++ qemuMigrationParamType type; ++}; ++ + /* Migration capabilities which should always be enabled as long as they + * are supported by QEMU. If the capability is supposed to be enabled on both + * sides of migration, it won't be enabled unless both sides support it. +@@ -224,22 +229,48 @@ static const qemuMigrationParamsTPMapItem qemuMigrationParamsTPMap[] = { + .party = QEMU_MIGRATION_SOURCE}, + }; + +-static const qemuMigrationParamType qemuMigrationParamTypes[] = { +- [QEMU_MIGRATION_PARAM_COMPRESS_LEVEL] = QEMU_MIGRATION_PARAM_TYPE_INT, +- [QEMU_MIGRATION_PARAM_COMPRESS_THREADS] = QEMU_MIGRATION_PARAM_TYPE_INT, +- [QEMU_MIGRATION_PARAM_DECOMPRESS_THREADS] = QEMU_MIGRATION_PARAM_TYPE_INT, +- [QEMU_MIGRATION_PARAM_THROTTLE_INITIAL] = QEMU_MIGRATION_PARAM_TYPE_INT, +- [QEMU_MIGRATION_PARAM_THROTTLE_INCREMENT] = QEMU_MIGRATION_PARAM_TYPE_INT, +- [QEMU_MIGRATION_PARAM_TLS_CREDS] = QEMU_MIGRATION_PARAM_TYPE_STRING, +- [QEMU_MIGRATION_PARAM_TLS_HOSTNAME] = QEMU_MIGRATION_PARAM_TYPE_STRING, +- [QEMU_MIGRATION_PARAM_MAX_BANDWIDTH] = QEMU_MIGRATION_PARAM_TYPE_ULL, +- [QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT] = QEMU_MIGRATION_PARAM_TYPE_ULL, +- [QEMU_MIGRATION_PARAM_BLOCK_INCREMENTAL] = QEMU_MIGRATION_PARAM_TYPE_BOOL, +- [QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE] = QEMU_MIGRATION_PARAM_TYPE_ULL, +- [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] = QEMU_MIGRATION_PARAM_TYPE_ULL, +- [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] = QEMU_MIGRATION_PARAM_TYPE_INT, ++static const qemuMigrationParamInfoItem qemuMigrationParamInfo[] = { ++ [QEMU_MIGRATION_PARAM_COMPRESS_LEVEL] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_INT, ++ }, ++ [QEMU_MIGRATION_PARAM_COMPRESS_THREADS] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_INT, ++ }, ++ [QEMU_MIGRATION_PARAM_DECOMPRESS_THREADS] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_INT, ++ }, ++ [QEMU_MIGRATION_PARAM_THROTTLE_INITIAL] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_INT, ++ }, ++ [QEMU_MIGRATION_PARAM_THROTTLE_INCREMENT] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_INT, ++ }, ++ [QEMU_MIGRATION_PARAM_TLS_CREDS] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_STRING, ++ }, ++ [QEMU_MIGRATION_PARAM_TLS_HOSTNAME] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_STRING, ++ }, ++ [QEMU_MIGRATION_PARAM_MAX_BANDWIDTH] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_ULL, ++ }, ++ [QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_ULL, ++ }, ++ [QEMU_MIGRATION_PARAM_BLOCK_INCREMENTAL] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_BOOL, ++ }, ++ [QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_ULL, ++ }, ++ [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_ULL, ++ }, ++ [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] = { ++ .type = QEMU_MIGRATION_PARAM_TYPE_INT, ++ }, + }; +-G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamTypes) == QEMU_MIGRATION_PARAM_LAST); ++G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamInfo) == QEMU_MIGRATION_PARAM_LAST); + + + virBitmap * +@@ -281,7 +312,7 @@ qemuMigrationParamsFree(qemuMigrationParams *migParams) + return; + + for (i = 0; i < QEMU_MIGRATION_PARAM_LAST; i++) { +- if (qemuMigrationParamTypes[i] == QEMU_MIGRATION_PARAM_TYPE_STRING) ++ if (qemuMigrationParamInfo[i].type == QEMU_MIGRATION_PARAM_TYPE_STRING) + g_free(migParams->params[i].value.s); + } + +@@ -295,7 +326,7 @@ static int + qemuMigrationParamsCheckType(qemuMigrationParam param, + qemuMigrationParamType type) + { +- if (qemuMigrationParamTypes[param] != type) { ++ if (qemuMigrationParamInfo[param].type != type) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Type mismatch for '%s' migration parameter"), + qemuMigrationParamTypeToString(param)); +@@ -595,7 +626,7 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr params, + VIR_DEBUG("Setting migration parameter '%s' from '%s'", + qemuMigrationParamTypeToString(item->param), item->typedParam); + +- switch (qemuMigrationParamTypes[item->param]) { ++ switch (qemuMigrationParamInfo[item->param].type) { + case QEMU_MIGRATION_PARAM_TYPE_INT: + if (qemuMigrationParamsGetTPInt(migParams, item->param, params, + nparams, item->typedParam, +@@ -671,7 +702,7 @@ qemuMigrationParamsDump(qemuMigrationParams *migParams, + if (!(item->party & QEMU_MIGRATION_DESTINATION)) + continue; + +- switch (qemuMigrationParamTypes[item->param]) { ++ switch (qemuMigrationParamInfo[item->param].type) { + case QEMU_MIGRATION_PARAM_TYPE_INT: + if (qemuMigrationParamsSetTPInt(migParams, item->param, + params, nparams, maxparams, +@@ -721,7 +752,7 @@ qemuMigrationParamsFromJSON(virJSONValue *params) + name = qemuMigrationParamTypeToString(i); + pv = &migParams->params[i]; + +- switch (qemuMigrationParamTypes[i]) { ++ switch (qemuMigrationParamInfo[i].type) { + case QEMU_MIGRATION_PARAM_TYPE_INT: + if (virJSONValueObjectGetNumberInt(params, name, &pv->value.i) == 0) + pv->set = true; +@@ -764,7 +795,7 @@ qemuMigrationParamsToJSON(qemuMigrationParams *migParams) + if (!pv->set) + continue; + +- switch (qemuMigrationParamTypes[i]) { ++ switch (qemuMigrationParamInfo[i].type) { + case QEMU_MIGRATION_PARAM_TYPE_INT: + rc = virJSONValueObjectAppendNumberInt(params, name, pv->value.i); + break; +@@ -1280,7 +1311,7 @@ qemuMigrationParamsFormat(virBuffer *buf, + virBufferAsprintf(buf, "value.i); + break; +@@ -1357,7 +1388,7 @@ qemuMigrationParamsParse(xmlXPathContextPtr ctxt, + } + + rc = 0; +- switch (qemuMigrationParamTypes[param]) { ++ switch (qemuMigrationParamInfo[param].type) { + case QEMU_MIGRATION_PARAM_TYPE_INT: + rc = virStrToLong_i(value, NULL, 10, &pv->value.i); + break; +-- +2.35.1 + diff --git a/libvirt-qemu_validate-Validate-prealloc-threads-against-qemuCpas.patch b/libvirt-qemu_validate-Validate-prealloc-threads-against-qemuCpas.patch new file mode 100644 index 0000000..0f8d752 --- /dev/null +++ b/libvirt-qemu_validate-Validate-prealloc-threads-against-qemuCpas.patch @@ -0,0 +1,39 @@ +From 088ba382d7a099ddbebe37e5486ce648e24266db Mon Sep 17 00:00:00 2001 +Message-Id: <088ba382d7a099ddbebe37e5486ce648e24266db@dist-git> +From: Michal Privoznik +Date: Mon, 21 Mar 2022 17:09:40 +0100 +Subject: [PATCH] qemu_validate: Validate prealloc threads against qemuCpas + +Only fairly new QEMUs are capable of user provided number of +preallocation threads. Validate this assumption. + +Signed-off-by: Michal Privoznik +Reviewed-by: Martin Kletzander +(cherry picked from commit 75a4e0165ef199809974e97b507d3953e1de01d1) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2067126 +Signed-off-by: Michal Privoznik +--- + src/qemu/qemu_validate.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c +index 3a69733f81..7bc14293d6 100644 +--- a/src/qemu/qemu_validate.c ++++ b/src/qemu/qemu_validate.c +@@ -739,6 +739,13 @@ qemuValidateDomainDefMemory(const virDomainDef *def, + return -1; + } + ++ if (mem->allocation_threads > 0 && ++ !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MEMORY_BACKEND_PREALLOC_THREADS)) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("preallocation threads are unsupported with this QEMU")); ++ return -1; ++ } ++ + if (mem->source == VIR_DOMAIN_MEMORY_SOURCE_ANONYMOUS) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("hugepages are not allowed with anonymous " +-- +2.35.1 + diff --git a/libvirt-rpc-Pass-OPENSSL_CONF-through-to-ssh-invocations.patch b/libvirt-rpc-Pass-OPENSSL_CONF-through-to-ssh-invocations.patch new file mode 100644 index 0000000..f70a508 --- /dev/null +++ b/libvirt-rpc-Pass-OPENSSL_CONF-through-to-ssh-invocations.patch @@ -0,0 +1,82 @@ +From c6ea67c481a2f447951449bd9b2746cfaaf385fd Mon Sep 17 00:00:00 2001 +Message-Id: +From: "Richard W.M. Jones" +Date: Mon, 25 Jul 2022 14:09:39 +0100 +Subject: [PATCH] rpc: Pass OPENSSL_CONF through to ssh invocations + +It's no longer possible for libvirt to connect over the ssh transport +from RHEL 9 to RHEL 5. This is because SHA1 signatures have been +effectively banned in RHEL 9 at the openssl level. They are required +to check the RHEL 5 host key. Note this is a separate issue from +openssh requiring additional configuration in order to connect to +older servers. + +Connecting from a RHEL 9 client to RHEL 5 server: + +$ cat ~/.ssh/config +Host 192.168.0.91 + KexAlgorithms +diffie-hellman-group14-sha1 + MACs +hmac-sha1 + HostKeyAlgorithms +ssh-rsa + PubkeyAcceptedKeyTypes +ssh-rsa + PubkeyAcceptedAlgorithms +ssh-rsa + +$ virsh -c 'qemu+ssh://root@192.168.0.91/system' list +error: failed to connect to the hypervisor +error: Cannot recv data: ssh_dispatch_run_fatal: Connection to 192.168.0.91 port 22: error in libcrypto: Connection reset by peer + +"error in libcrypto: Connection reset by peer" is the characteristic +error of openssl having been modified to disable SHA1 by default. +(You will not see this on non-RHEL-derived distros.) + +You could enable the legacy crypto policy which downgrades security on +the entire host, but a more fine-grained way to do this is to create +an alternate openssl configuration file that enables the "forbidden" +signatures. However this requires passing the OPENSSL_CONF +environment variable through to ssh to specify the alternate +configuration. Libvirt filters out this environment variable, but +this commit allows it through. With this commit: + +$ cat /var/tmp/openssl.cnf +.include /etc/ssl/openssl.cnf +[openssl_init] +alg_section = evp_properties +[evp_properties] +rh-allow-sha1-signatures = yes + +$ OPENSSL_CONF=/var/tmp/openssl.cnf ./run virsh -c 'qemu+ssh://root@192.168.0.91/system' list +root@192.168.0.91's password: + Id Name State +-------------------- + +Essentially my argument here is that OPENSSL_CONF is sufficiently +similar in nature to KRB5CCNAME, SSH* and XAUTHORITY that we should +permit it to be passed through. + +virt-v2v bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062360 +Signed-off-by: Richard W.M. Jones +Acked-by: Laszlo Ersek +Reviewed-by: Michal Privoznik + +(cherry picked from commit 45912ac399abd9d4eba21fa3f15cb7587351f959) +Libvirt BZ: https://bugzilla.redhat.com/show_bug.cgi?id=2112348 +Signed-off-by: Michal Privoznik +--- + src/rpc/virnetsocket.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c +index 32f506d2d4..8280bda007 100644 +--- a/src/rpc/virnetsocket.c ++++ b/src/rpc/virnetsocket.c +@@ -855,6 +855,7 @@ int virNetSocketNewConnectSSH(const char *nodename, + virCommandAddEnvPass(cmd, "KRB5CCNAME"); + virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK"); + virCommandAddEnvPass(cmd, "SSH_ASKPASS"); ++ virCommandAddEnvPass(cmd, "OPENSSL_CONF"); + virCommandAddEnvPass(cmd, "DISPLAY"); + virCommandAddEnvPass(cmd, "XAUTHORITY"); + virCommandClearCaps(cmd); +-- +2.35.1 + diff --git a/libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch b/libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch new file mode 100644 index 0000000..84802e4 --- /dev/null +++ b/libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch @@ -0,0 +1,64 @@ +From e13ab5c97f266eb688bc22e1124291563770370d Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Fri, 8 Jul 2022 14:29:32 +0200 +Subject: [PATCH] vircpi: Add PCIe 5.0 and 6.0 link speeds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The PCIe 5.0 and PCIe 6.0 standards define new link speeds: +32GT/s and 64GT/s, respectively. Update our internal enum to +include these new speeds. Otherwise we format incorrect XML: + + + + + + +Like all "good" specifications, these are also locked behind a +login portal. But we can look at pciutils' source code: [1] and +[2]. + +1: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c?id=caca31a0eea41c7b051705704c1158fddc02fbd2 +2: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c?id=5bdf63b6b1bc35b59c4b3f47f7ca83ca1868155b + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2105231 +Signed-off-by: Michal Privoznik +Reviewed-by: Ján Tomko +(cherry picked from commit d33c2a9e2f933b31f8e96e9938c237bdffe27f84) +Signed-off-by: Michal Privoznik +--- + src/util/virpci.c | 2 +- + src/util/virpci.h | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/util/virpci.c b/src/util/virpci.c +index 03d1d7b074..7800966963 100644 +--- a/src/util/virpci.c ++++ b/src/util/virpci.c +@@ -45,7 +45,7 @@ VIR_LOG_INIT("util.pci"); + + VIR_ENUM_IMPL(virPCIELinkSpeed, + VIR_PCIE_LINK_SPEED_LAST, +- "", "2.5", "5", "8", "16", ++ "", "2.5", "5", "8", "16", "32", "64" + ); + + VIR_ENUM_IMPL(virPCIStubDriver, +diff --git a/src/util/virpci.h b/src/util/virpci.h +index b9b9cd7b34..4d9193f24e 100644 +--- a/src/util/virpci.h ++++ b/src/util/virpci.h +@@ -83,6 +83,8 @@ typedef enum { + VIR_PCIE_LINK_SPEED_5, + VIR_PCIE_LINK_SPEED_8, + VIR_PCIE_LINK_SPEED_16, ++ VIR_PCIE_LINK_SPEED_32, ++ VIR_PCIE_LINK_SPEED_64, + VIR_PCIE_LINK_SPEED_LAST + } virPCIELinkSpeed; + +-- +2.35.1 + diff --git a/libvirt-virsh-Implement-config-for-iothreadset.patch b/libvirt-virsh-Implement-config-for-iothreadset.patch new file mode 100644 index 0000000..0ef1196 --- /dev/null +++ b/libvirt-virsh-Implement-config-for-iothreadset.patch @@ -0,0 +1,62 @@ +From 02ebd15a48da7a53560bbea5e530a5b9c929daee Mon Sep 17 00:00:00 2001 +Message-Id: <02ebd15a48da7a53560bbea5e530a5b9c929daee@dist-git> +From: Michal Privoznik +Date: Thu, 7 Jul 2022 17:44:32 +0200 +Subject: [PATCH] virsh: Implement --config for iothreadset +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Our man page already documents that iothreadset has --config +argument. Well, it doesn't really. Normally, I'd just fix the man +page, but with recent work on the API it's possible to tweak +values for inactive XML too. Therefore, implement the --config +argument for the command. + +Signed-off-by: Michal Privoznik +Reviewed-by: Ján Tomko +(cherry picked from commit 3ff558c1c171f66da84b10c81937c1a6895ec6fb) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2059511 +Signed-off-by: Michal Privoznik +--- + tools/virsh-domain.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c +index 43034f2f81..da63cc95ff 100644 +--- a/tools/virsh-domain.c ++++ b/tools/virsh-domain.c +@@ -7831,6 +7831,7 @@ static const vshCmdOptDef opts_iothreadset[] = { + .type = VSH_OT_INT, + .help = N_("upper boundary for worker thread pool") + }, ++ VIRSH_COMMON_OPT_DOMAIN_CONFIG, + VIRSH_COMMON_OPT_DOMAIN_LIVE, + VIRSH_COMMON_OPT_DOMAIN_CURRENT, + {.name = NULL} +@@ -7842,6 +7843,8 @@ cmdIOThreadSet(vshControl *ctl, const vshCmd *cmd) + g_autoptr(virshDomain) dom = NULL; + int id = 0; + bool ret = false; ++ bool current = vshCommandOptBool(cmd, "current"); ++ bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + virTypedParameterPtr params = NULL; +@@ -7852,8 +7855,13 @@ cmdIOThreadSet(vshControl *ctl, const vshCmd *cmd) + int thread_val; + int rc; + ++ VSH_EXCLUSIVE_OPTIONS_VAR(current, live); ++ VSH_EXCLUSIVE_OPTIONS_VAR(current, config); ++ + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; ++ if (config) ++ flags |= VIR_DOMAIN_AFFECT_CONFIG; + + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + return false; +-- +2.35.1 + diff --git a/libvirt-virsh-Require-xpath-for-dumpxml.patch b/libvirt-virsh-Require-xpath-for-dumpxml.patch new file mode 100644 index 0000000..1400494 --- /dev/null +++ b/libvirt-virsh-Require-xpath-for-dumpxml.patch @@ -0,0 +1,215 @@ +From 045c3fbdc6f4a5b98013a00fcaefcd3481c1df39 Mon Sep 17 00:00:00 2001 +Message-Id: <045c3fbdc6f4a5b98013a00fcaefcd3481c1df39@dist-git> +From: Michal Privoznik +Date: Fri, 8 Jul 2022 12:45:42 +0200 +Subject: [PATCH] virsh: Require --xpath for *dumpxml + +Historically, the dumpxml command reject any unknown arguments, +for instance: + + virsh dumpxml fedora xxx + +However, after v8.5.0-rc1~31 the second argument ('xxx') is +treated as an XPath, but it's not that clearly visible. +Therefore, require the --xpath switch, like this: + + virsh dumpxml fedora --xpath xxx + +Yes, this breaks already released virsh, but I think we can argue +that the pool of users of this particular function is very small. +We also document the argument being mandatory: + + dumpxml [--inactive] [--security-info] [--update-cpu] [--migratable] + [--xpath EXPRESSION] [--wrap] domain + +The sooner we do this change, the better. + +The same applies for other *dumpxml functions (net-dumpxml, +pool-dumpxml, vol-dumpxl to name a few). + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103524 +Signed-off-by: Michal Privoznik +Reviewed-by: Peter Krempa +(cherry picked from commit e90d48ae6e22eaf1650f920abc0a6b87d2daa82b) +Signed-off-by: Michal Privoznik +--- + tools/virsh-backup.c | 1 + + tools/virsh-checkpoint.c | 1 + + tools/virsh-domain.c | 3 +++ + tools/virsh-interface.c | 1 + + tools/virsh-network.c | 2 ++ + tools/virsh-nodedev.c | 1 + + tools/virsh-nwfilter.c | 2 ++ + tools/virsh-pool.c | 1 + + tools/virsh-secret.c | 1 + + tools/virsh-snapshot.c | 1 + + tools/virsh-volume.c | 1 + + 11 files changed, 15 insertions(+) + +diff --git a/tools/virsh-backup.c b/tools/virsh-backup.c +index db122abc09..1bb2c63113 100644 +--- a/tools/virsh-backup.c ++++ b/tools/virsh-backup.c +@@ -117,6 +117,7 @@ static const vshCmdOptDef opts_backup_dumpxml[] = { + VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c +index a7ef39849d..9605c893af 100644 +--- a/tools/virsh-checkpoint.c ++++ b/tools/virsh-checkpoint.c +@@ -854,6 +854,7 @@ static const vshCmdOptDef opts_checkpoint_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c +index da63cc95ff..76d12d2b70 100644 +--- a/tools/virsh-domain.c ++++ b/tools/virsh-domain.c +@@ -4529,6 +4529,7 @@ static const vshCmdOptDef opts_save_image_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +@@ -4961,6 +4962,7 @@ static const vshCmdOptDef opts_managed_save_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +@@ -10469,6 +10471,7 @@ static const vshCmdOptDef opts_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c +index b29ffc9bef..39ea53ec9d 100644 +--- a/tools/virsh-interface.c ++++ b/tools/virsh-interface.c +@@ -472,6 +472,7 @@ static const vshCmdOptDef opts_interface_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +diff --git a/tools/virsh-network.c b/tools/virsh-network.c +index 99ced6ccc6..004719dad6 100644 +--- a/tools/virsh-network.c ++++ b/tools/virsh-network.c +@@ -351,6 +351,7 @@ static const vshCmdOptDef opts_network_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +@@ -1556,6 +1557,7 @@ static const vshCmdOptDef opts_network_port_dumpxml[] = { + VIRSH_COMMON_OPT_NETWORK_PORT(0), + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c +index 37e361c701..2adcad9c10 100644 +--- a/tools/virsh-nodedev.c ++++ b/tools/virsh-nodedev.c +@@ -567,6 +567,7 @@ static const vshCmdOptDef opts_node_device_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c +index ff7f6f4026..d4112c8620 100644 +--- a/tools/virsh-nwfilter.c ++++ b/tools/virsh-nwfilter.c +@@ -188,6 +188,7 @@ static const vshCmdOptDef opts_nwfilter_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +@@ -610,6 +611,7 @@ static const vshCmdOptDef opts_nwfilter_binding_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c +index 820a61f889..8a98c6ae40 100644 +--- a/tools/virsh-pool.c ++++ b/tools/virsh-pool.c +@@ -777,6 +777,7 @@ static const vshCmdOptDef opts_pool_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c +index 79fa3faf5a..17d2bbd88d 100644 +--- a/tools/virsh-secret.c ++++ b/tools/virsh-secret.c +@@ -140,6 +140,7 @@ static const vshCmdOptDef opts_secret_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c +index 83fdfb9616..8fa64ba903 100644 +--- a/tools/virsh-snapshot.c ++++ b/tools/virsh-snapshot.c +@@ -1609,6 +1609,7 @@ static const vshCmdOptDef opts_snapshot_dumpxml[] = { + }, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c +index bf72d8135f..300a0aa8e5 100644 +--- a/tools/virsh-volume.c ++++ b/tools/virsh-volume.c +@@ -1161,6 +1161,7 @@ static const vshCmdOptDef opts_vol_dumpxml[] = { + VIRSH_COMMON_OPT_POOL_OPTIONAL, + {.name = "xpath", + .type = VSH_OT_STRING, ++ .flags = VSH_OFLAG_REQ_OPT, + .completer = virshCompleteEmpty, + .help = N_("xpath expression to filter the XML document") + }, +-- +2.35.1 + diff --git a/libvirt-virtpm-Introduce-TPM-1.2-and-TPM-2.0-capabilieis.patch b/libvirt-virtpm-Introduce-TPM-1.2-and-TPM-2.0-capabilieis.patch new file mode 100644 index 0000000..6891c08 --- /dev/null +++ b/libvirt-virtpm-Introduce-TPM-1.2-and-TPM-2.0-capabilieis.patch @@ -0,0 +1,48 @@ +From 6d21624edd73edb9b59e5dac0d98d0812e9bf0ad Mon Sep 17 00:00:00 2001 +Message-Id: <6d21624edd73edb9b59e5dac0d98d0812e9bf0ad@dist-git> +From: Michal Privoznik +Date: Tue, 12 Jul 2022 15:46:50 +0200 +Subject: [PATCH] virtpm: Introduce TPM-1.2 and TPM-2.0 capabilieis + +These new capabilities will be used only to track whether +swtpm_setup is capable of TPM-1.2 and/or TPM-2.0. + +Signed-off-by: Michal Privoznik +Reviewed-by: Peter Krempa +(cherry picked from commit 7b37763278c44887789e80a6058ee27953c0e5e6) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103119 +Signed-off-by: Michal Privoznik +--- + src/util/virtpm.c | 2 ++ + src/util/virtpm.h | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/util/virtpm.c b/src/util/virtpm.c +index b898f3a6db..3c961c11cb 100644 +--- a/src/util/virtpm.c ++++ b/src/util/virtpm.c +@@ -47,6 +47,8 @@ VIR_ENUM_IMPL(virTPMSwtpmSetupFeature, + "cmdarg-create-config-files", + "tpm12-not-need-root", + "cmdarg-reconfigure-pcr-banks", ++ "tpm-1.2", ++ "tpm-2.0", + ); + + /** +diff --git a/src/util/virtpm.h b/src/util/virtpm.h +index 0a82a03b69..bbf379a54a 100644 +--- a/src/util/virtpm.h ++++ b/src/util/virtpm.h +@@ -42,6 +42,8 @@ typedef enum { + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES, + VIR_TPM_SWTPM_SETUP_FEATURE_TPM12_NOT_NEED_ROOT, + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_RECONFIGURE_PCR_BANKS, ++ VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2, ++ VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0, + + VIR_TPM_SWTPM_SETUP_FEATURE_LAST + } virTPMSwtpmSetupFeature; +-- +2.35.1 + diff --git a/libvirt.spec b/libvirt.spec new file mode 100644 index 0000000..8ae795f --- /dev/null +++ b/libvirt.spec @@ -0,0 +1,3062 @@ +# -*- rpm-spec -*- + +# This spec file assumes you are building on a Fedora or RHEL version +# that's still supported by the vendor. It may work on other distros +# or versions, but no effort will be made to ensure that going forward. +%define min_rhel 8 +%define min_fedora 33 + +%define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x +%if 0%{?rhel} + %if 0%{?rhel} > 8 + %define arches_qemu_kvm x86_64 aarch64 s390x + %else + %define arches_qemu_kvm x86_64 %{power64} aarch64 s390x + %endif +%endif + +%define arches_64bit x86_64 %{power64} aarch64 s390x riscv64 +%define arches_x86 %{ix86} x86_64 + +%define arches_systemtap_64bit %{arches_64bit} +%define arches_dmidecode %{arches_x86} +%define arches_xen %{arches_x86} aarch64 +%define arches_vbox %{arches_x86} +%define arches_ceph %{arches_64bit} +%define arches_zfs %{arches_x86} %{power64} %{arm} +%define arches_numactl %{arches_x86} %{power64} aarch64 s390x +%define arches_numad %{arches_x86} %{power64} aarch64 + +# The hypervisor drivers that run in libvirtd +%define with_qemu 0%{!?_without_qemu:1} +%define with_lxc 0%{!?_without_lxc:1} +%define with_libxl 0%{!?_without_libxl:1} +%define with_vbox 0%{!?_without_vbox:1} + +%ifarch %{arches_qemu_kvm} + %define with_qemu_kvm %{with_qemu} +%else + %define with_qemu_kvm 0 +%endif + +%define with_qemu_tcg %{with_qemu} + +# RHEL disables TCG on all architectures +%if 0%{?rhel} + %define with_qemu_tcg 0 +%endif + +%if ! %{with_qemu_tcg} && ! %{with_qemu_kvm} + %define with_qemu 0 +%endif + +# Then the hypervisor drivers that run outside libvirtd, in libvirt.so +%define with_openvz 0%{!?_without_openvz:1} +%define with_vmware 0%{!?_without_vmware:1} +%define with_esx 0%{!?_without_esx:1} +%define with_hyperv 0%{!?_without_hyperv:1} + +# Then the secondary host drivers, which run inside libvirtd +%define with_storage_rbd 0%{!?_without_storage_rbd:1} +%if 0%{?fedora} + %define with_storage_sheepdog 0%{!?_without_storage_sheepdog:1} +%else + %define with_storage_sheepdog 0 +%endif + +%define with_storage_gluster 0%{!?_without_storage_gluster:1} +%if 0%{?rhel} + # Glusterfs has been dropped in RHEL-9, and before that + # was only enabled on arches where KVM exists + %if 0%{?rhel} > 8 + %define with_storage_gluster 0 + %else + %ifnarch %{arches_qemu_kvm} + %define with_storage_gluster 0 + %endif + %endif +%endif + +# Fedora has zfs-fuse +%if 0%{?fedora} + %define with_storage_zfs 0%{!?_without_storage_zfs:1} +%else + %define with_storage_zfs 0 +%endif + +%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1} +# libiscsi has been dropped in RHEL-9 +%if 0%{?rhel} > 8 + %define with_storage_iscsi_direct 0 +%endif + +# Other optional features +%define with_numactl 0%{!?_without_numactl:1} + +# A few optional bits off by default, we enable later +%define with_fuse 0 +%define with_sanlock 0 +%define with_numad 0 +%define with_firewalld_zone 0 +%define with_netcf 0 +%define with_libssh2 0 +%define with_wireshark 0 +%define with_libssh 0 +%define with_dmidecode 0 + +# Finally set the OS / architecture specific special cases + +# Architecture-dependent features +%ifnarch %{arches_xen} + %define with_libxl 0 +%endif +%ifnarch %{arches_vbox} + %define with_vbox 0 +%endif +%ifnarch %{arches_numactl} + %define with_numactl 0 +%endif +%ifnarch %{arches_zfs} + %define with_storage_zfs 0 +%endif +%ifnarch %{arches_ceph} + %define with_storage_rbd 0 +%endif + +# RHEL doesn't ship many hypervisor drivers +%if 0%{?rhel} + %define with_openvz 0 + %define with_vbox 0 + %define with_vmware 0 + %define with_libxl 0 + %define with_hyperv 0 + %define with_vz 0 + %define with_lxc 0 +%endif + +%define with_firewalld_zone 0%{!?_without_firewalld_zone:1} + +%if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9) + %define with_netcf 0%{!?_without_netcf:1} +%endif + + +# fuse is used to provide virtualized /proc for LXC +%if %{with_lxc} + %define with_fuse 0%{!?_without_fuse:1} +%endif + +# Enable sanlock library for lock management with QEMU +# Sanlock is available only on arches where kvm is available for RHEL +%if 0%{?fedora} + %define with_sanlock 0%{!?_without_sanlock:1} +%endif +%if 0%{?rhel} + %ifarch %{arches_qemu_kvm} + %define with_sanlock 0%{!?_without_sanlock:1} + %endif +%endif + +# Enable libssh2 transport for new enough distros +%if 0%{?fedora} + %define with_libssh2 0%{!?_without_libssh2:1} +%endif + +# Enable wireshark plugins for all distros +%define with_wireshark 0%{!?_without_wireshark:1} +%define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan + +# Enable libssh transport for all distros +%define with_libssh 0%{!?_without_libssh:1} + +%if %{with_qemu} || %{with_lxc} +# numad is used to manage the CPU and memory placement dynamically, +# it's not available on many non-x86 architectures. + %ifarch %{arches_numad} + %define with_numad 0%{!?_without_numad:1} + %endif +%endif + +%ifarch %{arches_dmidecode} + %define with_dmidecode 0%{!?_without_dmidecode:1} +%endif + +%define with_modular_daemons 0 +%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9 + %define with_modular_daemons 1 +%endif + +# Force QEMU to run as non-root +%define qemu_user qemu +%define qemu_group qemu + +# Locations for QEMU data +%define qemu_moddir %{_libdir}/qemu +%define qemu_datadir %{_datadir}/qemu + + +# RHEL releases provide stable tool chains and so it is safe to turn +# compiler warning into errors without being worried about frequent +# changes in reported warnings +%if 0%{?rhel} + %define enable_werror -Dwerror=true +%else + %define enable_werror -Dwerror=false -Dgit_werror=disabled +%endif + +%define tls_priority "@LIBVIRT,SYSTEM" + + +Summary: Library providing a simple virtualization API +Name: libvirt +Version: 8.0.0 +Release: 6%{?dist}%{?extra_release} +License: LGPLv2+ +URL: https://libvirt.org/ + +%if %(echo %{version} | grep -q "\.0$"; echo $?) == 1 + %define mainturl stable_updates/ +%endif +Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz +Source1: symlinks + +Patch1: libvirt-RHEL-Hack-around-changed-Broadwell-Haswell-CPUs.patch +Patch2: libvirt-RHEL-Add-rhel-machine-types-to-qemuDomainMachineNeedsFDC.patch +Patch3: libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch +Patch4: libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch +Patch5: libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch +Patch6: libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch +Patch7: libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch +Patch8: libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch +Patch9: libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch +Patch10: libvirt-RHEL-Enable-usage-of-x-blockdev-reopen.patch +Patch11: libvirt-Revert-report-error-when-virProcessGetStatInfo-is-unable-to-parse-data.patch +Patch12: libvirt-qemu-fix-inactive-snapshot-revert.patch +Patch13: libvirt-qemuDomainSetupDisk-Initialize-targetPaths.patch +Patch14: libvirt-RHEL-Remove-glib-2.64.0-workaround-for-GSource-race.patch +Patch15: libvirt-qemu_command-Generate-memory-only-after-controllers.patch +Patch16: libvirt-qemu-Validate-domain-definition-even-on-migration.patch +Patch17: libvirt-node_device-Rework-udevKludgeStorageType.patch +Patch18: libvirt-node_device-Treat-NVMe-disks-as-regular-disks.patch +Patch19: libvirt-conf-Introduce-memory-allocation-threads.patch +Patch20: libvirt-qemu_capabilities-Detect-memory-backend-.prealloc-threads-property.patch +Patch21: libvirt-qemu_validate-Validate-prealloc-threads-against-qemuCpas.patch +Patch22: libvirt-qemu_command-Generate-prealloc-threads-property.patch + +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-config-network = %{version}-%{release} +Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} +%if %{with_libxl} +Requires: libvirt-daemon-driver-libxl = %{version}-%{release} +%endif +%if %{with_lxc} +Requires: libvirt-daemon-driver-lxc = %{version}-%{release} +%endif +%if %{with_qemu} +Requires: libvirt-daemon-driver-qemu = %{version}-%{release} +%endif +# We had UML driver, but we've removed it. +Obsoletes: libvirt-daemon-driver-uml <= 5.0.0 +Obsoletes: libvirt-daemon-uml <= 5.0.0 +%if %{with_vbox} +Requires: libvirt-daemon-driver-vbox = %{version}-%{release} +%endif +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} + +Requires: libvirt-daemon-driver-interface = %{version}-%{release} +Requires: libvirt-daemon-driver-secret = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} +Requires: libvirt-client = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} + +# All build-time requirements. Run-time requirements are +# listed against each sub-RPM +BuildRequires: python3-docutils +BuildRequires: gcc +BuildRequires: meson >= 0.54.0 +BuildRequires: ninja-build +BuildRequires: git +BuildRequires: perl-interpreter +%if 0%{?rhel} == 8 +BuildRequires: python3-devel +%else +BuildRequires: python3 +%endif +%if %{with_libxl} +BuildRequires: xen-devel +%endif +BuildRequires: glib2-devel >= 2.56 +BuildRequires: libxml2-devel +BuildRequires: libxslt +BuildRequires: readline-devel +BuildRequires: bash-completion >= 2.0 +BuildRequires: gettext +BuildRequires: libtasn1-devel +BuildRequires: gnutls-devel +BuildRequires: libattr-devel +# For pool-build probing for existing pools +BuildRequires: libblkid-devel >= 2.17 +# for augparse, optionally used in testing +BuildRequires: augeas +BuildRequires: systemd-devel >= 185 +BuildRequires: libpciaccess-devel >= 0.10.9 +BuildRequires: yajl-devel +%if %{with_sanlock} +BuildRequires: sanlock-devel >= 2.4 +%endif +BuildRequires: libpcap-devel >= 1.5.0 +BuildRequires: libnl3-devel +BuildRequires: libselinux-devel +BuildRequires: dnsmasq >= 2.41 +BuildRequires: iptables +BuildRequires: ebtables +BuildRequires: module-init-tools +BuildRequires: cyrus-sasl-devel +BuildRequires: polkit >= 0.112 +# For mount/umount in FS driver +BuildRequires: util-linux +%if %{with_qemu} +# For managing ACLs +BuildRequires: libacl-devel +# From QEMU RPMs +BuildRequires: /usr/bin/qemu-img +%endif +# For LVM drivers +BuildRequires: lvm2 +# For pool type=iscsi +BuildRequires: iscsi-initiator-utils +%if %{with_storage_iscsi_direct} +# For pool type=iscsi-direct +BuildRequires: libiscsi-devel +%endif +# For disk driver +BuildRequires: parted-devel +# For Multipath support +BuildRequires: device-mapper-devel +%if %{with_storage_rbd} +BuildRequires: librados-devel +BuildRequires: librbd-devel +%endif +%if %{with_storage_gluster} +BuildRequires: glusterfs-api-devel >= 3.4.1 +BuildRequires: glusterfs-devel >= 3.4.1 +%endif +%if %{with_storage_sheepdog} +BuildRequires: sheepdog +%endif +%if %{with_numactl} +# For QEMU/LXC numa info +BuildRequires: numactl-devel +%endif +BuildRequires: libcap-ng-devel >= 0.5.0 +%if %{with_fuse} +BuildRequires: fuse-devel >= 2.8.6 +%endif +%if %{with_libssh2} +BuildRequires: libssh2-devel >= 1.3.0 +%endif +%if %{with_netcf} +BuildRequires: netcf-devel >= 0.2.2 +%endif +%if %{with_esx} +BuildRequires: libcurl-devel +%endif +%if %{with_hyperv} +BuildRequires: libwsman-devel >= 2.6.3 +%endif +BuildRequires: audit-libs-devel +# we need /usr/sbin/dtrace +BuildRequires: systemtap-sdt-devel + +# For mount/umount in FS driver +BuildRequires: util-linux +# For showmount in FS driver (netfs discovery) +BuildRequires: nfs-utils + +# Fedora build root suckage +BuildRequires: gawk + +# For storage wiping with different algorithms +BuildRequires: scrub + +%if %{with_numad} +BuildRequires: numad +%endif + +%if %{with_wireshark} +BuildRequires: wireshark-devel +%endif + +%if %{with_libssh} +BuildRequires: libssh-devel >= 0.7.0 +%endif + +BuildRequires: rpcgen +BuildRequires: libtirpc-devel + +# Needed for the firewalld_reload macro +%if %{with_firewalld_zone} +BuildRequires: firewalld-filesystem +%endif + +%description +Libvirt is a C toolkit to interact with the virtualization capabilities +of recent versions of Linux (and other OSes). The main package includes +the libvirtd server exporting the virtualization support. + +%package docs +Summary: API reference and website documentation + +%description docs +Includes the API reference for the libvirt C library, and a complete +copy of the libvirt.org website documentation. + +%package daemon +Summary: Server side daemon and supporting files for libvirt library + +# All runtime requirements for the libvirt package (runtime requrements +# for subpackages are listed later in those subpackages) + +# The client side, i.e. shared libs are in a subpackage +Requires: %{name}-libs = %{version}-%{release} + +# netcat is needed on the server side so that clients that have +# libvirt < 6.9.0 can connect, but newer versions will prefer +# virt-ssh-helper. Making this a Recommends means that it gets +# installed by default, but can still be removed if compatibility +# with old clients is not required +Recommends: /usr/bin/nc + +# for modprobe of pci devices +Requires: module-init-tools + +# for /sbin/ip +Requires: iproute +# for /sbin/tc +Requires: iproute-tc + +Requires: polkit >= 0.112 +%if %{with_dmidecode} +# For virConnectGetSysinfo +Requires: dmidecode +%endif +# For service management +Requires(post): /usr/bin/systemctl +%if %{with_numad} +Requires: numad +%endif +# libvirtd depends on 'messagebus' service +Requires: dbus +# For uid creation during pre +Requires(pre): shadow-utils +# Needed by /usr/libexec/libvirt-guests.sh script. +Requires: gettext + +# Ensure smooth upgrades +Obsoletes: libvirt-admin < 7.3.0 +Provides: libvirt-admin = %{version}-%{release} +Obsoletes: libvirt-bash-completion < 7.3.0 + +%description daemon +Server side daemon required to manage the virtualization capabilities +of recent versions of Linux. Requires a hypervisor specific sub-RPM +for specific drivers. + +%package daemon-config-network +Summary: Default configuration files for the libvirtd daemon + +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} + +%description daemon-config-network +Default configuration files for setting up NAT based networking + +%package daemon-config-nwfilter +Summary: Network filter configuration files for the libvirtd daemon + +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} + +%description daemon-config-nwfilter +Network filter configuration files for cleaning guest traffic + +%package daemon-driver-network +Summary: Network driver plugin for the libvirtd daemon +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +Requires: dnsmasq >= 2.41 +Requires: iptables + +%description daemon-driver-network +The network driver plugin for the libvirtd daemon, providing +an implementation of the virtual network APIs using the Linux +bridge capabilities. + + +%package daemon-driver-nwfilter +Summary: Nwfilter driver plugin for the libvirtd daemon +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +Requires: iptables +Requires: ebtables + +%description daemon-driver-nwfilter +The nwfilter driver plugin for the libvirtd daemon, providing +an implementation of the firewall APIs using the ebtables, +iptables and ip6tables capabilities + + +%package daemon-driver-nodedev +Summary: Nodedev driver plugin for the libvirtd daemon +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +# needed for device enumeration +Requires: systemd >= 185 +# For managing persistent mediated devices +Requires: mdevctl + +%description daemon-driver-nodedev +The nodedev driver plugin for the libvirtd daemon, providing +an implementation of the node device APIs using the udev +capabilities. + + +%package daemon-driver-interface +Summary: Interface driver plugin for the libvirtd daemon +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +%if %{with_netcf} +Requires: netcf-libs >= 0.2.2 +%endif + +%description daemon-driver-interface +The interface driver plugin for the libvirtd daemon, providing +an implementation of the host network interface APIs. + +%package daemon-driver-secret +Summary: Secret driver plugin for the libvirtd daemon +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} + +%description daemon-driver-secret +The secret driver plugin for the libvirtd daemon, providing +an implementation of the secret key APIs. + +%package daemon-driver-storage-core +Summary: Storage driver plugin including base backends for the libvirtd daemon +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +Requires: nfs-utils +# For mkfs +Requires: util-linux +%if %{with_qemu} +# From QEMU RPMs +Requires: /usr/bin/qemu-img +%endif +%if !%{with_storage_rbd} +Obsoletes: libvirt-daemon-driver-storage-rbd < %{version}-%{release} +%endif + +%description daemon-driver-storage-core +The storage driver plugin for the libvirtd daemon, providing +an implementation of the storage APIs using files, local disks, LVM, SCSI, +iSCSI, and multipath storage. + +%package daemon-driver-storage-logical +Summary: Storage driver plugin for lvm volumes +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +Requires: lvm2 + +%description daemon-driver-storage-logical +The storage driver backend adding implementation of the storage APIs for block +volumes using lvm. + + +%package daemon-driver-storage-disk +Summary: Storage driver plugin for disk +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +Requires: parted +Requires: device-mapper + +%description daemon-driver-storage-disk +The storage driver backend adding implementation of the storage APIs for block +volumes using the host disks. + + +%package daemon-driver-storage-scsi +Summary: Storage driver plugin for local scsi devices +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} + +%description daemon-driver-storage-scsi +The storage driver backend adding implementation of the storage APIs for scsi +host devices. + + +%package daemon-driver-storage-iscsi +Summary: Storage driver plugin for iscsi +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +Requires: iscsi-initiator-utils + +%description daemon-driver-storage-iscsi +The storage driver backend adding implementation of the storage APIs for iscsi +volumes using the host iscsi stack. + + +%if %{with_storage_iscsi_direct} +%package daemon-driver-storage-iscsi-direct +Summary: Storage driver plugin for iscsi-direct +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} + +%description daemon-driver-storage-iscsi-direct +The storage driver backend adding implementation of the storage APIs for iscsi +volumes using libiscsi direct connection. +%endif + + +%package daemon-driver-storage-mpath +Summary: Storage driver plugin for multipath volumes +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +Requires: device-mapper + +%description daemon-driver-storage-mpath +The storage driver backend adding implementation of the storage APIs for +multipath storage using device mapper. + + +%if %{with_storage_gluster} +%package daemon-driver-storage-gluster +Summary: Storage driver plugin for gluster +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} + %if 0%{?fedora} +Requires: glusterfs-client >= 2.0.1 + %endif + %if (0%{?fedora} || 0%{?with_storage_gluster}) +Requires: /usr/sbin/gluster + %endif + +%description daemon-driver-storage-gluster +The storage driver backend adding implementation of the storage APIs for gluster +volumes using libgfapi. +%endif + + +%if %{with_storage_rbd} +%package daemon-driver-storage-rbd +Summary: Storage driver plugin for rbd +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} + +%description daemon-driver-storage-rbd +The storage driver backend adding implementation of the storage APIs for rbd +volumes using the ceph protocol. +%endif + + +%if %{with_storage_sheepdog} +%package daemon-driver-storage-sheepdog +Summary: Storage driver plugin for sheepdog +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +Requires: sheepdog + +%description daemon-driver-storage-sheepdog +The storage driver backend adding implementation of the storage APIs for +sheepdog volumes using. +%endif + + +%if %{with_storage_zfs} +%package daemon-driver-storage-zfs +Summary: Storage driver plugin for ZFS +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +# Support any conforming implementation of zfs +Requires: /sbin/zfs +Requires: /sbin/zpool + +%description daemon-driver-storage-zfs +The storage driver backend adding implementation of the storage APIs for +ZFS volumes. +%endif + + +%package daemon-driver-storage +Summary: Storage driver plugin including all backends for the libvirtd daemon +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release} +%if %{with_storage_iscsi_direct} +Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release} +%endif +%if %{with_storage_gluster} +Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} +%endif +%if %{with_storage_rbd} +Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release} +%endif +%if %{with_storage_sheepdog} +Requires: libvirt-daemon-driver-storage-sheepdog = %{version}-%{release} +%endif +%if %{with_storage_zfs} +Requires: libvirt-daemon-driver-storage-zfs = %{version}-%{release} +%endif + +%description daemon-driver-storage +The storage driver plugin for the libvirtd daemon, providing +an implementation of the storage APIs using LVM, iSCSI, +parted and more. + + +%if %{with_qemu} +%package daemon-driver-qemu +Summary: QEMU driver plugin for the libvirtd daemon +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +Requires: /usr/bin/qemu-img +# For image compression +Requires: gzip +Requires: bzip2 +Requires: lzop +Requires: xz +Requires: systemd-container +Requires: swtpm-tools + +%description daemon-driver-qemu +The qemu driver plugin for the libvirtd daemon, providing +an implementation of the hypervisor driver APIs using +QEMU +%endif + + +%if %{with_lxc} +%package daemon-driver-lxc +Summary: LXC driver plugin for the libvirtd daemon +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +# There really is a hard cross-driver dependency here +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: systemd-container + +%description daemon-driver-lxc +The LXC driver plugin for the libvirtd daemon, providing +an implementation of the hypervisor driver APIs using +the Linux kernel +%endif + + +%if %{with_vbox} +%package daemon-driver-vbox +Summary: VirtualBox driver plugin for the libvirtd daemon +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} + +%description daemon-driver-vbox +The vbox driver plugin for the libvirtd daemon, providing +an implementation of the hypervisor driver APIs using +VirtualBox +%endif + + +%if %{with_libxl} +%package daemon-driver-libxl +Summary: Libxl driver plugin for the libvirtd daemon +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} +Obsoletes: libvirt-daemon-driver-xen < 4.3.0 + +%description daemon-driver-libxl +The Libxl driver plugin for the libvirtd daemon, providing +an implementation of the hypervisor driver APIs using +Libxl +%endif + + + +%if %{with_qemu_tcg} +%package daemon-qemu +Summary: Server side daemon & driver required to run QEMU guests + +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-driver-qemu = %{version}-%{release} +Requires: libvirt-daemon-driver-interface = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: libvirt-daemon-driver-secret = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} +Requires: qemu + +%description daemon-qemu +Server side daemon and driver required to manage the virtualization +capabilities of the QEMU TCG emulators +%endif + + +%if %{with_qemu_kvm} +%package daemon-kvm +Summary: Server side daemon & driver required to run KVM guests + +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-driver-qemu = %{version}-%{release} +Requires: libvirt-daemon-driver-interface = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: libvirt-daemon-driver-secret = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} +Requires: qemu-kvm + +%description daemon-kvm +Server side daemon and driver required to manage the virtualization +capabilities of the KVM hypervisor +%endif + + +%if %{with_lxc} +%package daemon-lxc +Summary: Server side daemon & driver required to run LXC guests + +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-driver-lxc = %{version}-%{release} +Requires: libvirt-daemon-driver-interface = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: libvirt-daemon-driver-secret = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} + +%description daemon-lxc +Server side daemon and driver required to manage the virtualization +capabilities of LXC +%endif + + +%if %{with_libxl} +%package daemon-xen +Summary: Server side daemon & driver required to run XEN guests + +Requires: libvirt-daemon = %{version}-%{release} + %if %{with_libxl} +Requires: libvirt-daemon-driver-libxl = %{version}-%{release} + %endif +Requires: libvirt-daemon-driver-interface = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: libvirt-daemon-driver-secret = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} +Requires: xen + +%description daemon-xen +Server side daemon and driver required to manage the virtualization +capabilities of XEN +%endif + +%if %{with_vbox} +%package daemon-vbox +Summary: Server side daemon & driver required to run VirtualBox guests + +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-driver-vbox = %{version}-%{release} +Requires: libvirt-daemon-driver-interface = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: libvirt-daemon-driver-secret = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} + +%description daemon-vbox +Server side daemon and driver required to manage the virtualization +capabilities of VirtualBox +%endif + +%package client +Summary: Client side utilities of the libvirt library +Requires: %{name}-libs = %{version}-%{release} +# Needed by virt-pki-validate script. +Requires: gnutls-utils + +# Ensure smooth upgrades +Obsoletes: libvirt-bash-completion < 7.3.0 + +%description client +The client binaries needed to access the virtualization +capabilities of recent versions of Linux (and other OSes). + +%package libs +Summary: Client side libraries +# So remote clients can access libvirt over SSH tunnel +Requires: cyrus-sasl +# Needed by default sasl.conf - no onerous extra deps, since +# 100's of other things on a system already pull in krb5-libs +Requires: cyrus-sasl-gssapi + +%description libs +Shared libraries for accessing the libvirt daemon. + +%if %{with_wireshark} +%package wireshark +Summary: Wireshark dissector plugin for libvirt RPC transactions +Requires: wireshark +Requires: %{name}-libs = %{version}-%{release} + +%description wireshark +Wireshark dissector plugin for better analysis of libvirt RPC traffic. +%endif + +%if %{with_lxc} +%package login-shell +Summary: Login shell for connecting users to an LXC container +Requires: %{name}-libs = %{version}-%{release} + +%description login-shell +Provides the set-uid virt-login-shell binary that is used to +connect a user to an LXC container when they login, by switching +namespaces. +%endif + +%package devel +Summary: Libraries, includes, etc. to compile with the libvirt library +Requires: %{name}-libs = %{version}-%{release} +Requires: pkgconfig + +%description devel +Include header files & development libraries for the libvirt C library. + +%if %{with_sanlock} +%package lock-sanlock +Summary: Sanlock lock manager plugin for QEMU driver +Requires: sanlock >= 2.4 +#for virt-sanlock-cleanup require augeas +Requires: augeas +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} + +%description lock-sanlock +Includes the Sanlock lock manager plugin for the QEMU +driver +%endif + +%package nss +Summary: Libvirt plugin for Name Service Switch +Requires: libvirt-daemon-driver-network = %{version}-%{release} + +%description nss +Libvirt plugin for NSS for translating domain names into IP addresses. + + +%prep + +%autosetup -S git_am -N + +# "make dist" replaces all symlinks with a copy of the linked files; +# we need to replace all of them with the original symlinks +echo "Restoring symlinks" +while read lnk target; do + if [ -e $lnk ]; then + rm -rf $lnk + ln -s $target $lnk + fi +done <%{_sourcedir}/symlinks || exit 1 +git add . +git commit -q -a --allow-empty --author 'rpm-build ' -m symlinks + + +git config gc.auto 0 + +%autopatch + +%build +%if 0%{?fedora} >= %{min_fedora} || 0%{?rhel} >= %{min_rhel} + %define supported_platform 1 +%else + %define supported_platform 0 +%endif + +%if ! %{supported_platform} +echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}" +exit 1 +%endif + +%if %{with_qemu} + %define arg_qemu -Ddriver_qemu=enabled +%else + %define arg_qemu -Ddriver_qemu=disabled +%endif + +%if %{with_openvz} + %define arg_openvz -Ddriver_openvz=enabled +%else + %define arg_openvz -Ddriver_openvz=disabled +%endif + +%if %{with_lxc} + %define arg_lxc -Ddriver_lxc=enabled + %define arg_login_shell -Dlogin_shell=enabled +%else + %define arg_lxc -Ddriver_lxc=disabled + %define arg_login_shell -Dlogin_shell=disabled +%endif + +%if %{with_vbox} + %define arg_vbox -Ddriver_vbox=enabled +%else + %define arg_vbox -Ddriver_vbox=disabled +%endif + +%if %{with_libxl} + %define arg_libxl -Ddriver_libxl=enabled +%else + %define arg_libxl -Ddriver_libxl=disabled +%endif + +%if %{with_esx} + %define arg_esx -Ddriver_esx=enabled -Dcurl=enabled +%else + %define arg_esx -Ddriver_esx=disabled -Dcurl=disabled +%endif + +%if %{with_hyperv} + %define arg_hyperv -Ddriver_hyperv=enabled -Dopenwsman=enabled +%else + %define arg_hyperv -Ddriver_hyperv=disabled -Dopenwsman=disabled +%endif + +%if %{with_vmware} + %define arg_vmware -Ddriver_vmware=enabled +%else + %define arg_vmware -Ddriver_vmware=disabled +%endif + +%if %{with_storage_rbd} + %define arg_storage_rbd -Dstorage_rbd=enabled +%else + %define arg_storage_rbd -Dstorage_rbd=disabled +%endif + +%if %{with_storage_sheepdog} + %define arg_storage_sheepdog -Dstorage_sheepdog=enabled +%else + %define arg_storage_sheepdog -Dstorage_sheepdog=disabled +%endif + +%if %{with_storage_gluster} + %define arg_storage_gluster -Dstorage_gluster=enabled -Dglusterfs=enabled +%else + %define arg_storage_gluster -Dstorage_gluster=disabled -Dglusterfs=disabled +%endif + +%if %{with_storage_zfs} + %define arg_storage_zfs -Dstorage_zfs=enabled +%else + %define arg_storage_zfs -Dstorage_zfs=disabled +%endif + +%if %{with_numactl} + %define arg_numactl -Dnumactl=enabled +%else + %define arg_numactl -Dnumactl=disabled +%endif + +%if %{with_numad} + %define arg_numad -Dnumad=enabled +%else + %define arg_numad -Dnumad=disabled +%endif + +%if %{with_fuse} + %define arg_fuse -Dfuse=enabled +%else + %define arg_fuse -Dfuse=disabled +%endif + +%if %{with_sanlock} + %define arg_sanlock -Dsanlock=enabled +%else + %define arg_sanlock -Dsanlock=disabled +%endif + +%if %{with_firewalld_zone} + %define arg_firewalld_zone -Dfirewalld_zone=enabled +%else + %define arg_firewalld_zone -Dfirewalld_zone=disabled +%endif + +%if %{with_netcf} + %define arg_netcf -Dnetcf=enabled +%else + %define arg_netcf -Dnetcf=disabled +%endif + +%if %{with_wireshark} + %define arg_wireshark -Dwireshark_dissector=enabled +%else + %define arg_wireshark -Dwireshark_dissector=disabled +%endif + +%if %{with_storage_iscsi_direct} + %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=enabled -Dlibiscsi=enabled +%else + %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=disabled -Dlibiscsi=disabled +%endif + +%if %{with_libssh} + %define arg_libssh -Dlibssh=enabled +%else + %define arg_libssh -Dlibssh=disabled +%endif + +%if %{with_libssh2} + %define arg_libssh2 -Dlibssh2=enabled +%else + %define arg_libssh2 -Dlibssh2=disabled +%endif + +%if %{with_modular_daemons} + %define arg_remote_mode -Dremote_default_mode=direct +%else + %define arg_remote_mode -Dremote_default_mode=legacy +%endif + +%define when %(date +"%%F-%%T") +%define where %(hostname) +%define who %{?packager}%{!?packager:Unknown} +%define arg_packager -Dpackager="%{who}, %{when}, %{where}" +%define arg_packager_version -Dpackager_version="%{release}" + +%define arg_selinux_mount -Dselinux_mount="/sys/fs/selinux" + +# place macros above and build commands below this comment + +export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) + +%meson \ + -Drunstatedir=%{_rundir} \ + %{?arg_qemu} \ + %{?arg_openvz} \ + %{?arg_lxc} \ + %{?arg_vbox} \ + %{?arg_libxl} \ + -Dsasl=enabled \ + -Dpolkit=enabled \ + -Ddriver_libvirtd=enabled \ + -Ddriver_remote=enabled \ + -Ddriver_test=enabled \ + %{?arg_esx} \ + %{?arg_hyperv} \ + %{?arg_vmware} \ + -Ddriver_vz=disabled \ + -Ddriver_bhyve=disabled \ + -Ddriver_ch=disabled \ + %{?arg_remote_mode} \ + -Ddriver_interface=enabled \ + -Ddriver_network=enabled \ + -Dstorage_fs=enabled \ + -Dstorage_lvm=enabled \ + -Dstorage_iscsi=enabled \ + %{?arg_storage_iscsi_direct} \ + -Dstorage_scsi=enabled \ + -Dstorage_disk=enabled \ + -Dstorage_mpath=enabled \ + %{?arg_storage_rbd} \ + %{?arg_storage_sheepdog} \ + %{?arg_storage_gluster} \ + %{?arg_storage_zfs} \ + -Dstorage_vstorage=disabled \ + %{?arg_numactl} \ + %{?arg_numad} \ + -Dcapng=enabled \ + %{?arg_fuse} \ + %{?arg_netcf} \ + -Dselinux=enabled \ + %{?arg_selinux_mount} \ + -Dapparmor=disabled \ + -Dapparmor_profiles=disabled \ + -Dsecdriver_apparmor=disabled \ + -Dudev=enabled \ + -Dyajl=enabled \ + %{?arg_sanlock} \ + -Dlibpcap=enabled \ + -Dlibnl=enabled \ + -Daudit=enabled \ + -Ddtrace=enabled \ + -Dfirewalld=enabled \ + %{?arg_firewalld_zone} \ + %{?arg_wireshark} \ + %{?arg_libssh} \ + %{?arg_libssh2} \ + -Dpm_utils=disabled \ + -Dnss=enabled \ + %{arg_packager} \ + %{arg_packager_version} \ + -Dqemu_user=%{qemu_user} \ + -Dqemu_group=%{qemu_group} \ + -Dqemu_moddir=%{qemu_moddir} \ + -Dqemu_datadir=%{qemu_datadir} \ + -Dtls_priority=%{tls_priority} \ + %{?enable_werror} \ + -Dexpensive_tests=enabled \ + -Dinit_script=systemd \ + -Ddocs=enabled \ + -Dtests=enabled \ + -Drpath=disabled \ + %{?arg_login_shell} + +%meson_build + +%install +rm -fr %{buildroot} + +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. +install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ +cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ + $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml +# libvirt saves this file with mode 0600 +chmod 0600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml + +# nwfilter files are installed in /usr/share/libvirt and copied to /etc in %%post +# to avoid verification errors on changed files in /etc +install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/ +cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml \ + $RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/ +# libvirt saves these files with mode 600 +chmod 600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml + +%if ! %{with_qemu} +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug +%endif +%find_lang %{name} + +%if ! %{with_sanlock} +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug +%endif + +%if ! %{with_lxc} +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug +%endif + +%if ! %{with_qemu} +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu +%endif +%if ! %{with_lxc} +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc +%endif +%if ! %{with_libxl} +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.libxl +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug +%endif + +# Copied into libvirt-docs subpackage eventually +mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs + +%ifarch %{arches_systemtap_64bit} +mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ + $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp + + %if %{with_qemu} +mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ + $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp + %endif +%endif + +%check +# Building on slow archs, like emulated s390x in Fedora copr, requires +# raising the test timeout +VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10 + +%define libvirt_daemon_schedule_restart() mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : \ +/bin/systemctl is-active %1.service 1>/dev/null 2>&1 && \ + touch %{_localstatedir}/lib/rpm-state/libvirt/restart-%1 || : + +%define libvirt_daemon_finish_restart() rm -f %{_localstatedir}/lib/rpm-state/libvirt/restart-%1 \ +rmdir %{_localstatedir}/lib/rpm-state/libvirt 2>/dev/null || : + +%define libvirt_daemon_needs_restart() -f %{_localstatedir}/lib/rpm-state/libvirt/restart-%1 + +%define libvirt_daemon_perform_restart() if test %libvirt_daemon_needs_restart %1 \ +then \ + /bin/systemctl try-restart %1.service >/dev/null 2>&1 || : \ +fi \ +%libvirt_daemon_finish_restart %1 + +# For daemons with only UNIX sockets +%define libvirt_daemon_systemd_post() %systemd_post %1.socket %1-ro.socket %1-admin.socket %1.service +%define libvirt_daemon_systemd_preun() %systemd_preun %1.service %1-ro.socket %1-admin.socket %1.socket + +# For daemons with UNIX and INET sockets +%define libvirt_daemon_systemd_post_inet() %systemd_post %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.service +%define libvirt_daemon_systemd_preun_inet() %systemd_preun %1.service %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.socket + +# For daemons with only UNIX sockets and no unprivileged read-only access +%define libvirt_daemon_systemd_post_priv() %systemd_post %1.socket %1-admin.socket %1.service +%define libvirt_daemon_systemd_preun_priv() %systemd_preun %1.service %1-admin.socket %1.socket + +%pre daemon +# 'libvirt' group is just to allow password-less polkit access to +# libvirtd. The uid number is irrelevant, so we use dynamic allocation +# described at the above link. +getent group libvirt >/dev/null || groupadd -r libvirt + +exit 0 + +%post daemon +%libvirt_daemon_systemd_post_priv virtlogd +%libvirt_daemon_systemd_post_priv virtlockd +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post_inet virtproxyd +%else +%libvirt_daemon_systemd_post_inet libvirtd +%endif + +%systemd_post libvirt-guests.service + +%libvirt_daemon_schedule_restart libvirtd + +%preun daemon +%systemd_preun libvirt-guests.service + +%libvirt_daemon_systemd_preun_inet libvirtd +%libvirt_daemon_systemd_preun_inet virtproxyd +%libvirt_daemon_systemd_preun_priv virtlogd +%libvirt_daemon_systemd_preun_priv virtlockd + +%postun daemon +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + /bin/systemctl reload-or-try-restart virtlockd.service virtlogd.service >/dev/null 2>&1 || : +fi +%systemd_postun libvirt-guests.service + +# In upgrade scenario we must explicitly enable virtlockd/virtlogd +# sockets, if libvirtd is already enabled and start them if +# libvirtd is running, otherwise you'll get failures to start +# guests +%triggerpostun daemon -- libvirt-daemon < 1.3.0 +if [ $1 -ge 1 ] ; then + /bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 && + /bin/systemctl enable virtlogd.socket virtlogd-admin.socket || : + /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 && + /bin/systemctl start virtlogd.socket virtlogd-admin.socket || : +fi + +%posttrans daemon +if test %libvirt_daemon_needs_restart libvirtd +then + # See if user has previously modified their install to + # tell libvirtd to use --listen + grep -E '^LIBVIRTD_ARGS=.*--listen' /etc/sysconfig/libvirtd 1>/dev/null 2>&1 + if test $? = 0 + then + # Then lets keep honouring --listen and *not* use + # systemd socket activation, because switching things + # might confuse mgmt tool like puppet/ansible that + # expect the old style libvirtd + /bin/systemctl mask \ + libvirtd.socket \ + libvirtd-ro.socket \ + libvirtd-admin.socket \ + libvirtd-tls.socket \ + libvirtd-tcp.socket >/dev/null 2>&1 || : + else + # Old libvirtd owns the sockets and will delete them on + # shutdown. Can't use a try-restart as libvirtd will simply + # own the sockets again when it comes back up. Thus we must + # do this particular ordering, so that we get libvirtd + # running with socket activation in use + /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 + if test $? = 0 + then + /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || : + + /bin/systemctl try-restart \ + libvirtd.socket \ + libvirtd-ro.socket \ + libvirtd-admin.socket >/dev/null 2>&1 || : + + /bin/systemctl start libvirtd.service >/dev/null 2>&1 || : + fi + fi +fi + +%libvirt_daemon_finish_restart libvirtd + +%post daemon-driver-network +%if %{with_firewalld_zone} + %firewalld_reload +%endif + +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtnetworkd +%endif +%libvirt_daemon_schedule_restart virtnetworkd + +%preun daemon-driver-network +%libvirt_daemon_systemd_preun virtnetworkd + +%postun daemon-driver-network +%if %{with_firewalld_zone} + %firewalld_reload +%endif + +%posttrans daemon-driver-network +%libvirt_daemon_perform_restart virtnetworkd + + +%post daemon-driver-nwfilter +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtnwfilterd +%endif +%libvirt_daemon_schedule_restart virtnwfilterd + +%preun daemon-driver-nwfilter +%libvirt_daemon_systemd_preun virtnwfilterd + +%posttrans daemon-driver-nwfilter +%libvirt_daemon_perform_restart virtnwfilterd + + +%post daemon-driver-nodedev +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtnodedevd +%endif +%libvirt_daemon_schedule_restart virtnodedevd + +%preun daemon-driver-nodedev +%libvirt_daemon_systemd_preun virtnodedevd + +%posttrans daemon-driver-nodedev +%libvirt_daemon_perform_restart virtnodedevd + + +%post daemon-driver-interface +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtinterfaced +%endif +%libvirt_daemon_schedule_restart virtinterfaced + +%preun daemon-driver-interface +%libvirt_daemon_systemd_preun virtinterfaced + +%posttrans daemon-driver-interface +%libvirt_daemon_perform_restart virtinterfaced + + +%post daemon-driver-secret +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtsecretd +%endif +%libvirt_daemon_schedule_restart virtsecretd + +%preun daemon-driver-secret +%libvirt_daemon_systemd_preun virtsecretd + +%posttrans daemon-driver-secret +%libvirt_daemon_perform_restart virtsecretd + + +%post daemon-driver-storage +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtstoraged +%endif +%libvirt_daemon_schedule_restart virtstoraged + +%preun daemon-driver-storage +%libvirt_daemon_systemd_preun virtstoraged + +%posttrans daemon-driver-storage +%libvirt_daemon_perform_restart virtstoraged + + +%if %{with_qemu} +%pre daemon-driver-qemu +# We want soft static allocation of well-known ids, as disk images +# are commonly shared across NFS mounts by id rather than name; see +# https://fedoraproject.org/wiki/Packaging:UsersAndGroups +getent group kvm >/dev/null || groupadd -f -g 36 -r kvm +getent group qemu >/dev/null || groupadd -f -g 107 -r qemu +if ! getent passwd qemu >/dev/null; then + if ! getent passwd 107 >/dev/null; then + useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu + else + useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu + fi +fi +exit 0 + +%post daemon-driver-qemu + %if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtqemud + %endif +%libvirt_daemon_schedule_restart virtqemud + +%preun daemon-driver-qemu +%libvirt_daemon_systemd_preun virtqemud + +%posttrans daemon-driver-qemu +%libvirt_daemon_perform_restart virtqemud +%endif + + +%if %{with_lxc} +%post daemon-driver-lxc + %if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtlxcd + %endif +%libvirt_daemon_schedule_restart virtlxcd + +%preun daemon-driver-lxc +%libvirt_daemon_systemd_preun virtlxcd + +%posttrans daemon-driver-lxc +%libvirt_daemon_perform_restart virtlxcd +%endif + + +%if %{with_vbox} +%post daemon-driver-vbox + %if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtvboxd + %endif +%libvirt_daemon_schedule_restart virtvboxd + +%preun daemon-driver-vbox +%libvirt_daemon_systemd_preun virtvboxd + +%posttrans daemon-driver-vbox +%libvirt_daemon_perform_restart virtvboxd +%endif + + +%if %{with_libxl} +%post daemon-driver-libxl + %if %{with_modular_daemons} +%libvirt_daemon_systemd_post virtxend + %endif +%libvirt_daemon_schedule_restart virtxend + +%preun daemon-driver-libxl +%libvirt_daemon_systemd_preun virtxend + +%posttrans daemon-driver-libxl +%libvirt_daemon_perform_restart virtxend +%endif + + +%post daemon-config-network +if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then + # see if the network used by default network creates a conflict, + # and try to resolve it + # NB: 192.168.122.0/24 is used in the default.xml template file; + # do not modify any of those values here without also modifying + # them in the template. + orig_sub=122 + sub=${orig_sub} + nl=' +' + routes="${nl}$(ip route show | cut -d' ' -f1)${nl}" + case ${routes} in + *"${nl}192.168.${orig_sub}.0/24${nl}"*) + # there was a match, so we need to look for an unused subnet + for new_sub in $(seq 124 254); do + case ${routes} in + *"${nl}192.168.${new_sub}.0/24${nl}"*) + ;; + *) + sub=$new_sub + break; + ;; + esac + done + ;; + *) + ;; + esac + + sed -e "s/${orig_sub}/${sub}/g" \ + < %{_datadir}/libvirt/networks/default.xml \ + > %{_sysconfdir}/libvirt/qemu/networks/default.xml + ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml + # libvirt saves this file with mode 0600 + chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml + + # Make sure libvirt picks up the new network defininiton + %libvirt_daemon_schedule_restart libvirtd + %libvirt_daemon_schedule_restart virtnetworkd +fi + +%posttrans daemon-config-network +%libvirt_daemon_perform_restart libvirtd +%libvirt_daemon_perform_restart virtnetworkd + +%post daemon-config-nwfilter +for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do + sysconfdir_file=%{_sysconfdir}/libvirt/nwfilter/$(basename "$datadir_file") + if [ ! -f "$sysconfdir_file" ]; then + # libvirt saves these files with mode 600 + install -m 0600 "$datadir_file" "$sysconfdir_file" + fi +done +# Make sure libvirt picks up the new nwfilter defininitons +%libvirt_daemon_schedule_restart libvirtd +%libvirt_daemon_schedule_restart virtnwfilterd + +%posttrans daemon-config-nwfilter +%libvirt_daemon_perform_restart libvirtd +%libvirt_daemon_perform_restart virtnwfilterd + +%if %{with_lxc} +%pre login-shell +getent group virtlogin >/dev/null || groupadd -r virtlogin +exit 0 +%endif + +%files + +%files docs +%doc AUTHORS.rst NEWS.rst README.rst +%doc libvirt-docs/* + +%files daemon + +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ + +%{_unitdir}/libvirtd.service +%{_unitdir}/libvirtd.socket +%{_unitdir}/libvirtd-ro.socket +%{_unitdir}/libvirtd-admin.socket +%{_unitdir}/libvirtd-tcp.socket +%{_unitdir}/libvirtd-tls.socket +%{_unitdir}/virtproxyd.service +%{_unitdir}/virtproxyd.socket +%{_unitdir}/virtproxyd-ro.socket +%{_unitdir}/virtproxyd-admin.socket +%{_unitdir}/virtproxyd-tcp.socket +%{_unitdir}/virtproxyd-tls.socket +%{_unitdir}/virt-guest-shutdown.target +%{_unitdir}/virtlogd.service +%{_unitdir}/virtlogd.socket +%{_unitdir}/virtlogd-admin.socket +%{_unitdir}/virtlockd.service +%{_unitdir}/virtlockd.socket +%{_unitdir}/virtlockd-admin.socket +%{_unitdir}/libvirt-guests.service +%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd +%config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd +%config(noreplace) %{_sysconfdir}/sysconfig/virtlogd +%config(noreplace) %{_sysconfdir}/sysconfig/virtlockd +%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf +%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf +%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf +%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf +%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf +%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests +%config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf + +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd +%dir %{_datadir}/libvirt/ + +%ghost %dir %{_rundir}/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/ +%dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ + + +%dir %attr(0755, root, root) %{_libdir}/libvirt/ +%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/ +%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver +%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so + +%{_datadir}/augeas/lenses/libvirtd.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd.aug +%{_datadir}/augeas/lenses/virtlogd.aug +%{_datadir}/augeas/lenses/tests/test_virtlogd.aug +%{_datadir}/augeas/lenses/virtlockd.aug +%{_datadir}/augeas/lenses/tests/test_virtlockd.aug +%{_datadir}/augeas/lenses/virtproxyd.aug +%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug +%{_datadir}/augeas/lenses/libvirt_lockd.aug +%if %{with_qemu} +%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug +%endif + +%{_datadir}/polkit-1/actions/org.libvirt.unix.policy +%{_datadir}/polkit-1/actions/org.libvirt.api.policy +%{_datadir}/polkit-1/rules.d/50-libvirt.rules + +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ + +%attr(0755, root, root) %{_libexecdir}/libvirt_iohelper + +%attr(0755, root, root) %{_bindir}/virt-ssh-helper + +%attr(0755, root, root) %{_sbindir}/libvirtd +%attr(0755, root, root) %{_sbindir}/virtproxyd +%attr(0755, root, root) %{_sbindir}/virtlogd +%attr(0755, root, root) %{_sbindir}/virtlockd +%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh + +%{_mandir}/man1/virt-admin.1* +%{_mandir}/man1/virt-host-validate.1* +%{_mandir}/man8/virt-ssh-helper.8* +%{_mandir}/man8/libvirtd.8* +%{_mandir}/man8/virtlogd.8* +%{_mandir}/man8/virtlockd.8* +%{_mandir}/man8/virtproxyd.8* +%{_mandir}/man7/virkey*.7* + +%{_bindir}/virt-host-validate +%{_bindir}/virt-admin +%{_datadir}/bash-completion/completions/virt-admin + +%files daemon-config-network +%dir %{_datadir}/libvirt/networks/ +%{_datadir}/libvirt/networks/default.xml +%ghost %{_sysconfdir}/libvirt/qemu/networks/default.xml +%ghost %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml + +%files daemon-config-nwfilter +%dir %{_datadir}/libvirt/nwfilter/ +%{_datadir}/libvirt/nwfilter/*.xml +%ghost %{_sysconfdir}/libvirt/nwfilter/*.xml + +%files daemon-driver-interface +%config(noreplace) %{_sysconfdir}/sysconfig/virtinterfaced +%config(noreplace) %{_sysconfdir}/libvirt/virtinterfaced.conf +%{_datadir}/augeas/lenses/virtinterfaced.aug +%{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug +%{_unitdir}/virtinterfaced.service +%{_unitdir}/virtinterfaced.socket +%{_unitdir}/virtinterfaced-ro.socket +%{_unitdir}/virtinterfaced-admin.socket +%attr(0755, root, root) %{_sbindir}/virtinterfaced +%{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so +%{_mandir}/man8/virtinterfaced.8* + +%files daemon-driver-network +%config(noreplace) %{_sysconfdir}/sysconfig/virtnetworkd +%config(noreplace) %{_sysconfdir}/libvirt/virtnetworkd.conf +%{_datadir}/augeas/lenses/virtnetworkd.aug +%{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug +%{_unitdir}/virtnetworkd.service +%{_unitdir}/virtnetworkd.socket +%{_unitdir}/virtnetworkd-ro.socket +%{_unitdir}/virtnetworkd-admin.socket +%attr(0755, root, root) %{_sbindir}/virtnetworkd +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart +%ghost %dir %{_rundir}/libvirt/network/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ +%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ +%attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper +%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so +%{_mandir}/man8/virtnetworkd.8* + +%if %{with_firewalld_zone} +%{_prefix}/lib/firewalld/zones/libvirt.xml +%endif + +%files daemon-driver-nodedev +%config(noreplace) %{_sysconfdir}/sysconfig/virtnodedevd +%config(noreplace) %{_sysconfdir}/libvirt/virtnodedevd.conf +%{_datadir}/augeas/lenses/virtnodedevd.aug +%{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug +%{_unitdir}/virtnodedevd.service +%{_unitdir}/virtnodedevd.socket +%{_unitdir}/virtnodedevd-ro.socket +%{_unitdir}/virtnodedevd-admin.socket +%attr(0755, root, root) %{_sbindir}/virtnodedevd +%{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so +%{_mandir}/man8/virtnodedevd.8* + +%files daemon-driver-nwfilter +%config(noreplace) %{_sysconfdir}/sysconfig/virtnwfilterd +%config(noreplace) %{_sysconfdir}/libvirt/virtnwfilterd.conf +%{_datadir}/augeas/lenses/virtnwfilterd.aug +%{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug +%{_unitdir}/virtnwfilterd.service +%{_unitdir}/virtnwfilterd.socket +%{_unitdir}/virtnwfilterd-ro.socket +%{_unitdir}/virtnwfilterd-admin.socket +%attr(0755, root, root) %{_sbindir}/virtnwfilterd +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ +%ghost %dir %{_rundir}/libvirt/network/ +%{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so +%{_mandir}/man8/virtnwfilterd.8* + +%files daemon-driver-secret +%config(noreplace) %{_sysconfdir}/sysconfig/virtsecretd +%config(noreplace) %{_sysconfdir}/libvirt/virtsecretd.conf +%{_datadir}/augeas/lenses/virtsecretd.aug +%{_datadir}/augeas/lenses/tests/test_virtsecretd.aug +%{_unitdir}/virtsecretd.service +%{_unitdir}/virtsecretd.socket +%{_unitdir}/virtsecretd-ro.socket +%{_unitdir}/virtsecretd-admin.socket +%attr(0755, root, root) %{_sbindir}/virtsecretd +%{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so +%{_mandir}/man8/virtsecretd.8* + +%files daemon-driver-storage + +%files daemon-driver-storage-core +%config(noreplace) %{_sysconfdir}/sysconfig/virtstoraged +%config(noreplace) %{_sysconfdir}/libvirt/virtstoraged.conf +%{_datadir}/augeas/lenses/virtstoraged.aug +%{_datadir}/augeas/lenses/tests/test_virtstoraged.aug +%{_unitdir}/virtstoraged.service +%{_unitdir}/virtstoraged.socket +%{_unitdir}/virtstoraged-ro.socket +%{_unitdir}/virtstoraged-admin.socket +%attr(0755, root, root) %{_sbindir}/virtstoraged +%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper +%{_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 +%{_mandir}/man8/virtstoraged.8* + +%files daemon-driver-storage-disk +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_disk.so + +%files daemon-driver-storage-logical +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_logical.so + +%files daemon-driver-storage-scsi +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_scsi.so + +%files daemon-driver-storage-iscsi +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so + +%if %{with_storage_iscsi_direct} +%files daemon-driver-storage-iscsi-direct +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so +%endif + +%files daemon-driver-storage-mpath +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so + +%if %{with_storage_gluster} +%files daemon-driver-storage-gluster +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_gluster.so +%{_libdir}/%{name}/storage-file/libvirt_storage_file_gluster.so +%endif + +%if %{with_storage_rbd} +%files daemon-driver-storage-rbd +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_rbd.so +%endif + +%if %{with_storage_sheepdog} +%files daemon-driver-storage-sheepdog +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_sheepdog.so +%endif + +%if %{with_storage_zfs} +%files daemon-driver-storage-zfs +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_zfs.so +%endif + +%if %{with_qemu} +%files daemon-driver-qemu +%config(noreplace) %{_sysconfdir}/sysconfig/virtqemud +%config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf +%config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf +%{_datadir}/augeas/lenses/virtqemud.aug +%{_datadir}/augeas/lenses/tests/test_virtqemud.aug +%{_unitdir}/virtqemud.service +%{_unitdir}/virtqemud.socket +%{_unitdir}/virtqemud-ro.socket +%{_unitdir}/virtqemud-admin.socket +%attr(0755, root, root) %{_sbindir}/virtqemud +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ +%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/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr(0750, root, root) %{_localstatedir}/cache/libvirt/qemu/ +%{_datadir}/augeas/lenses/libvirtd_qemu.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug +%{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so +%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/swtpm/ +%dir %attr(0730, tss, tss) %{_localstatedir}/log/swtpm/libvirt/qemu/ +%{_bindir}/virt-qemu-run +%{_mandir}/man1/virt-qemu-run.1* +%{_mandir}/man8/virtqemud.8* +%endif + +%if %{with_lxc} +%files daemon-driver-lxc +%config(noreplace) %{_sysconfdir}/sysconfig/virtlxcd +%config(noreplace) %{_sysconfdir}/libvirt/virtlxcd.conf +%{_datadir}/augeas/lenses/virtlxcd.aug +%{_datadir}/augeas/lenses/tests/test_virtlxcd.aug +%{_unitdir}/virtlxcd.service +%{_unitdir}/virtlxcd.socket +%{_unitdir}/virtlxcd-ro.socket +%{_unitdir}/virtlxcd-admin.socket +%attr(0755, root, root) %{_sbindir}/virtlxcd +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ +%config(noreplace) %{_sysconfdir}/libvirt/lxc.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc +%ghost %dir %{_rundir}/libvirt/lxc/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ +%{_datadir}/augeas/lenses/libvirtd_lxc.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug +%attr(0755, root, root) %{_libexecdir}/libvirt_lxc +%{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so +%{_mandir}/man8/virtlxcd.8* +%endif + +%if %{with_libxl} +%files daemon-driver-libxl +%config(noreplace) %{_sysconfdir}/sysconfig/virtxend +%config(noreplace) %{_sysconfdir}/libvirt/virtxend.conf +%{_datadir}/augeas/lenses/virtxend.aug +%{_datadir}/augeas/lenses/tests/test_virtxend.aug +%{_unitdir}/virtxend.service +%{_unitdir}/virtxend.socket +%{_unitdir}/virtxend-ro.socket +%{_unitdir}/virtxend-admin.socket +%attr(0755, root, root) %{_sbindir}/virtxend +%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl +%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf +%{_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/ +%{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so +%{_mandir}/man8/virtxend.8* +%endif + +%if %{with_vbox} +%files daemon-driver-vbox +%config(noreplace) %{_sysconfdir}/sysconfig/virtvboxd +%config(noreplace) %{_sysconfdir}/libvirt/virtvboxd.conf +%{_datadir}/augeas/lenses/virtvboxd.aug +%{_datadir}/augeas/lenses/tests/test_virtvboxd.aug +%{_unitdir}/virtvboxd.service +%{_unitdir}/virtvboxd.socket +%{_unitdir}/virtvboxd-ro.socket +%{_unitdir}/virtvboxd-admin.socket +%attr(0755, root, root) %{_sbindir}/virtvboxd +%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so +%{_mandir}/man8/virtvboxd.8* +%endif + +%if %{with_qemu_tcg} +%files daemon-qemu +%endif + +%if %{with_qemu_kvm} +%files daemon-kvm +%endif + +%if %{with_lxc} +%files daemon-lxc +%endif + +%if %{with_libxl} +%files daemon-xen +%endif + +%if %{with_vbox} +%files daemon-vbox +%endif + +%if %{with_sanlock} +%files lock-sanlock + %if %{with_qemu} +%config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf + %endif + %if %{with_libxl} +%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf + %endif +%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so +%{_datadir}/augeas/lenses/libvirt_sanlock.aug +%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug +%dir %attr(0770, root, sanlock) %{_localstatedir}/lib/libvirt/sanlock +%{_sbindir}/virt-sanlock-cleanup +%{_mandir}/man8/virt-sanlock-cleanup.8* +%attr(0755, root, root) %{_libexecdir}/libvirt_sanlock_helper +%endif + +%files client +%{_mandir}/man1/virsh.1* +%{_mandir}/man1/virt-xml-validate.1* +%{_mandir}/man1/virt-pki-query-dn.1* +%{_mandir}/man1/virt-pki-validate.1* +%{_bindir}/virsh +%{_bindir}/virt-xml-validate +%{_bindir}/virt-pki-query-dn +%{_bindir}/virt-pki-validate + +%{_datadir}/bash-completion/completions/virsh + +%files libs -f %{name}.lang +%license COPYING COPYING.LESSER +%config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf +%config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf +%{_libdir}/libvirt.so.* +%{_libdir}/libvirt-qemu.so.* +%{_libdir}/libvirt-lxc.so.* +%{_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 +%if %{with_qemu} +%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp +%endif + +%{_datadir}/libvirt/schemas/*.rng + +%{_datadir}/libvirt/cpu_map/*.xml + +%{_datadir}/libvirt/test-screenshot.png + +%if %{with_wireshark} +%files wireshark +%{wireshark_plugindir}/libvirt.so +%endif + +%files nss +%{_libdir}/libnss_libvirt.so.2 +%{_libdir}/libnss_libvirt_guest.so.2 + +%if %{with_lxc} +%files login-shell +%attr(4750, root, virtlogin) %{_bindir}/virt-login-shell +%{_libexecdir}/virt-login-shell-helper +%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf +%{_mandir}/man1/virt-login-shell.1* +%endif + +%files devel +%{_libdir}/libvirt.so +%{_libdir}/libvirt-admin.so +%{_libdir}/libvirt-qemu.so +%{_libdir}/libvirt-lxc.so +%dir %{_includedir}/libvirt +%{_includedir}/libvirt/virterror.h +%{_includedir}/libvirt/libvirt.h +%{_includedir}/libvirt/libvirt-admin.h +%{_includedir}/libvirt/libvirt-common.h +%{_includedir}/libvirt/libvirt-domain.h +%{_includedir}/libvirt/libvirt-domain-checkpoint.h +%{_includedir}/libvirt/libvirt-domain-snapshot.h +%{_includedir}/libvirt/libvirt-event.h +%{_includedir}/libvirt/libvirt-host.h +%{_includedir}/libvirt/libvirt-interface.h +%{_includedir}/libvirt/libvirt-network.h +%{_includedir}/libvirt/libvirt-nodedev.h +%{_includedir}/libvirt/libvirt-nwfilter.h +%{_includedir}/libvirt/libvirt-secret.h +%{_includedir}/libvirt/libvirt-storage.h +%{_includedir}/libvirt/libvirt-stream.h +%{_includedir}/libvirt/libvirt-qemu.h +%{_includedir}/libvirt/libvirt-lxc.h +%{_libdir}/pkgconfig/libvirt.pc +%{_libdir}/pkgconfig/libvirt-admin.pc +%{_libdir}/pkgconfig/libvirt-qemu.pc +%{_libdir}/pkgconfig/libvirt-lxc.pc + +%dir %{_datadir}/libvirt/api/ +%{_datadir}/libvirt/api/libvirt-api.xml +%{_datadir}/libvirt/api/libvirt-admin-api.xml +%{_datadir}/libvirt/api/libvirt-qemu-api.xml +%{_datadir}/libvirt/api/libvirt-lxc-api.xml + + +%changelog +* Wed Apr 27 2022 Jiri Denemark - 8.0.0-6 +- conf: Introduce memory allocation threads (rhbz#2067126) +- qemu_capabilities: Detect memory-backend-*.prealloc-threads property (rhbz#2067126) +- qemu_validate: Validate prealloc threads against qemuCpas (rhbz#2067126) +- qemu_command: Generate prealloc-threads property (rhbz#2067126) + +* Fri Feb 25 2022 Jiri Denemark - 8.0.0-5 +- node_device: Rework udevKludgeStorageType() (rhbz#2056673) +- node_device: Treat NVMe disks as regular disks (rhbz#2056673) + +* Thu Feb 10 2022 Jiri Denemark - 8.0.0-4 +- qemu_command: Generate memory only after controllers (rhbz#2050697) +- qemu: Validate domain definition even on migration (rhbz#2050702) + +* Wed Feb 2 2022 Jiri Denemark - 8.0.0-3 +- qemuDomainSetupDisk: Initialize 'targetPaths' (rhbz#2046172) +- RHEL: Remove - 8.0.0-2 +- Revert "report error when virProcessGetStatInfo() is unable to parse data" (rhbz#2041610) +- qemu: fix inactive snapshot revert (rhbz#2043584) + +* Fri Jan 14 2022 Jiri Denemark - 8.0.0-1 +- Rebased to libvirt-8.0.0 (rhbz#2012802) + +* Thu Jan 13 2022 Jiri Denemark - 8.0.0-0rc1.1 +- Rebased to libvirt-8.0.0-rc1 (rhbz#2012802) +- The rebase also fixes the following bugs: + rhbz#1689202, rhbz#2014369, rhbz#2030119, rhbz#2029380, rhbz#2035237 + rhbz#2035714, rhbz#2034180 + +* Wed Dec 1 2021 Jiri Denemark - 7.10.0-1 +- Rebased to libvirt-7.10.0 (rhbz#2012802) +- The rebase also fixes the following bugs: + rhbz#1845468, rhbz#2017928, rhbz#2024419, rhbz#1953389, rhbz#1510237 + +* Wed Nov 3 2021 Jiri Denemark - 7.9.0-1 +- Rebased to libvirt-7.9.0 (rhbz#2012802) +- The rebase also fixes the following bugs: + rhbz#2011731, rhbz#2012385, rhbz#2013539 + +* Fri Oct 15 2021 Jiri Denemark - 7.8.0-1 +- Rebased to libvirt-7.8.0 (rhbz#2012802) +- The rebase also fixes the following bugs: + rhbz#1839070, rhbz#1942275, rhbz#1995865, rhbz#1806857, rhbz#1924616 + rhbz#1978574, rhbz#1989457, rhbz#1965589, rhbz#1677608, rhbz#1926508 + rhbz#1810863, rhbz#1845468, rhbz#1738392, rhbz#1965140 + +* Thu Sep 2 2021 Danilo C. L. de Paula - 7.6.0-2.fc34 +- Resolves: bz#2000225 + (Rebase virt:rhel module:stream based on AV-8.6) + +* Fri Aug 6 2021 Jiri Denemark - 6.0.0-37 +- security: fix SELinux label generation logic (CVE-2021-3631) +- storage_driver: Unlock object on ACL fail in storagePoolLookupByTargetPath (CVE-2021-3667) + +* Tue Jun 1 2021 Jiri Denemark - 6.0.0-36 +- network: make it safe to call networkSetupPrivateChains() multiple times (rhbz#1942805) +- network: force re-creation of iptables private chains on firewalld restart (rhbz#1942805) +- hostdev: Update mdev pointer reference after checking device type (rhbz#1940449) +- hostdev: mdev: Lookup mdevs by sysfs path rather than mdev struct (rhbz#1940449) +- qemu_firmware: don't error out for unknown firmware features (rhbz#1961562) +- docs: improve description of secure attribute for loader element (rhbz#1929357) +- conf: introduce virDomainDefParseBootInitOptions (rhbz#1929357) +- conf: introduce virDomainDefParseBootKernelOptions (rhbz#1929357) +- conf: introduce virDomainDefParseBootFirmwareOptions (rhbz#1929357) +- conf: introduce virDomainDefParseBootLoaderOptions (rhbz#1929357) +- conf: introduce virDomainDefParseBootAcpiOptions (rhbz#1929357) +- conf: use switch in virDomainDefParseBootOptions (rhbz#1929357) +- conf: introduce support for firmware auto-selection feature filtering (rhbz#1929357) +- qemu: implement support for firmware auto-selection feature filtering (rhbz#1929357) +- domain_conf: Don't leak def->os.firmwareFeatures (rhbz#1929357) +- conf: remove duplicated firmware type attribute (rhbz#1929357) + +* Thu Mar 4 2021 Jiri Denemark - 6.0.0-35 +- vircgroupv2: properly detect placement of running VM (rhbz#1798463) +- virsystemd: export virSystemdHasMachined (rhbz#1798463) +- virsystemd: introduce virSystemdGetMachineByPID (rhbz#1798463) +- virsystemd: introduce virSystemdGetMachineUnitByPID (rhbz#1798463) +- vircgroup: use DBus call to systemd for some APIs (rhbz#1798463) +- vircgroupv1: refactor virCgroupV1DetectPlacement (rhbz#1798463) +- vircgroupv2: move task into cgroup before enabling controllers (rhbz#1798463) +- vircgroup: introduce virCgroupV1Exists and virCgroupV2Exists (rhbz#1798463) +- vircgroup: introduce nested cgroup to properly work with systemd (rhbz#1798463) +- tests: add cgroup nested tests (rhbz#1798463) +- vircgroup: correctly free nested virCgroupPtr (rhbz#1798463) +- qemu: Add virtio related options to vsock (rhbz#1931548) +- domain_validate: use defines for cpu period and quota limits (rhbz#1798463) +- docs: use proper cpu quota value in our documentation (rhbz#1798463) +- vircgroup: enforce range limit for cpu.shares (rhbz#1798463) +- cgroup: use virCgroupSetCpuShares instead of virCgroupSetupCpuShares (rhbz#1798463) +- cpumap: Add support for ibrs CPU feature (rhbz#1926864) +- cpumap: Add support for svme-addr-check CPU feature (rhbz#1926864) +- cpu_map: Add EPYC-Milan x86 CPU model (rhbz#1926864) +- cpu_map: Install x86_EPYC-Milan.xml (rhbz#1926864) +- cpu_map: Fix spelling of svme-addr-chk feature (rhbz#1926864) + +* Mon Feb 1 2021 Jiri Denemark - 6.0.0-34 +- qemu: move cgroup cpu period and quota defines to vircgroup.h (rhbz#1915733) +- vircgroupv1: use defines for cpu period and quota limits (rhbz#1915733) +- vircgroupv2: use defines for cpu period and quota limits (rhbz#1915733) +- vircgroup: fix cpu quota maximum limit (rhbz#1915733) +- util: add virNetDevGetPhysPortName (rhbz#1918708) +- util: avoid manual VIR_FREE of a g_autofree pointer in virPCIGetName() (rhbz#1918708) +- util: Add phys_port_name support on virPCIGetNetName (rhbz#1918708) + +* Thu Jan 21 2021 Jiri Denemark - 6.0.0-33 +- cpu_map: Fix Icelake Server model number (rhbz#1537734) +- cputestdata: Add test data for Snowridge (rhbz#1537734) +- cpu_map: Add support for fsrm CPU feature (rhbz#1537734) +- cpu_map: Add support for core-capability CPU feature (rhbz#1537734) +- cpu_map: Add support for split-lock-detect CPU feature (rhbz#1537734) +- cpu_map: Define and enable Snowridge model (rhbz#1537734) +- util: fix typo in VIR_MOCK_WRAP_RET_ARGS() (rhbz#1607929) +- util/tests: enable locking on iptables/ebtables commandlines in unit tests (rhbz#1607929) +- util/tests: enable locking on iptables/ebtables commandlines by default (rhbz#1607929) +- tests: fix iptables test case commandline options in virfirewalltest.c (rhbz#1607929) +- network: be more verbose about the reason for a firewall reload (rhbz#1607929) +- util: always check for ebtables/iptables binaries, even when using firewalld (rhbz#1607929) +- util: synchronize with firewalld before we start calling iptables directly (rhbz#1607929) +- util: call iptables directly rather than via firewalld (rhbz#1607929) +- util: virhostcpu: Fail when fetching CPU Stats for invalid cpu (rhbz#1915183) + +* Tue Dec 15 2020 Jiri Denemark - 6.0.0-32 +- util: replace macvtap name reservation bitmap with a simple counter (rhbz#1874304) +- util: assign tap device names using a monotonically increasing integer (rhbz#1874304) +- util: virNetDevTapCreate: initialize fd to -1 (rhbz#1874304) + +* Thu Dec 10 2020 Jiri Denemark - 6.0.0-31 +- conf: properly clear out autogenerated macvtap names when formatting/parsing (rhbz#1872610) +- qemu: format 'ramfb' attribute for mediated devices (rhbz#1876297) + +* Mon Nov 9 2020 Jiri Denemark - 6.0.0-30 +- cpu_map: Add missing x86 features in 0x7 CPUID leaf (rhbz#1861506) +- cpu_map: Add missing x86 features in 0x80000008 CPUID leaf (rhbz#1861506) +- cpu_map: Add missing AMD SVM features (rhbz#1861506) +- Add testdata for AMD EPYC 7502 (rhbz#1861506) +- cpu_map: Defined and enable EPYC-Rome model (rhbz#1861506) +- cpu_map: Remove monitor feature from EPYC-Rome (rhbz#1861506) +- tests: qemuxml2argv: Use existing machine type for 'numatune-distances' case (rhbz#1749518) +- qemuxml2xmltest: Add "numatune-distance" test case (rhbz#1749518) +- conf: Move and rename virDomainParseScaledValue() (rhbz#1749518) +- numa_conf: Drop CPU from name of two functions (rhbz#1749518) +- qemu_command: Rename qemuBuildNumaArgStr() (rhbz#1749518) +- qemuBuildMachineCommandLine: Drop needless check (rhbz#1749518) +- numa_conf: Make virDomainNumaSetNodeCpumask() return void (rhbz#1749518) +- Allow NUMA nodes without vCPUs (rhbz#1749518) +- conf: Parse and format HMAT (rhbz#1749518) +- conf: Validate NUMA HMAT configuration (rhbz#1749518) +- numa: expose HMAT APIs (rhbz#1749518) +- qemu: Introduce QEMU_CAPS_NUMA_HMAT capability (rhbz#1749518) +- qemu: Build HMAT command line (rhbz#1749518) +- qemuBuildNumaCommandLine: Fix @masterInitiator check (rhbz#1749518) +- numa_conf: Properly check for caches in virDomainNumaDefValidate() (rhbz#1749518) +- RNG: Allow interleaving of /domain/cpu/numa/cell children (rhbz#1749518) + +* Fri Oct 9 2020 Jiri Denemark - 6.0.0-29 +- qemu: substitute missing model name for host-passthrough (rhbz#1850680) +- rpc: gendispatch: handle empty flags (CVE-2020-25637) +- rpc: add support for filtering @acls by uint params (CVE-2020-25637) +- rpc: require write acl for guest agent in virDomainInterfaceAddresses (CVE-2020-25637) +- qemu: agent: set ifname to NULL after freeing (CVE-2020-25637) +- qemu: Fix domfsinfo for non-PCI device information from guest agent (rhbz#1858771) +- virDomainNetFindIdx: add support for CCW addresses (rhbz#1837495) +- check for NULL before calling g_regex_unref (rhbz#1861176) +- virhostcpu.c: fix 'die_id' parsing for Power hosts (rhbz#1876742) +- qemuFirmwareFillDomain: Fill NVRAM template on migration too (rhbz#1880418) +- node_device: refactor udevProcessCCW (rhbz#1853289, rhbz#1865932) +- node_device: detect CSS devices (rhbz#1853289, rhbz#1865932) +- virsh: nodedev: ability to filter CSS capabilities (rhbz#1853289, rhbz#1865932) +- node_device: detect DASD devices (rhbz#1853289, rhbz#1865932) +- udevProcessCSS: Check if def->driver is non-NULL (rhbz#1853289, rhbz#1865932) + +* Wed Aug 26 2020 Jiri Denemark - 6.0.0-28 +- virdevmapper: Don't cache device-mapper major (rhbz#1860421) +- virdevmapper: Handle kernel without device-mapper support (rhbz#1860421) +- virdevmapper: Ignore all errors when opening /dev/mapper/control (rhbz#1860421) + +* Fri Aug 7 2020 Jiri Denemark - 6.0.0-27 +- src: assume sys/sysmacros.h always exists on Linux (rhbz#1860421) +- virdevmapper.c: Join two WITH_DEVMAPPER sections together (rhbz#1860421) +- virDevMapperGetTargetsImpl: Use VIR_AUTOSTRINGLIST (rhbz#1860421) +- virdevmapper: Don't use libdevmapper to obtain dependencies (CVE-2020-14339, rhbz#1860421) +- virDevMapperGetTargets: Don't ignore EBADF (rhbz#1860421) + +* Fri Jul 24 2020 Jiri Denemark - 6.0.0-26 +- qemu: blockjob: Don't base bitmap handling of active-layer block commit on QEMU_CAPS_BLOCKDEV_REOPEN (rhbz#1857779) +- qemu: blockjob: Actually delete temporary bitmap on failed active commit (rhbz#1857779) +- qemu: block: Remove 'active-write' bitmap even if there are no bitmaps to merge (rhbz#1857779) +- qemuDomainBlockPivot: Rename 'actions' to 'bitmapactions' (rhbz#1857779) +- qemuDomainBlockPivot: Ignore failures of creating active layer bitmap (rhbz#1857779) + +* Wed Jun 24 2020 Jiri Denemark - 6.0.0-25 +- Upgrade components in virt:rhel module:stream for RHEL-8.3 release (rhbz#1828317) +- conf: Don't format http cookies unless VIR_DOMAIN_DEF_FORMAT_SECURE is used (CVE-2020-14301) +- util: Introduce a parser for kernel cmdline arguments (rhbz#1848997) +- qemu: Check if s390 secure guest support is enabled (rhbz#1848997) +- qemu: Check if AMD secure guest support is enabled (rhbz#1848997) +- tools: Secure guest check on s390 in virt-host-validate (rhbz#1848997) +- tools: Secure guest check for AMD in virt-host-validate (rhbz#1848997) +- docs: Update AMD launch secure description (rhbz#1848997) +- docs: Describe protected virtualization guest setup (rhbz#1848997) + +* Fri Jun 19 2020 Danilo C. L. de Paula - 6.0.0 +- Resolves: bz#1828317 +(Upgrade components in virt:rhel module:stream for RHEL-8.3 release) + +* Tue Jun 09 2020 Danilo C. L. de Paula - 6.0.0 +- Resolves: bz#1810193 +(Upgrade components in virt:rhel module:stream for RHEL-8.3 release) + +* Fri Jun 05 2020 Danilo C. L. de Paula - 6.0.0 +- Resolves: bz#1810193 +(Upgrade components in virt:rhel module:stream for RHEL-8.3 release) + +* Mon Apr 27 2020 Danilo C. L. de Paula - 6.0.0 +- Resolves: bz#1810193 + (Upgrade components in virt:rhel module:stream for RHEL-8.3 release) + +* Mon Mar 16 2020 Jiri Denemark - 4.5.0-42 +- RHEL: virscsi: Check device type before getting it's /dev node name (rhbz#1808388) +- RHEL: virscsi: Support TAPEs in virSCSIDeviceGetDevName() (rhbz#1808388) +- RHEL: virscsi: Introduce and use virSCSIDeviceGetUnprivSGIOSysfsPath() (rhbz#1808388) +- RHEL: virutil: Accept non-block devices in virGetDeviceID() (rhbz#1808388) +- RHEL: qemuSetUnprivSGIO: Actually use calculated @sysfs_path to set unpriv_sgio (rhbz#1808388) +- RHEL: qemuCheckUnprivSGIO: use @sysfs_path to get unpriv_sgio (rhbz#1808399) + +* Wed Mar 4 2020 Jiri Denemark - 4.5.0-41 +- qemu: Translate features in virQEMUCapsGetCPUFeatures (rhbz#1804224) + +* Mon Feb 17 2020 Jiri Denemark - 4.5.0-40 +- process: wait longer on kill per assigned Hostdev (rhbz#1785338) +- process: wait longer 5->30s on hard shutdown (rhbz#1785338) + +* Mon Feb 10 2020 Jiri Denemark - 4.5.0-39 +- selinux: Do not report an error when not returning -1 (rhbz#1788096) +- qemu: Fix hyperv features with QEMU 4.1 (rhbz#1794868) +- qemu: Prefer dashes for hyperv features (rhbz#1794868) +- cpu: Drop KVM_ from hyperv feature macros (rhbz#1794868) +- cpu: Drop unused KVM features (rhbz#1794868) +- qemu: Fix KVM features with QEMU 4.1 (rhbz#1794868) +- cpu: Drop CPUID definition for hv-spinlocks (rhbz#1794868) + +* Tue Jan 14 2020 Jiri Denemark - 4.5.0-38 +- cpu_map/x86: Add support for BFLOAT16 data type (rhbz#1749516) + +* Fri Dec 13 2019 Jiri Denemark - 4.5.0-37 +- cpu_map: Add TAA_NO bit for IA32_ARCH_CAPABILITIES MSR (CVE-2019-11135) +- cpu_map: Add TSX_CTRL bit for IA32_ARCH_CAPABILITIES MSR (CVE-2019-11135) + +* Thu Nov 21 2019 Jiri Denemark - 4.5.0-36 +- cpu_conf: Pass policy to CPU feature filtering callbacks (rhbz#1749672, rhbz#1756156, rhbz#1721608) +- qemuxml2*test: Add tests for Icelake-Server, -pconfig (rhbz#1749672, rhbz#1756156, rhbz#1721608) +- qemu: Drop disabled CPU features unknown to QEMU (rhbz#1749672, rhbz#1756156, rhbz#1721608) +- cputest: Add data for Ice Lake Server CPU (rhbz#1749672, rhbz#1756156, rhbz#1721608) +- cpu_map: Drop pconfig from Icelake-Server CPU model (rhbz#1749672, rhbz#1756156, rhbz#1721608) +- qemu: Fix NULL ptr dereference caused by qemuDomainDefFormatBufInternal (rhbz#1749672, rhbz#1756156, rhbz#1721608) + +* Mon Sep 16 2019 Jiri Denemark - 4.5.0-35 +- vircgroupv2: fix setting cpu.max period (rhbz#1749227) + +* Wed Sep 4 2019 Jiri Denemark - 4.5.0-34 +- vircgroupv2: fix abort in VIR_AUTOFREE (rhbz#1747440) + +* Mon Aug 26 2019 Jiri Denemark - 4.5.0-33 +- vircgroupv2: fix parsing multiple values in single file (rhbz#1741825) +- vircgroupv2: fix virCgroupV2GetCpuCfsQuota for "max" value (rhbz#1741837) + +* Mon Aug 19 2019 Jiri Denemark - 4.5.0-32 +- virDomainObjListAddLocked: Produce better error message than 'Duplicate key' (rhbz#1737790) +- virdbus: Grab a ref as long as the while loop is executed (rhbz#1741900) + +* Tue Jul 30 2019 Jiri Denemark - 4.5.0-31 +- virDomainObjListAddLocked: fix double free (rhbz#1728530) +- docs: schemas: Decouple the virtio options from each other (rhbz#1729675) +- util: command: use VIR_AUTOFREE instead of VIR_FREE for scalar types (rhbz#1721434) +- util: command: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC (rhbz#1721434) +- util: netdevopenvswitch: use VIR_AUTOFREE instead of VIR_FREE for scalar types (rhbz#1721434) +- util: virnetdevopenvswitch: Drop an unused variable @ovs_timeout (rhbz#1721434) +- util: netdevopenvswitch: use VIR_AUTOPTR for aggregate types (rhbz#1721434) +- util: suppress unimportant ovs-vsctl errors when getting interface stats (rhbz#1721434) +- virNetDevOpenvswitchInterfaceStats: Optimize for speed (rhbz#1721434) +- test: Introduce virnetdevopenvswitchtest (rhbz#1721434) +- vircommand: Separate mass FD closing into a function (rhbz#1721434) +- virCommand: use procfs to learn opened FDs (rhbz#1721434) +- util: command: Ignore bitmap errors when enumerating file descriptors to close (rhbz#1721434) +- util: Avoid possible error in virCommandMassClose (rhbz#1721434) +- vircgroup: fix cgroups v2 controllers detection (rhbz#1689297) +- vircgroupv2: store enabled controllers (rhbz#1689297) + +* Wed Jul 3 2019 Jiri Denemark - 4.5.0-30 +- virWaitForDevices: Drop confusing part of comment (rhbz#1710575) +- lib: Drop UDEVSETTLE (rhbz#1710575) +- m4: Provide default value fore UDEVADM (rhbz#1710575) +- m4: Drop needless string checks (rhbz#1710575) +- util: vircgroup: introduce virCgroup(Get|Set)ValueRaw (rhbz#1658890) +- util: vircgroup: move virCgroupGetValueStr out of virCgroupGetValueForBlkDev (rhbz#1658890) +- util: vircgroupv1: add support for BFQ blkio files (rhbz#1658890) +- util: vircgroupv2: add support for BFQ files (rhbz#1658890) +- Handle copying bitmaps to larger data buffers (rhbz#1703160) + +* Tue Jul 2 2019 Jiri Denemark - 4.5.0-29 +- cpu: allow include files for CPU definition (rhbz#1686895) +- cpu: fix cleanup when signature parsing fails (rhbz#1686895) +- cpu: push more parsing logic into common code (rhbz#1686895) +- cpu: simplify failure cleanup paths (rhbz#1686895) +- cpu_map: Add support for arch-capabilities feature (rhbz#1693433) +- cputest: Add data for Intel(R) Xeon(R) CPU E5-2630 v4 (rhbz#1686895) +- cputest: Add data for Intel(R) Core(TM) i7-7600U (rhbz#1686895) +- cputest: Add data for Intel(R) Xeon(R) CPU E7540 (rhbz#1686895) +- cputest: Add data for Intel(R) Xeon(R) CPU E5-2650 (rhbz#1686895) +- cputest: Add data for Intel(R) Core(TM) i7-8700 (rhbz#1686895) +- cpu_x86: Separate ancestor model parsing from x86ModelParse (rhbz#1686895) +- cpu_x86: Separate signature parsing from x86ModelParse (rhbz#1686895) +- cpu_x86: Separate vendor parsing from x86ModelParse (rhbz#1686895) +- cpu_x86: Separate feature list parsing from x86ModelParse (rhbz#1686895) +- cpu_x86: Make sure CPU model names are unique in cpu_map (rhbz#1686895) +- cpu_x86: Add x86ModelCopySignatures helper (rhbz#1686895) +- cpu_x86: Store CPU signature in an array (rhbz#1686895) +- cpu_x86: Allow multiple signatures for a CPU model (rhbz#1686895) +- cpu_x86: Log decoded CPU model and signatures (rhbz#1686895) +- qemu_capabilities: Inroduce virQEMUCapsGetCPUModelX86Data (rhbz#1686895) +- qemu_capabilities: Introduce virQEMUCapsGetCPUModelInfo (rhbz#1686895) +- qemu_capabilities: Use virQEMUCapsGetCPUModelInfo (rhbz#1686895) +- cpu_x86: Add virCPUx86DataGetSignature for tests (rhbz#1686895) +- cpu_map: Add hex representation of signatures (rhbz#1686895) +- cputest: Test CPU signatures (rhbz#1686895) +- cpu_map: Add more signatures for Conroe CPU model (rhbz#1686895) +- cpu_map: Add more signatures for Penryn CPU model (rhbz#1686895) +- cpu_map: Add more signatures for Nehalem CPU models (rhbz#1686895) +- cpu_map: Add more signatures for Westmere CPU model (rhbz#1686895) +- cpu_map: Add more signatures for SandyBridge CPU models (rhbz#1686895) +- cpu_map: Add more signatures for IvyBridge CPU models (rhbz#1686895) +- cpu_map: Add more signatures for Haswell CPU models (rhbz#1686895) +- cpu_map: Add more signatures for Broadwell CPU models (rhbz#1686895) +- cpu_map: Add more signatures for Skylake-Client CPU models (rhbz#1686895) +- cpu: Don't access invalid memory in virCPUx86Translate (rhbz#1686895) +- cpu_x86: Require within in CPU map (rhbz#1697627) +- cputest: Add data for Intel(R) Xeon(R) Platinum 8268 CPU (rhbz#1693433) +- cpu_map: Add Cascadelake-Server CPU model (rhbz#1693433) +- cpu_x86: Introduce virCPUx86DataItem container struct (rhbz#1697627) +- cpu_x86: Rename virCPUx86Vendor.cpuid (rhbz#1697627) +- cpu_x86: Rename virCPUx86DataItem variables (rhbz#1697627) +- cpu_x86: Rename x86DataCpuidNext function (rhbz#1697627) +- cpu_x86: Rename x86DataCpuid (rhbz#1697627) +- cpu_x86: Rename virCPUx86CPUIDSorter (rhbz#1697627) +- cpu_x86: Rename virCPUx86DataAddCPUIDInt (rhbz#1697627) +- cpu_x86: Rename virCPUx86DataAddCPUID (rhbz#1697627) +- cpu_x86: Rename virCPUx86VendorToCPUID (rhbz#1697627) +- cpu_x86: Simplify x86DataAdd (rhbz#1697627) +- cpu_x86: Introduce virCPUx86DataCmp (rhbz#1697627) +- cpu_x86: Make x86cpuidSetBits more general (rhbz#1697627) +- cpu_x86: Make x86cpuidClearBits more general (rhbz#1697627) +- cpu_x86: Make x86cpuidAndBits more general (rhbz#1697627) +- cpu_x86: Make x86cpuidMatchMasked more general (rhbz#1697627) +- cpu_x86: Make x86cpuidMatch more general (rhbz#1697627) +- cpu_x86: Store virCPUx86DataItem content in union (rhbz#1697627) +- cpu_x86: Add support for storing MSR features in CPU map (rhbz#1697627) +- cpu_x86: Move *CheckFeature functions (rhbz#1697627) +- cputest: Add support for MSR features to cpu-parse.sh (rhbz#1697627) +- util: file: introduce VIR_AUTOCLOSE macro to close fd of the file automatically (rhbz#1697627) +- vircpuhost: Add support for reading MSRs (rhbz#1697627) +- virhostcpu: Make virHostCPUGetMSR() work only on x86 (rhbz#1697627) +- cpu_x86: Fix placement of *CheckFeature functions (rhbz#1697627) +- cpu_conf: Introduce virCPUDefFilterFeatures (rhbz#1697627) +- qemu_command: Use consistent syntax for CPU features (rhbz#1697627) +- tests: Add QEMU caps data for future 4.1.0 (rhbz#1697627) +- tests: Add domain capabilities case for QEMU 4.1.0 (rhbz#1697627) +- qemuxml2argvtest: Add test for CPU features translation (rhbz#1697627) +- qemu: Add APIs for translating CPU features (rhbz#1697627) +- qemu: Probe for max-x86_64-cpu type (rhbz#1697627) +- qemu: Probe for "unavailable-features" CPU property (rhbz#1697627) +- qemu: Probe host CPU after capabilities (rhbz#1697627) +- qemu_command: Use canonical names of CPU features (rhbz#1697627) +- qemu: Translate feature names from query-cpu-model-expansion (rhbz#1697627) +- qemu: Don't use full CPU model expansion (rhbz#1697627) +- qemu: Make qemuMonitorGetGuestCPU usable on x86 only (rhbz#1697627) +- cpu: Introduce virCPUDataAddFeature (rhbz#1697627) +- qemu: Add type filter to qemuMonitorJSONParsePropsList (rhbz#1697627) +- util: string: Introduce macro for automatic string lists (rhbz#1697627) +- util: json: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC (rhbz#1697627) +- qemu: Introduce generic qemuMonitorGetGuestCPU (rhbz#1697627) +- qemu_process: Prefer generic qemuMonitorGetGuestCPU (rhbz#1697627) +- util: Rework virStringListAdd (rhbz#1697627) +- conf: Introduce virCPUDefCheckFeatures (rhbz#1697627) +- cpu_x86: Turn virCPUx86DataIteratorInit into a function (rhbz#1697627) +- cpu_x86: Introduce virCPUx86FeatureFilter*MSR (rhbz#1697627) +- cpu_x86: Read CPU features from IA32_ARCH_CAPABILITIES MSR (rhbz#1697627) +- cpu_map: Introduce IA32_ARCH_CAPABILITIES MSR features (rhbz#1697627) +- qemu: Forbid MSR features with old QEMU (rhbz#1697627) +- qemu: Drop MSR features from host-model with old QEMU (rhbz#1697627) +- cpu_x86: Fix memory leak - virCPUx86GetHost (rhbz#1697627) +- qemu: Use @tmpChr in qemuDomainDetachChrDevice to build device string (rhbz#1624204) +- qemu: Drop "user-" prefix for guestfwd netdev (rhbz#1624204) +- qemu_hotplug: Attach guestfwd using netdev_add (rhbz#1624204) +- qemu_hotplug: Detach guestfwd using netdev_del (rhbz#1624204) +- qemuhotplugtest: Test guestfwd attach and detach (rhbz#1624204) +- daemon: Register secret driver before storage driver (rhbz#1685151) +- bhyve: Move autostarting of domains into bhyveStateInitialize (rhbz#1685151) +- Revert "virStateDriver - Separate AutoStart from Initialize" (rhbz#1685151) +- Revert "Separate out StateAutoStart from StateInitialize" (rhbz#1685151) +- util: moving 'type' argument to avoid issues with mount() syscall. (rhbz#1689297) +- util: cgroup: use VIR_AUTOFREE instead of VIR_FREE for scalar types (rhbz#1689297) +- vircgroup: Rename structs to start with underscore (rhbz#1689297) +- vircgroup: Introduce standard set of typedefs and use them (rhbz#1689297) +- vircgroup: Extract file link resolving into separate function (rhbz#1689297) +- vircgroup: Remove unused function virCgroupKill() (rhbz#1689297) +- vircgroup: Unexport unused function virCgroupAddTaskController() (rhbz#1689297) +- vircgroup: Unexport unused function virCgroupRemoveRecursively (rhbz#1689297) +- vircgroup: Move function used in tests into vircgrouppriv.h (rhbz#1689297) +- vircgroup: Remove pointless bool parameter (rhbz#1689297) +- vircgroup: Extract mount options matching into function (rhbz#1689297) +- vircgroup: Use virCgroupMountOptsMatchController in virCgroupDetectPlacement (rhbz#1689297) +- vircgroup: Introduce virCgroupEnableMissingControllers (rhbz#1689297) +- vircgroup: machinename will never be NULL (rhbz#1689297) +- vircgroup: Remove virCgroupAddTaskController (rhbz#1689297) +- vircgroup: Introduce virCgroupGetMemoryStat (rhbz#1689297) +- lxc: Use virCgroupGetMemoryStat (rhbz#1689297) +- vircgroup: fix MinGW build (rhbz#1689297) +- vircgroup: Duplicate string before modifying (rhbz#1689297) +- vircgroup: Extract controller detection into function (rhbz#1689297) +- vircgroup: Extract placement validation into function (rhbz#1689297) +- vircgroup: Split virCgroupPathOfController into two functions (rhbz#1689297) +- vircgroup: Call virCgroupRemove inside virCgroupMakeGroup (rhbz#1689297) +- vircgroup: Simplify if conditions in virCgroupMakeGroup (rhbz#1689297) +- vircgroup: Remove obsolete sa_assert (rhbz#1689297) +- tests: Resolve possible overrun (rhbz#1689297) +- vircgroup: cleanup controllers not managed by systemd on error (rhbz#1689297) +- vircgroup: fix bug in virCgroupEnableMissingControllers (rhbz#1689297) +- vircgroup: rename virCgroupAdd.*Task to virCgroupAdd.*Process (rhbz#1689297) +- vircgroup: introduce virCgroupTaskFlags (rhbz#1689297) +- vircgroup: introduce virCgroupAddThread (rhbz#1689297) +- vircgroupmock: cleanup unused cgroup files (rhbz#1689297) +- vircgroupmock: rewrite cgroup fopen mocking (rhbz#1689297) +- vircgrouptest: call virCgroupDetectMounts directly (rhbz#1689297) +- vircgrouptest: call virCgroupNewSelf instead virCgroupDetectMounts (rhbz#1689297) +- util: introduce vircgroupbackend files (rhbz#1689297) +- vircgroup: introduce cgroup v1 backend files (rhbz#1689297) +- vircgroup: extract virCgroupV1Available (rhbz#1689297) +- vircgroup: detect available backend for cgroup (rhbz#1689297) +- vircgroup: extract virCgroupV1ValidateMachineGroup (rhbz#1689297) +- vircgroup: extract virCgroupV1CopyMounts (rhbz#1689297) +- vircgroup: extract v1 detect functions (rhbz#1689297) +- vircgroup: extract virCgroupV1CopyPlacement (rhbz#1689297) +- vircgroup: extract virCgroupV1ValidatePlacement (rhbz#1689297) +- vircgroup: extract virCgroupV1StealPlacement (rhbz#1689297) +- vircgroup: extract virCgroupV1DetectControllers (rhbz#1689297) +- vircgroup: extract virCgroupV1HasController (rhbz#1689297) +- vircgroup: extract virCgroupV1GetAnyController (rhbz#1689297) +- vircgroup: extract virCgroupV1PathOfController (rhbz#1689297) +- vircgroup: extract virCgroupV1MakeGroup (rhbz#1689297) +- vircgroup: extract virCgroupV1Remove (rhbz#1689297) +- vircgroup: extract virCgroupV1AddTask (rhbz#1689297) +- vircgroup: extract virCgroupV1HasEmptyTasks (rhbz#1689297) +- vircgroup: extract virCgroupV1BindMount (rhbz#1689297) +- vircgroup: extract virCgroupV1SetOwner (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)BlkioWeight (rhbz#1689297) +- vircgroup: extract virCgroupV1GetBlkioIoServiced (rhbz#1689297) +- vircgroup: extract virCgroupV1GetBlkioIoDeviceServiced (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWeight (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceReadIops (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWriteIops (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceReadBps (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWriteBps (rhbz#1689297) +- vircgroup: extract virCgroupV1SetMemory (rhbz#1689297) +- vircgroup: extract virCgroupV1GetMemoryStat (rhbz#1689297) +- vircgroup: extract virCgroupV1GetMemoryUsage (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)Memory*Limit (rhbz#1689297) +- vircgroup: extract virCgroupV1GetMemSwapUsage (rhbz#1689297) +- vircgroup: extract virCgroupV1(Allow|Deny)Device (rhbz#1689297) +- vircgroup: extract virCgroupV1(Allow|Deny)AllDevices (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)CpuShares (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)CpuCfsPeriod (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)CpuCfsQuota (rhbz#1689297) +- vircgroup: extract virCgroupV1SupportsCpuBW (rhbz#1689297) +- vircgroup: extract virCgroupV1GetCpuacct*Usage (rhbz#1689297) +- vircgroup: extract virCgroupV1GetCpuacctStat (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)FreezerState (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)CpusetMems (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)CpusetMemoryMigrate (rhbz#1689297) +- vircgroup: extract virCgroupV1(Set|Get)CpusetCpus (rhbz#1689297) +- vircgroup: rename virCgroupController into virCgroupV1Controller (rhbz#1689297) +- vircgroup: rename controllers to legacy (rhbz#1689297) +- vircgroup: remove VIR_CGROUP_SUPPORTED (rhbz#1689297) +- vircgroup: include system headers only on linux (rhbz#1689297) +- vircgroupv1: fix build on non-linux OSes (rhbz#1689297) +- Revert "vircgroup: cleanup controllers not managed by systemd on error" (rhbz#1689297) +- util: introduce cgroup v2 files (rhbz#1689297) +- vircgroup: introduce virCgroupV2Available (rhbz#1689297) +- vircgroup: introduce virCgroupV2ValidateMachineGroup (rhbz#1689297) +- vircgroup: introduce virCgroupV2CopyMounts (rhbz#1689297) +- vircgroup: introduce virCgroupV2CopyPlacement (rhbz#1689297) +- vircgroup: introduce virCgroupV2DetectMounts (rhbz#1689297) +- vircgroup: introduce virCgroupV2DetectPlacement (rhbz#1689297) +- vircgroup: introduce virCgroupV2ValidatePlacement (rhbz#1689297) +- vircgroup: introduce virCgroupV2StealPlacement (rhbz#1689297) +- vircgroup: introduce virCgroupV2DetectControllers (rhbz#1689297) +- vircgroup: introduce virCgroupV2HasController (rhbz#1689297) +- vircgroup: introduce virCgroupV2GetAnyController (rhbz#1689297) +- vircgroup: introduce virCgroupV2PathOfController (rhbz#1689297) +- vircgroup: introduce virCgroupV2MakeGroup (rhbz#1689297) +- vircgroup: introduce virCgroupV2Remove (rhbz#1689297) +- vircgroup: introduce virCgroupV2AddTask (rhbz#1689297) +- vircgroup: introduce virCgroupV2HasEmptyTasks (rhbz#1689297) +- vircgroup: introduce virCgroupV2BindMount (rhbz#1689297) +- vircgroup: introduce virCgroupV2SetOwner (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)BlkioWeight (rhbz#1689297) +- vircgroup: introduce virCgroupV2GetBlkioIoServiced (rhbz#1689297) +- vircgroup: introduce virCgroupV2GetBlkioIoDeviceServiced (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)BlkioDeviceWeight (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)BlkioDeviceReadIops (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)BlkioDeviceWriteIops (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)BlkioDeviceReadBps (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)BlkioDeviceWriteBps (rhbz#1689297) +- vircgroup: introduce virCgroupV2SetMemory (rhbz#1689297) +- vircgroup: introduce virCgroupV2GetMemoryStat (rhbz#1689297) +- vircgroup: introduce virCgroupV2GetMemoryUsage (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)MemoryHardLimit (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)MemorySoftLimit (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)MemSwapHardLimit (rhbz#1689297) +- vircgroup: introduce virCgroupV2GetMemSwapUsage (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)CpuShares (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)CpuCfsPeriod (rhbz#1689297) +- vircgroup: introduce virCgroupV2(Set|Get)CpuCfsQuota (rhbz#1689297) +- vircgroup: introduce virCgroupV2SupportsCpuBW (rhbz#1689297) +- vircgroup: introduce virCgroupV2GetCpuacctUsage (rhbz#1689297) +- vircgroup: introduce virCgroupV2GetCpuacctStat (rhbz#1689297) +- vircgroup: register cgroup v2 backend (rhbz#1689297) +- vircgroup: add support for hybrid configuration (rhbz#1689297) +- vircgroupmock: change cgroup prefix (rhbz#1689297) +- vircgroupmock: add support to test cgroup v2 (rhbz#1689297) +- vircgrouptest: introduce initFakeFS and cleanupFakeFS helpers (rhbz#1689297) +- vircgrouptest: prepare testCgroupDetectMounts for cgroup v2 (rhbz#1689297) +- vircgrouptest: add detect mounts test for cgroup v2 (rhbz#1689297) +- vircgrouptest: add detect mounts test for hybrid cgroups (rhbz#1689297) +- vircgrouptest: prepare validateCgroup for cgroupv2 (rhbz#1689297) +- vircgrouptest: add cgroup v2 tests (rhbz#1689297) +- vircgrouptest: add hybrid tests (rhbz#1689297) +- virt-host-validate: rewrite cgroup detection to use util/vircgroup (rhbz#1689297) +- virt-host-validate: require freezer for LXC (rhbz#1689297) +- virt-host-validate: Fix build on non-Linux (rhbz#1689297) +- tests: Use correct function name in error path (rhbz#1689297) +- util: Fix virCgroupGetMemoryStat (rhbz#1689297) +- tests: Augment vcgrouptest to add virCgroupGetMemoryStat (rhbz#1689297) +- vircgroup: introduce virCgroupKillRecursiveCB (rhbz#1689297) +- vircgroupv2: fix virCgroupV2ValidateMachineGroup (rhbz#1689297) +- util: implement virCgroupV2(Set|Get)CpusetMems (rhbz#1689297) +- util: implement virCgroupV2(Set|Get)CpusetMemoryMigrate (rhbz#1689297) +- util: implement virCgroupV2(Set|Get)CpusetCpus (rhbz#1689297) +- util: enable cgroups v2 cpuset controller for threads (rhbz#1689297) +- util: vircgroup: pass parent cgroup into virCgroupDetectControllersCB (rhbz#1689297) +- internal: introduce a family of NULLSTR macros (rhbz#1689297) +- util: vircgroup: improve controller detection (rhbz#1689297) +- util: vircgroupv2: use any controller to create thread directory (rhbz#1689297) +- util: vircgroupv2: enable CPU controller only if it's available (rhbz#1689297) +- util: vircgroupv2: separate return values of virCgroupV2EnableController (rhbz#1689297) +- util: vircgroupv2: don't error out if enabling controller fails (rhbz#1689297) +- util: vircgroupv2: mark only requested controllers as available (rhbz#1689297) +- Revert "util: vircgroup: pass parent cgroup into virCgroupDetectControllersCB" (rhbz#1689297) +- util: vircgroupv2: stop enabling missing controllers with systemd (rhbz#1689297) + +* Fri Jun 28 2019 Danilo de Paula - 4.5.0-28 +- Rebuild all virt packages to fix RHEL's upgrade path +- Resolves: rhbz#1695587 + (Ensure modular RPM upgrade path) + +* Fri Jun 21 2019 Jiri Denemark - 4.5.0-27 +- RHEL: spec: Disable gluster on i686 (rhbz#1722668) +- rpc: virnetlibsshsession: update deprecated functions (rhbz#1722735) + +* Thu Jun 20 2019 Jiri Denemark - 4.5.0-26 +- api: disallow virDomainSaveImageGetXMLDesc on read-only connections (CVE-2019-10161) +- api: disallow virDomainManagedSaveDefineXML on read-only connections (CVE-2019-10166) +- api: disallow virConnectGetDomainCapabilities on read-only connections (CVE-2019-10167) +- api: disallow virConnect*HypervisorCPU on read-only connections (CVE-2019-10168) + +* Fri Jun 14 2019 Jiri Denemark - 4.5.0-25 +- admin: reject clients unless their UID matches the current UID (CVE-2019-10132) +- locking: restrict sockets to mode 0600 (CVE-2019-10132) +- logging: restrict sockets to mode 0600 (CVE-2019-10132) +- util: skip RDMA detection for non-PCI network devices (rhbz#1693299) +- virfile: Detect ceph as shared FS (rhbz#1698133) +- virfile: added GPFS as shared fs (rhbz#1698133) +- util: bitmap: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC (rhbz#1716943) +- qemu: Rework setting process affinity (rhbz#1716943) +- qemu: Set up EMULATOR thread and cpuset.mems before exec()-ing qemu (rhbz#1716943) +- conf: Add definitions for 'uid' and 'fid' PCI address attributes (rhbz#1508149) +- qemu: Introduce zPCI capability (rhbz#1508149) +- qemu: Enable PCI multi bus for S390 guests (rhbz#1508149) +- conf: Introduce extension flag and zPCI member for PCI address (rhbz#1508149) +- conf: Introduce address caching for PCI extensions (rhbz#1508149) +- qemu: Auto add pci-root for s390/s390x guests (rhbz#1508149) +- conf: use virXMLFormatElement() in virDomainDeviceInfoFormat() (rhbz#1508149) +- conf: Introduce parser, formatter for uid and fid (rhbz#1508149) +- qemu: Add zPCI address definition check (rhbz#1508149) +- conf: Allocate/release 'uid' and 'fid' in PCI address (rhbz#1508149) +- qemu: Generate and use zPCI device in QEMU command line (rhbz#1508149) +- qemu: Add hotpluging support for PCI devices on S390 guests (rhbz#1508149) +- qemuDomainRemoveRNGDevice: Remove associated chardev too (rhbz#1508149) +- qemu_hotplug: remove erroneous call to qemuDomainDetachExtensionDevice() (rhbz#1508149) +- qemu_hotplug: remove another erroneous qemuDomainDetachExtensionDevice() call (rhbz#1508149) +- util: Propagate numad failures correctly (rhbz#1716907) +- util: Introduce virBitmapUnion() (rhbz#1716908) +- util: Introduce virNumaNodesetToCPUset() (rhbz#1716908) +- qemu: Fix qemuProcessInitCpuAffinity() (rhbz#1716908) +- qemu: Fix leak in qemuProcessInitCpuAffinity() (rhbz#1716908) +- qemu: Drop cleanup label from qemuProcessInitCpuAffinity() (rhbz#1716908) +- qemu: Fix NULL pointer access in qemuProcessInitCpuAffinity() (rhbz#1716908) +- qemuBuildMemoryBackendProps: Pass @priv instead of its individual members (rhbz#1624223) +- qemu: Don't use -mem-prealloc among with .prealloc=yes (rhbz#1624223) +- nwfilter: fix adding std MAC and IP values to filter binding (rhbz#1691356) +- qemuProcessBuildDestroyMemoryPathsImpl: Don't overwrite error (rhbz#1658112) +- qemu_security: Fully implement qemuSecurityDomainSetPathLabel (rhbz#1658112) +- qemu: process: SEV: Assume libDir to be the directory to create files in (rhbz#1658112) +- qemu: process: SEV: Relabel guest owner's SEV files created before start (rhbz#1658112) + +* Tue May 14 2019 Jiri Denemark - 4.5.0-24 +- tests: qemuxml2argv: add CAPS_ARCH_LATEST macro (rhbz#1698855) +- qemu: Add ccw support for vhost-vsock (rhbz#1698855) +- qemu: Allow creating ppc64 guests with graphics and no USB mouse (rhbz#1683681) +- conf: Expose virDomainSCSIDriveAddressIsUsed (rhbz#1692354) +- qemuhotplugtest: Don't plug a SCSI disk at unit 7 (rhbz#1692354) +- qemu_hotplug: Check for duplicate drive addresses (rhbz#1692354) +- cpu_map: Add support for cldemote CPU feature (rhbz#1537731) +- util: alloc: add macros for implementing automatic cleanup functionality (rhbz#1505998) +- qemu: domain: Simplify non-VFIO memLockLimit calculation for PPC64 (rhbz#1505998) +- qemu_domain: add a PPC64 memLockLimit helper (rhbz#1505998) +- qemu_domain: NVLink2 bridge detection function for PPC64 (rhbz#1505998) +- PPC64 support for NVIDIA V100 GPU with NVLink2 passthrough (rhbz#1505998) +- cpu_x86: Do not cache microcode version (CVE-2018-12127, CVE-2019-11091, CVE-2018-12126, CVE-2018-12130) +- qemu: Don't cache microcode version (CVE-2018-12127, CVE-2019-11091, CVE-2018-12126, CVE-2018-12130) +- cputest: Add data for Intel(R) Xeon(R) CPU E3-1225 v5 (CVE-2018-12127, CVE-2019-11091, CVE-2018-12126, CVE-2018-12130) +- cpu_map: Define md-clear CPUID bit (CVE-2018-12127, CVE-2019-11091, CVE-2018-12126, CVE-2018-12130) + +* Fri Feb 15 2019 Jiri Denemark - 4.5.0-23 +- network: explicitly allow icmp/icmpv6 in libvirt zonefile (rhbz#1650320) + +* Fri Feb 15 2019 Jiri Denemark - 4.5.0-22 +- util: fix memory leak in virFirewallDInterfaceSetZone() (rhbz#1650320) + +* Fri Feb 8 2019 Jiri Denemark - 4.5.0-21 +- docs: Drop /dev/net/tun from the list of shared devices (rhbz#1665400) +- qemu: conf: Remove /dev/sev from the default cgroup device acl list (rhbz#1665400) +- qemu: cgroup: Expose /dev/sev/ only to domains that require SEV (rhbz#1665400) +- qemu: domain: Add /dev/sev into the domain mount namespace selectively (rhbz#1665400) +- security: dac: Relabel /dev/sev in the namespace (rhbz#1665400) +- qemu: caps: Use CAP_DAC_OVERRIDE for probing to avoid permission issues (rhbz#1665400) +- qemu: caps: Don't try to ask for CAP_DAC_OVERRIDE if non-root (rhbz#1665400) +- Revert "RHEL: Require firewalld-filesystem for firewalld rpm macros" (rhbz#1650320) +- Revert "RHEL: network: regain guest network connectivity after firewalld switch to nftables" (rhbz#1650320) +- configure: change HAVE_FIREWALLD to WITH_FIREWALLD (rhbz#1650320) +- util: move all firewalld-specific stuff into its own files (rhbz#1650320) +- util: new virFirewallD APIs + docs (rhbz#1650320) +- configure: selectively install a firewalld 'libvirt' zone (rhbz#1650320) +- network: set firewalld zone of bridges to "libvirt" zone when appropriate (rhbz#1650320) +- network: allow configuring firewalld zone for virtual network bridge device (rhbz#1650320) +- util: remove test code accidentally committed to virFirewallDZoneExists (rhbz#1650320) +- qemu: command: Don't skip 'readonly' and throttling info for empty drive (rhbz#1670337) + +* Mon Jan 28 2019 Jiri Denemark - 4.5.0-20 +- RHEL: qemu: Fix crash trying to use iSCSI hostdev (rhbz#1669424) + +* Thu Jan 24 2019 Jiri Denemark - 4.5.0-19 +- qemu: Fix logic error in qemuSetUnprivSGIO (rhbz#1666605) +- tests: qemuxml2argv: Add test case for empty CDROM with cache mode (rhbz#1553255) +- qemu: command: Don't format image properties for empty -drive (rhbz#1553255) + +* Mon Jan 14 2019 Jiri Denemark - 4.5.0-18 +- conf: correct false boot order error during domain parse (rhbz#1630393) +- qemu: Remove duplicated qemuAgentCheckError (rhbz#1665000) +- qemu: require reply from guest agent in qemuAgentGetInterfaces (rhbz#1665000) +- qemu: Filter non SCSI hostdevs in qemuHostdevPrepareSCSIDevices (rhbz#1665244) +- util: remove const specifier from nlmsghdr arg to virNetlinkDumpCallback() (rhbz#1583131) +- util: add a function to insert new interfaces to IPv6CheckForwarding list (rhbz#1583131) +- util: use nlmsg_find_attr() instead of an open-coded loop (rhbz#1583131) +- util: check accept_ra for all nexthop interfaces of multipath routes (rhbz#1583131) +- util: make forgotten changes suggested during review of commit d40b820c (rhbz#1583131) + +* Mon Jan 7 2019 Jiri Denemark - 4.5.0-17 +- virsh: Strip XML declaration when extracting CPU XMLs (rhbz#1659048) +- RHEL: qemu: Add ability to set sgio values for hostdev (rhbz#1582424) +- RHEL: qemu: Add check for unpriv sgio for SCSI generic host device (rhbz#1582424) +- qemu: Alter @val usage in qemuSetUnprivSGIO (rhbz#1656362) +- qemu: Alter qemuSetUnprivSGIO hostdev shareable logic (rhbz#1656362) + +* Mon Dec 17 2018 Jiri Denemark - 4.5.0-16 +- util: Don't overflow in virRandomBits (rhbz#1655586) +- virrandom: Avoid undefined behaviour in virRandomBits (rhbz#1655586) +- spec: remove libcgroup and cgconfig (rhbz#1602407) +- qemu: Drop duplicated code from qemuDomainDefValidateFeatures() (rhbz#1647822) +- tests: Add capabilities data for QEMU 3.1.0 on ppc64 (rhbz#1647822) +- qemu: Introduce QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV (rhbz#1647822) +- conf: Parse and format nested-hv feature (rhbz#1647822) +- qemu: Format nested-hv feature on the command line (rhbz#1647822) +- qemu: Add check for whether KVM nesting is enabled (rhbz#1645139) +- secret: Add check/validation for correct usage when LookupByUUID (rhbz#1656255) +- cpu: Add support for "stibp" x86_64 feature (rhbz#1655032) + +* Mon Dec 3 2018 Jiri Denemark - 4.5.0-15 +- virfile: Take symlink into account in virFileIsSharedFixFUSE (rhbz#1634782) +- qemu: Ignore nwfilter binding instantiation issues during reconnect (rhbz#1648544) +- qemu: Set identity for the reconnect all thread (rhbz#1648546) +- Revert "access: Modify the VIR_ERR_ACCESS_DENIED to include driverName" (rhbz#1631608) +- access: Modify the VIR_ERR_ACCESS_DENIED to include driverName (rhbz#1631608) +- qemu: add vfio-ap capability (rhbz#1508146) +- qemu: vfio-ap device support (rhbz#1508146) +- qemu: Extract MDEV VFIO PCI validation code into a separate helper (rhbz#1508146) +- conf: Move VFIO AP validation from post parse to QEMU validation code (rhbz#1508146) +- qemu: Fix post-copy migration on the source (rhbz#1649169) + +* Fri Nov 9 2018 Jiri Denemark - 4.5.0-14 +- storage: Remove secretPath from _virStorageBackendQemuImgInfo (rhbz#1645459) +- storage: Allow for inputvol to have any format for encryption (rhbz#1645459) +- storage: Allow inputvol to be encrypted (rhbz#1645459) +- access: Modify the VIR_ERR_ACCESS_DENIED to include driverName (rhbz#1631608) +- docs: Enhance polkit documentation to describe secondary connection (rhbz#1631608) +- qemu: Don't ignore resume events (rhbz#1634758, rhbz#1643338) + +* Thu Nov 1 2018 Jiri Denemark - 4.5.0-13 +- Revert "spec: Temporarily drop gluster support" (rhbz#1599339) + +* Wed Oct 17 2018 Jiri Denemark - 4.5.0-12 +- RHEL: Require firewalld-filesystem for firewalld rpm macros (rhbz#1639932) + +* Tue Oct 16 2018 Jiri Denemark - 4.5.0-11 +- virfile: fix cast-align error (rhbz#1634782) +- virfiletest: Fix test name prefix for virFileInData test (rhbz#1634782) +- virfiletst: Test virFileIsSharedFS (rhbz#1634782) +- virFileIsSharedFSType: Detect direct mount points (rhbz#1634782) +- virfile: Rework virFileIsSharedFixFUSE (rhbz#1634782) +- RHEL: network: regain guest network connectivity after firewalld switch to nftables (rhbz#1638864) + +* Mon Oct 8 2018 Jiri Denemark - 4.5.0-10 +- conf: Fix check for chardev source path (rhbz#1609723) +- tests: Reuse qemucapabilities data for qemucaps2xml (rhbz#1629862) +- tests: Add more tests to qemucaps2xml (rhbz#1629862) +- qemu: Drop QEMU_CAPS_ENABLE_KVM (rhbz#1629862) +- qemu: Avoid probing non-native binaries all the time (rhbz#1629862) +- qemu: Clarify QEMU_CAPS_KVM (rhbz#1629862) +- qemu: Don't check for /dev/kvm presence (rhbz#1629862) +- tests: Follow up on qemucaps2xmldata rename (rhbz#1629862) +- security: dac: also label listen UNIX sockets (rhbz#1634775) +- spec: Set correct TLS priority (rhbz#1632269) +- spec: Build ceph and gluster support everywhere (rhbz#1599546) +- virsh: Require explicit --domain for domxml-to-native (rhbz#1634769) +- virFileIsSharedFSType: Check for fuse.glusterfs too (rhbz#1634782) +- qemu: fix up permissions for pre-created UNIX sockets (rhbz#1634775) +- cpu_map: Add features for Icelake CPUs (rhbz#1527657, rhbz#1526625) +- cpu_map: Add Icelake CPU models (rhbz#1526625) +- qemu: Properly report VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT (rhbz#1634758) +- qemu: Report more appropriate running reasons (rhbz#1634758) +- qemu: Pass running reason to RESUME event handler (rhbz#1634758) +- qemu: Map running reason to resume event detail (rhbz#1634758) +- qemu: Avoid duplicate resume events and state changes (rhbz#1634758) +- conf: qemu: add support for Hyper-V frequency MSRs (rhbz#1589702) +- conf: qemu: add support for Hyper-V reenlightenment notifications (rhbz#1589702) +- conf: qemu: add support for Hyper-V PV TLB flush (rhbz#1589702) + +* Wed Sep 5 2018 Jiri Denemark - 4.5.0-9 +- RHEL: Fix virConnectGetMaxVcpus output (rhbz#1582222) +- storage: Add --shrink to qemu-img command when shrinking vol (rhbz#1622534) +- access: Fix nwfilter-binding ACL access API name generation (rhbz#1622540) +- conf: Add validation of input devices (rhbz#1591240) +- tests: qemu: Remove disk from graphics-vnc-tls (rhbz#1598167) +- tests: qemu: test more versions for graphics-vnc-tls (rhbz#1598167) +- qemu: vnc: switch to tls-creds-x509 (rhbz#1598167) +- qemu: mdev: Use vfio-pci 'display' property only with vfio-pci mdevs (rhbz#1624740) +- virDomainDefCompatibleDevice: Relax alias change check (rhbz#1603133) +- virDomainDetachDeviceFlags: Clarify update semantics (rhbz#1603133) +- virDomainNetDefCheckABIStability: Check for MTU change too (rhbz#1623158) +- RHEL: spec: Require python3-devel on RHEL-8 (rhbz#1518446) +- qemu: monitor: Remove qemuMonitorJSONExtractCPUArchInfo wrapper (rhbz#1598829) +- qemu: monitor: Use 'target' instead of 'arch' in reply of 'query-cpus-fast' (rhbz#1598829) + +* Tue Aug 21 2018 Jiri Denemark - 4.5.0-8 +- tests: Add missing thread_siblings_list files (rhbz#1608479) +- util: Rewrite virHostCPUCountThreadSiblings() (rhbz#1608479) +- utils: Remove arbitrary limit on socket_id/core_id (rhbz#1608479) +- tests: Add linux-high-ids test (rhbz#1608479) +- qemu: hotplug: Fix asynchronous unplug of 'shmem' (rhbz#1618680) +- tests: rename hugepages to hugepages-default (rhbz#1615461) +- tests: extract hugepages-numa-default-dimm out of hugepages-numa (rhbz#1615461) +- tests: rename hugepages-numa into hugepages-numa-default (rhbz#1615461) +- tests: remove unnecessary XML elements from hugepages-numa-default (rhbz#1615461) +- tests: extract pages-discard out of hugepages-pages (rhbz#1615461) +- tests: rename hugepages-pages into hugepages-numa-nodeset (rhbz#1615461) +- tests: rename hugepages-pages2 into hugepages-numa-default-2M (rhbz#1615461) +- tests: extract pages-discard-hugepages out of hugepages-pages3 (rhbz#1615461) +- tests: rename hugepages-pages3 into hugepages-numa-nodeset-part (rhbz#1615461) +- tests: rename hugepages-pages4 into hugepages-numa-nodeset-nonexist (rhbz#1615461) +- tests: rename hugepages-pages5 into hugepages-default-2M (rhbz#1615461) +- tests: rename hugepages-pages6 into hugepages-default-system-size (rhbz#1615461) +- tests: rename hugepages-pages7 into pages-dimm-discard (rhbz#1615461) +- tests: rename hugepages-pages8 into hugepages-nodeset-nonexist (rhbz#1615461) +- tests: introduce hugepages-default-1G-nodeset-2M (rhbz#1615461) +- tests: introduce hugepages-nodeset (rhbz#1615461) +- conf: Move hugepage XML validation check out of qemu_command (rhbz#1615461) +- conf: Move hugepages validation out of XML parser (rhbz#1615461) +- conf: Introduce virDomainDefPostParseMemtune (rhbz#1615461) +- tests: sev: Test launch-security with specific QEMU version (rhbz#1619150) +- qemu: Fix probing of AMD SEV support (rhbz#1619150) +- qemu: caps: Format SEV platform data into qemuCaps cache (rhbz#1619150) +- conf: Parse guestfwd channel device info again (rhbz#1610072) + +* Thu Aug 16 2018 Jiri Denemark - 4.5.0-7 +- qemu_migration: Avoid writing to freed memory (rhbz#1615854) + +* Thu Aug 2 2018 Jiri Denemark - 4.5.0-6 +- qemu: Exempt video model 'none' from getting a PCI address on Q35 +- conf: Fix a error msg typo in virDomainVideoDefValidate + +* Tue Jul 31 2018 Jiri Denemark - 4.5.0-5 +- esx storage: Fix typo lsilogic -> lsiLogic +- networkGetDHCPLeases: Don't always report error if unable to read leases file +- nwfilter: Resolve SEGV for NWFilter Snoop processing +- qemu: Remove unused bypassSecurityDriver from qemuOpenFileAs +- qemuDomainSaveMemory: Don't enforce dynamicOwnership +- domain_nwfilter: Return early if net has no name in virDomainConfNWFilterTeardownImpl +- examples: Add clean-traffic-gateway into nwfilters + +* Mon Jul 23 2018 Jiri Denemark - 4.5.0-4 +- qemu: hotplug: don't overwrite error message in qemuDomainAttachNetDevice +- qemu: hotplug: report error when changing rom enabled attr for net iface +- qemu: Fix setting global_period cputune element +- tests: qemucaps: Add test data for upcoming qemu 3.0.0 +- qemu: capabilities: Add capability for werror/rerror for 'usb-device' frontend +- qemu: command: Move graphics iteration to its own function +- qemu: address: Handle all the video devices within a single loop +- conf: Introduce virDomainVideoDefClear helper +- conf: Introduce virDomainDefPostParseVideo helper +- qemu: validate: Enforce compile time switch type checking for videos +- tests: Add capabilities data for QEMU 2.11 x86_64 +- tests: Update capabilities data for QEMU 3.0.0 x86_64 +- qemu: qemuBuildHostdevCommandLine: Use a helper variable mdevsrc +- qemu: caps: Introduce a capability for egl-headless +- qemu: Introduce a new graphics display type 'headless' +- qemu: caps: Add vfio-pci.display capability +- conf: Introduce virDomainGraphicsDefHasOpenGL helper +- conf: Replace 'error' with 'cleanup' in virDomainHostdevDefParseXMLSubsys +- conf: Introduce new attribute 'display' +- qemu: command: Enable formatting vfio-pci.display option onto cmdline +- docs: Rephrase the mediated devices hostdev section a bit +- conf: Introduce new video type 'none' +- virt-xml-validate: Add schema for nwfilterbinding +- tools: Fix typo generating adapter_wwpn field +- src: Fix memory leak in virNWFilterBindingDispose + +* Mon Jul 23 2018 Jiri Denemark - 4.5.0-3 +- qemu: hotplug: Do not try to add secret object for TLS if it does not exist +- qemu: monitor: Make qemuMonitorAddObject more robust against programming errors +- spec: Explicitly require matching libvirt-libs +- virDomainConfNWFilterInstantiate: initialize @xml to avoid random crash +- qemuProcessStartPRDaemonHook: Try to set NS iff domain was started with one +- qemuDomainValidateStorageSource: Relax PR validation +- virStoragePRDefFormat: Suppress path formatting for migratable XML +- qemu: Wire up PR_MANAGER_STATUS_CHANGED event +- qemu_monitor: Introduce qemuMonitorJSONGetPRManagerInfo +- qemu: Fetch pr-helper process info on reconnect +- qemu: Fix ATTRIBUTE_NONNULL for qemuMonitorAddObject +- virsh.pod: Fix a command name typo in nwfilter-binding-undefine +- docs: schema: Add missing to vsock device +- virnetdevtap: Don't crash on !ifname in virNetDevTapInterfaceStats +- tests: fix TLS handshake failure with TLS 1.3 + +* Mon Jul 9 2018 Jiri Denemark - 4.5.0-2 +- qemu: Add capability for the HTM pSeries feature +- conf: Parse and format the HTM pSeries feature +- qemu: Format the HTM pSeries feature +- qemu: hotplug: Don't access srcPriv when it's not allocated +- qemuDomainNestedJobAllowed: Allow QEMU_JOB_NONE +- src: Mention DEVICE_REMOVAL_FAILED event in virDomainDetachDeviceAlias docs +- virsh.pod: Drop --persistent for detach-device-alias +- qemu: don't use chardev FD passing with standalone args +- qemu: remove chardevStdioLogd param from vhostuser code path +- qemu: consolidate parameters of qemuBuildChrChardevStr into flags +- qemu: don't use chardev FD passing for vhostuser backend +- qemu: fix UNIX socket chardevs operating in client mode +- qemuDomainDeviceDefValidateNetwork: Check for range only if IP prefix set +- spec: Temporarily drop gluster support + +* Tue Jul 3 2018 Jiri Denemark - 4.5.0-1 +- Rebased to libvirt-4.5.0 + +* Fri May 25 2018 Jiri Denemark - 4.3.0-1 +- Rebased to libvirt-4.3.0 + +* Wed Mar 21 2018 Daniel P. Berrangé - 4.1.0-2 +- Fix systemd macro argument with line continuations (rhbz#1558648) + +* Mon Mar 5 2018 Daniel Berrange - 4.1.0-1 +- Rebase to version 4.1.0 + +* Wed Feb 07 2018 Fedora Release Engineering - 4.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 19 2018 Daniel P. Berrange - 4.0.0-1 +- Rebase to version 4.0.0 + +* Wed Dec 20 2017 Cole Robinson - 3.10.0-2 +- Rebuild for xen 4.10 + +* Tue Dec 5 2017 Daniel P. Berrange - 3.10.0-1 +- Rebase to version 3.10.0 + +* Fri Nov 3 2017 Daniel P. Berrange - 3.9.0-1 +- Rebase to version 3.9.0 + +* Wed Oct 4 2017 Daniel P. Berrange - 3.8.0-1 +- Rebase to version 3.8.0 + +* Mon Sep 4 2017 Daniel P. Berrange - 3.7.0-1 +- Rebase to version 3.7.0 + +* Wed Aug 2 2017 Daniel P. Berrange - 3.6.0-1 +- Rebase to version 3.6.0 + +* Sun Jul 30 2017 Florian Weimer - 3.5.0-4 +- Rebuild with binutils fix for ppc64le (#1475636) + +* Tue Jul 25 2017 Daniel P. Berrange - 3.5.0-3 +- Disabled RBD on i386, arm, ppc64 (rhbz #1474743) + +* Mon Jul 17 2017 Cole Robinson - 3.5.0-2 +- Rebuild for xen 4.9 + +* Thu Jul 6 2017 Daniel P. Berrange - 3.5.0-1 +- Rebase to version 3.5.0 + +* Fri Jun 2 2017 Daniel P. Berrange - 3.4.0-1 +- Rebase to version 3.4.0 + +* Mon May 8 2017 Daniel P. Berrange - 3.3.0-1 +- Rebase to version 3.3.0 + +* Mon Apr 3 2017 Daniel P. Berrange - 3.2.0-1 +- Rebase to version 3.2.0 + +* Fri Mar 3 2017 Daniel P. Berrange - 3.1.0-1 +- Rebase to version 3.1.0 + +* Fri Feb 10 2017 Fedora Release Engineering - 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jan 19 2017 Daniel P. Berrange - 3.0.0-1 +- Rebase to version 3.0.0 diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..ef4b817 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,5 @@ +emptyrpm: + expected_empty: + - libvirt + - libvirt-daemon-driver-storage + - libvirt-daemon-kvm diff --git a/sources b/sources new file mode 100644 index 0000000..ddef389 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA1 (libvirt-8.0.0.tar.xz) = e440412e9b45d7e24f0ef492d8edf5cf2cbd3f4c diff --git a/symlinks b/symlinks new file mode 100644 index 0000000..54c634d --- /dev/null +++ b/symlinks @@ -0,0 +1,1123 @@ +.ctags.d/libvirt.ctags ../.ctags +tests/virt-admin-self-test ./virsh-self-test +tests/genericxml2xmloutdata/device-backenddomain.xml ../genericxml2xmlindata/device-backenddomain.xml +tests/networkxml2xmlin/leasetime-hours.xml ../networkxml2confdata/leasetime-hours.xml +tests/networkxml2xmlin/leasetime-infinite.xml ../networkxml2confdata/leasetime-infinite.xml +tests/networkxml2xmlin/leasetime-minutes.xml ../networkxml2confdata/leasetime-minutes.xml +tests/networkxml2xmlin/leasetime-seconds.xml ../networkxml2confdata/leasetime-seconds.xml +tests/networkxml2xmlout/leasetime-hours.xml ../networkxml2xmlin/leasetime-hours.xml +tests/networkxml2xmlout/leasetime-infinite.xml ../networkxml2xmlin/leasetime-infinite.xml +tests/networkxml2xmlout/leasetime-minutes.xml ../networkxml2xmlin/leasetime-minutes.xml +tests/networkxml2xmlout/leasetime-seconds.xml ../networkxml2xmlin/leasetime-seconds.xml +tests/nodedevxml2xmlout/DVD_GCC_4247N.xml ../nodedevschemadata/DVD_GCC_4247N.xml +tests/nodedevxml2xmlout/DVD_with_media.xml ../nodedevschemadata/DVD_with_media.xml +tests/nodedevxml2xmlout/ap_07_0038.xml ../nodedevschemadata/ap_07_0038.xml +tests/nodedevxml2xmlout/ap_card07.xml ../nodedevschemadata/ap_card07.xml +tests/nodedevxml2xmlout/ap_matrix.xml ../nodedevschemadata/ap_matrix.xml +tests/nodedevxml2xmlout/ap_matrix_mdev_types.xml ../nodedevschemadata/ap_matrix_mdev_types.xml +tests/nodedevxml2xmlout/ccw_0_0_ffff.xml ../nodedevschemadata/ccw_0_0_ffff.xml +tests/nodedevxml2xmlout/computer.xml ../nodedevschemadata/computer.xml +tests/nodedevxml2xmlout/css_0_0_fffe_mdev_types.xml ../nodedevschemadata/css_0_0_fffe_mdev_types.xml +tests/nodedevxml2xmlout/css_0_0_ffff.xml ../nodedevschemadata/css_0_0_ffff.xml +tests/nodedevxml2xmlout/drm_renderD129.xml ../nodedevschemadata/drm_renderD129.xml +tests/nodedevxml2xmlout/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml ../nodedevschemadata/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml +tests/nodedevxml2xmlout/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml ../nodedevschemadata/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml +tests/nodedevxml2xmlout/net_00_13_02_b9_f9_d3.xml ../nodedevschemadata/net_00_13_02_b9_f9_d3.xml +tests/nodedevxml2xmlout/net_00_15_58_2f_e9_55.xml ../nodedevschemadata/net_00_15_58_2f_e9_55.xml +tests/nodedevxml2xmlout/pci_0000_00_02_0_header_type.xml ../nodedevschemadata/pci_0000_00_02_0_header_type.xml +tests/nodedevxml2xmlout/pci_0000_00_1c_0_header_type.xml ../nodedevschemadata/pci_0000_00_1c_0_header_type.xml +tests/nodedevxml2xmlout/pci_0000_02_10_7_mdev_types.xml ../nodedevschemadata/pci_0000_02_10_7_mdev_types.xml +tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov.xml ../nodedevschemadata/pci_0000_02_10_7_sriov.xml +tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_all.xml ../nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml +tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml ../nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml +tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_vfs.xml ../nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml +tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml ../nodedevschemadata/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml +tests/nodedevxml2xmlout/pci_0000_42_00_0_vpd.xml ../nodedevschemadata/pci_0000_42_00_0_vpd.xml +tests/nodedevxml2xmlout/pci_1002_71c4.xml ../nodedevschemadata/pci_1002_71c4.xml +tests/nodedevxml2xmlout/pci_8086_0c0c_snd_hda_intel.xml ../nodedevschemadata/pci_8086_0c0c_snd_hda_intel.xml +tests/nodedevxml2xmlout/pci_8086_10c9_sriov_pf.xml ../nodedevschemadata/pci_8086_10c9_sriov_pf.xml +tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host.xml ../nodedevschemadata/pci_8086_27c5_scsi_host.xml +tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0.xml ../nodedevschemadata/pci_8086_27c5_scsi_host_0.xml +tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0_unique_id.xml ../nodedevschemadata/pci_8086_27c5_scsi_host_0_unique_id.xml +tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_device_lun0.xml ../nodedevschemadata/pci_8086_27c5_scsi_host_scsi_device_lun0.xml +tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_host.xml ../nodedevschemadata/pci_8086_27c5_scsi_host_scsi_host.xml +tests/nodedevxml2xmlout/pci_8086_4238_pcie_wireless.xml ../nodedevschemadata/pci_8086_4238_pcie_wireless.xml +tests/nodedevxml2xmlout/scsi_target0_0_0.xml ../nodedevschemadata/scsi_target0_0_0.xml +tests/nodedevxml2xmlout/scsi_target1_0_0.xml ../nodedevschemadata/scsi_target1_0_0.xml +tests/nodedevxml2xmlout/storage_serial_3600c0ff000d7a2a5d463ff4902000000.xml ../nodedevschemadata/storage_serial_3600c0ff000d7a2a5d463ff4902000000.xml +tests/nodedevxml2xmlout/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml ../nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml +tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0.xml ../nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml +tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0_if0.xml ../nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml +tests/qemublocktestdata/imagecreate/qcow2-backing-luks.xml qcow2.xml +tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.xml qcow2.xml +tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2luks.xml qcow2.xml +tests/qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.xml qcow2.xml +tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.xml qcow2.xml +tests/qemublocktestdata/imagecreate/qcow2-backing-raw.xml qcow2.xml +tests/qemublocktestdata/imagecreate/qcow2-luks-encopts-backing.xml qcow2-luks-encopts.xml +tests/qemufirmwaredata/etc/qemu/firmware/40-ovmf-sb-keys.json ../../../usr/share/qemu/firmware/50-ovmf-sb-keys.json +tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell-detach.xml qemuhotplug-base-live+ivshmem-plain.xml +tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain-detach.xml qemuhotplug-base-live.xml +tests/qemustatusxml2xmldata/backup-pull-out.xml backup-pull-in.xml +tests/qemustatusxml2xmldata/blockjob-blockdev-out.xml blockjob-blockdev-in.xml +tests/qemustatusxml2xmldata/blockjob-mirror-out.xml blockjob-mirror-in.xml +tests/qemustatusxml2xmldata/migration-in-params-out.xml migration-in-params-in.xml +tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-out.xml migration-out-nbd-bitmaps-in.xml +tests/qemustatusxml2xmldata/migration-out-params-out.xml migration-out-params-in.xml +tests/qemustatusxml2xmldata/modern-out.xml modern-in.xml +tests/qemustatusxml2xmldata/vcpus-multi-out.xml vcpus-multi-in.xml +tests/qemuvhostuserdata/etc/qemu/vhost-user/40-gpu.json ../../../usr/share/qemu/vhost-user/50-gpu.json +tests/qemuvhostuserdata/usr/share/qemu/vhost-user/30-gpu.json 50-gpu.json +tests/qemuvhostuserdata/usr/share/qemu/vhost-user/60-gpu.json 50-gpu.json +tests/qemuxml2argvdata/aarch64-gic-default-both.args aarch64-gic-v3.args +tests/qemuxml2argvdata/aarch64-gic-default-both.xml aarch64-gic-default.xml +tests/qemuxml2argvdata/aarch64-gic-default-v2.args aarch64-gic-v2.args +tests/qemuxml2argvdata/aarch64-gic-default-v2.xml aarch64-gic-default.xml +tests/qemuxml2argvdata/aarch64-gic-default-v3.args aarch64-gic-v3.args +tests/qemuxml2argvdata/aarch64-gic-default-v3.xml aarch64-gic-default.xml +tests/qemuxml2argvdata/aarch64-gic-default.args aarch64-gic-v2.args +tests/qemuxml2argvdata/aarch64-gic-none-both.args aarch64-gic-v3.args +tests/qemuxml2argvdata/aarch64-gic-none-both.xml aarch64-gic-none.xml +tests/qemuxml2argvdata/aarch64-gic-none-v2.args aarch64-gic-v2.args +tests/qemuxml2argvdata/aarch64-gic-none-v2.xml aarch64-gic-none.xml +tests/qemuxml2argvdata/aarch64-gic-none-v3.args aarch64-gic-v3.args +tests/qemuxml2argvdata/aarch64-gic-none-v3.xml aarch64-gic-none-v2.xml +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/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 +tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.xml memory-hotplug-nvdimm-ppc64.xml +tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.xml memory-hotplug-ppc64-nonuma.xml +tests/qemuxml2argvdata/pci-rom-disabled-invalid.args pci-rom-disabled.args +tests/qemuxml2argvdata/ppc64-usb-controller-legacy.xml ppc64-usb-controller.xml +tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.xml ppc64-usb-controller.xml +tests/qemuxml2argvdata/pseries-console-native.args pseries-serial-native.args +tests/qemuxml2argvdata/pseries-features-ccf.xml pseries-features.xml +tests/qemuxml2argvdata/pseries-features-cfpc.xml pseries-features.xml +tests/qemuxml2argvdata/pseries-features-hpt-pagesize.xml pseries-features.xml +tests/qemuxml2argvdata/pseries-features-htm.xml pseries-features.xml +tests/qemuxml2argvdata/pseries-features-ibs.xml pseries-features.xml +tests/qemuxml2argvdata/pseries-features-nested-hv.xml pseries-features.xml +tests/qemuxml2argvdata/pseries-features-sbbc.xml pseries-features.xml +tests/qemuxml2argvdata/pseries-serial+console-native.args pseries-serial-native.args +tests/qemuxml2argvdata/pseries-serial-compat.args pseries-serial-native.args +tests/qemuxml2argvdata/q35-virtio-pci.xml q35-pcie.xml +tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.xml usb-controller-default-q35.xml +tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml usb-controller-explicit-q35.xml +tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml usb-controller-qemu-xhci.xml +tests/qemuxml2argvdata/user-aliases2.args boot-floppy-q35.args +tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml ../qemuxml2argvdata/aarch64-gic-v3.xml +tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml ../qemuxml2argvdata/aarch64-gic-v2.xml +tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml ../qemuxml2argvdata/aarch64-gic-v3.xml +tests/qemuxml2xmloutdata/aarch64-gic-default.xml ../qemuxml2argvdata/aarch64-gic-v2.xml +tests/qemuxml2xmloutdata/aarch64-gic-host.xml ../qemuxml2argvdata/aarch64-gic-host.xml +tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml ../qemuxml2argvdata/aarch64-gic-v3.xml +tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml ../qemuxml2argvdata/aarch64-gic-v2.xml +tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml ../qemuxml2argvdata/aarch64-gic-v3.xml +tests/qemuxml2xmloutdata/aarch64-gic-none.xml ../qemuxml2argvdata/aarch64-gic-v2.xml +tests/qemuxml2xmloutdata/aarch64-gic-v2.xml ../qemuxml2argvdata/aarch64-gic-v2.xml +tests/qemuxml2xmloutdata/aarch64-gic-v3.xml ../qemuxml2argvdata/aarch64-gic-v3.xml +tests/qemuxml2xmloutdata/audio-alsa-best.xml ../qemuxml2argvdata/audio-alsa-best.xml +tests/qemuxml2xmloutdata/audio-alsa-full.xml ../qemuxml2argvdata/audio-alsa-full.xml +tests/qemuxml2xmloutdata/audio-alsa-minimal.xml ../qemuxml2argvdata/audio-alsa-minimal.xml +tests/qemuxml2xmloutdata/audio-coreaudio-best.xml ../qemuxml2argvdata/audio-coreaudio-best.xml +tests/qemuxml2xmloutdata/audio-coreaudio-full.xml ../qemuxml2argvdata/audio-coreaudio-full.xml +tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml ../qemuxml2argvdata/audio-coreaudio-minimal.xml +tests/qemuxml2xmloutdata/audio-file-best.xml ../qemuxml2argvdata/audio-file-best.xml +tests/qemuxml2xmloutdata/audio-file-full.xml ../qemuxml2argvdata/audio-file-full.xml +tests/qemuxml2xmloutdata/audio-file-minimal.xml ../qemuxml2argvdata/audio-file-minimal.xml +tests/qemuxml2xmloutdata/audio-jack-full.xml ../qemuxml2argvdata/audio-jack-full.xml +tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml ../qemuxml2argvdata/audio-many-backends.xml +tests/qemuxml2xmloutdata/audio-none-best.xml ../qemuxml2argvdata/audio-none-best.xml +tests/qemuxml2xmloutdata/audio-none-full.xml ../qemuxml2argvdata/audio-none-full.xml +tests/qemuxml2xmloutdata/audio-none-minimal.xml ../qemuxml2argvdata/audio-none-minimal.xml +tests/qemuxml2xmloutdata/audio-oss-best.xml ../qemuxml2argvdata/audio-oss-best.xml +tests/qemuxml2xmloutdata/audio-oss-full.xml ../qemuxml2argvdata/audio-oss-full.xml +tests/qemuxml2xmloutdata/audio-oss-minimal.xml ../qemuxml2argvdata/audio-oss-minimal.xml +tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml ../qemuxml2argvdata/audio-pulseaudio-best.xml +tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml ../qemuxml2argvdata/audio-pulseaudio-full.xml +tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml ../qemuxml2argvdata/audio-pulseaudio-minimal.xml +tests/qemuxml2xmloutdata/audio-sdl-best.xml ../qemuxml2argvdata/audio-sdl-best.xml +tests/qemuxml2xmloutdata/audio-sdl-full.xml ../qemuxml2argvdata/audio-sdl-full.xml +tests/qemuxml2xmloutdata/audio-sdl-minimal.xml ../qemuxml2argvdata/audio-sdl-minimal.xml +tests/qemuxml2xmloutdata/audio-spice-best.xml ../qemuxml2argvdata/audio-spice-best.xml +tests/qemuxml2xmloutdata/audio-spice-full.xml ../qemuxml2argvdata/audio-spice-full.xml +tests/qemuxml2xmloutdata/audio-spice-minimal.xml ../qemuxml2argvdata/audio-spice-minimal.xml +tests/qemuxml2xmloutdata/blkdeviotune-group-num.x86_64-latest.xml ../qemuxml2argvdata/blkdeviotune-group-num.xml +tests/qemuxml2xmloutdata/blkdeviotune-max-length.x86_64-latest.xml ../qemuxml2argvdata/blkdeviotune-max-length.xml +tests/qemuxml2xmloutdata/blkdeviotune-max.x86_64-latest.xml ../qemuxml2argvdata/blkdeviotune-max.xml +tests/qemuxml2xmloutdata/boot-floppy-q35.xml ../qemuxml2argvdata/boot-floppy-q35.xml +tests/qemuxml2xmloutdata/clock-realtime.xml ../qemuxml2argvdata/clock-realtime.xml +tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml ../qemuxml2argvdata/clock-timer-armvtimer.xml +tests/qemuxml2xmloutdata/disk-detect-zeroes.x86_64-latest.xml ../qemuxml2argvdata/disk-detect-zeroes.xml +tests/qemuxml2xmloutdata/disk-nvme.xml ../qemuxml2argvdata/disk-nvme.xml +tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml ../qemuxml2argvdata/disk-virtio-queues.xml +tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml ../qemuxml2argvdata/disk-virtio-scsi-reservations.xml +tests/qemuxml2xmloutdata/downscript.xml ../qemuxml2argvdata/downscript.xml +tests/qemuxml2xmloutdata/encrypted-disk-usage.xml ../qemuxml2argvdata/encrypted-disk-usage.xml +tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml ../qemuxml2argvdata/fd-memory-no-numa-topology.xml +tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml ../qemuxml2argvdata/fd-memory-numa-topology.xml +tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml ../qemuxml2argvdata/fd-memory-numa-topology2.xml +tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml ../qemuxml2argvdata/fd-memory-numa-topology3.xml +tests/qemuxml2xmloutdata/fd-memory-numa-topology4.x86_64-latest.xml ../qemuxml2argvdata/fd-memory-numa-topology4.xml +tests/qemuxml2xmloutdata/hugepages-default-2M.xml ../qemuxml2argvdata/hugepages-default-2M.xml +tests/qemuxml2xmloutdata/hugepages-default-system-size.xml ../qemuxml2argvdata/hugepages-default-system-size.xml +tests/qemuxml2xmloutdata/hugepages-memaccess.xml ../qemuxml2argvdata/hugepages-memaccess.xml +tests/qemuxml2xmloutdata/hugepages-memaccess2.xml ../qemuxml2argvdata/hugepages-memaccess2.xml +tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml ../qemuxml2argvdata/hugepages-numa-default-dimm.xml +tests/qemuxml2xmloutdata/hugepages-nvdimm.xml ../qemuxml2argvdata/hugepages-nvdimm.xml +tests/qemuxml2xmloutdata/input-linux.x86_64-latest.xml ../qemuxml2argvdata/input-linux.xml +tests/qemuxml2xmloutdata/intel-iommu-aw-bits.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu-aw-bits.xml +tests/qemuxml2xmloutdata/intel-iommu-caching-mode.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu-caching-mode.xml +tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu-device-iotlb.xml +tests/qemuxml2xmloutdata/intel-iommu-eim.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu-eim.xml +tests/qemuxml2xmloutdata/intel-iommu.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu.xml +tests/qemuxml2xmloutdata/kvm-features-off.xml ../qemuxml2argvdata/kvm-features-off.xml +tests/qemuxml2xmloutdata/kvm-features.xml ../qemuxml2argvdata/kvm-features.xml +tests/qemuxml2xmloutdata/luks-disks.x86_64-latest.xml ../qemuxml2argvdata/luks-disks.xml +tests/qemuxml2xmloutdata/mach-virt-console-native.xml mach-virt-serial-compat.xml +tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml mach-virt-serial-compat.xml +tests/qemuxml2xmloutdata/mach-virt-serial-native.xml mach-virt-serial-compat.xml +tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.x86_64-latest.xml ../qemuxml2argvdata/memfd-memory-default-hugepage.xml +tests/qemuxml2xmloutdata/memfd-memory-numa.x86_64-latest.xml ../qemuxml2argvdata/memfd-memory-numa.xml +tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml ../qemuxml2argvdata/memory-hotplug-nvdimm-access.xml +tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml ../qemuxml2argvdata/memory-hotplug-nvdimm-align.xml +tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml ../qemuxml2argvdata/memory-hotplug-nvdimm-label.xml +tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml ../qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml +tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.xml ../qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml +tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml ../qemuxml2argvdata/memory-hotplug-nvdimm.xml +tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml ../qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml +tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml ../qemuxml2argvdata/memory-hotplug-virtio-mem.xml +tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-latest.xml ../qemuxml2argvdata/memory-hotplug-virtio-pmem.xml +tests/qemuxml2xmloutdata/net-user-addr.xml ../qemuxml2argvdata/net-user-addr.xml +tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.xml ../qemuxml2argvdata/net-virtio-teaming-hostdev.xml +tests/qemuxml2xmloutdata/numatune-hmat.xml ../qemuxml2argvdata/numatune-hmat.xml +tests/qemuxml2xmloutdata/numatune-memnode-restrictive-mode.x86_64-latest.xml ../qemuxml2argvdata/numatune-memnode-restrictive-mode.xml +tests/qemuxml2xmloutdata/numatune-no-vcpu.xml ../qemuxml2argvdata/numatune-no-vcpu.xml +tests/qemuxml2xmloutdata/os-firmware-efi-no-enrolled-keys.x86_64-latest.xml ../qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml +tests/qemuxml2xmloutdata/pages-dimm-discard.xml ../qemuxml2argvdata/pages-dimm-discard.xml +tests/qemuxml2xmloutdata/pages-discard-hugepages.xml ../qemuxml2argvdata/pages-discard-hugepages.xml +tests/qemuxml2xmloutdata/pages-discard.xml ../qemuxml2argvdata/pages-discard.xml +tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml ../qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml +tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml ../qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml +tests/qemuxml2xmloutdata/pseries-console-native.xml pseries-serial-native.xml +tests/qemuxml2xmloutdata/pseries-serial+console-native.xml pseries-serial-native.xml +tests/qemuxml2xmloutdata/pseries-serial-compat.xml pseries-serial-native.xml +tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.xml ../qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml +tests/qemuxml2xmloutdata/smbios-type-fwcfg.xml ../qemuxml2argvdata/smbios-type-fwcfg.xml +tests/qemuxml2xmloutdata/tpm-emulator-spapr.ppc64-latest.xml ../qemuxml2argvdata/tpm-emulator-spapr.xml +tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml ../qemuxml2argvdata/tpm-emulator-tpm2-enc.xml +tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml ../qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml +tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml ../qemuxml2argvdata/tpm-emulator-tpm2.xml +tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml ../qemuxml2argvdata/tpm-emulator.xml +tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml ../qemuxml2argvdata/tpm-passthrough-crb.xml +tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml ../qemuxml2argvdata/tpm-passthrough.xml +tests/qemuxml2xmloutdata/user-aliases.xml ../qemuxml2argvdata/user-aliases.xml +tests/qemuxml2xmloutdata/vcpu-placement-static.xml ../qemuxml2argvdata/vcpu-placement-static.xml +tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml ../qemuxml2argvdata/vhost-user-fs-fd-memory.xml +tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml ../qemuxml2argvdata/vhost-user-fs-hugepages.xml +tests/qemuxml2xmloutdata/vhost-user-fs-sock.x86_64-latest.xml ../qemuxml2argvdata/vhost-user-fs-sock.xml +tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml ../qemuxml2argvdata/vhost-vsock-ccw-iommu.xml +tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml ../qemuxml2argvdata/vhost-vsock-ccw.xml +tests/qemuxml2xmloutdata/vhost-vsock.x86_64-latest.xml ../qemuxml2argvdata/vhost-vsock.xml +tests/qemuxml2xmloutdata/video-qxl-resolution.xml ../qemuxml2argvdata/video-qxl-resolution.xml +tests/qemuxml2xmloutdata/video-virtio-vga-gpu-gl.x86_64-latest.xml ../qemuxml2argvdata/video-virtio-vga-gpu-gl.xml +tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml ../qemuxml2argvdata/virtio-options.xml +tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-features.x86_64-latest.xml ../qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml +tests/vircaps2xmldata/linux-basic-dies/system/cpu ../../../virhostcpudata/linux-with-die/cpu +tests/vircaps2xmldata/linux-basic-dies/system/node ../../../virhostcpudata/linux-with-die/node +tests/vircaps2xmldata/linux-basic/system/node/node0/cpu0 ../../cpu/cpu0 +tests/vircaps2xmldata/linux-basic/system/node/node0/cpu1 ../../cpu/cpu1 +tests/vircaps2xmldata/linux-basic/system/node/node0/cpu2 ../../cpu/cpu2 +tests/vircaps2xmldata/linux-basic/system/node/node0/cpu3 ../../cpu/cpu3 +tests/vircaps2xmldata/linux-basic/system/node/node1/cpu4 ../../cpu/cpu4 +tests/vircaps2xmldata/linux-basic/system/node/node1/cpu5 ../../cpu/cpu5 +tests/vircaps2xmldata/linux-basic/system/node/node1/cpu6 ../../cpu/cpu6 +tests/vircaps2xmldata/linux-basic/system/node/node1/cpu7 ../../cpu/cpu7 +tests/vircaps2xmldata/linux-basic/system/node/node2/cpu10 ../../cpu/cpu10 +tests/vircaps2xmldata/linux-basic/system/node/node2/cpu11 ../../cpu/cpu11 +tests/vircaps2xmldata/linux-basic/system/node/node2/cpu8 ../../cpu/cpu8 +tests/vircaps2xmldata/linux-basic/system/node/node2/cpu9 ../../cpu/cpu9 +tests/vircaps2xmldata/linux-basic/system/node/node3/cpu12 ../../cpu/cpu12 +tests/vircaps2xmldata/linux-basic/system/node/node3/cpu13 ../../cpu/cpu13 +tests/vircaps2xmldata/linux-basic/system/node/node3/cpu14 ../../cpu/cpu14 +tests/vircaps2xmldata/linux-basic/system/node/node3/cpu15 ../../cpu/cpu15 +tests/vircaps2xmldata/linux-caches/system/node/node0/cpu0 ../../cpu/cpu0 +tests/vircaps2xmldata/linux-caches/system/node/node0/cpu1 ../../cpu/cpu1 +tests/vircaps2xmldata/linux-caches/system/node/node0/cpu2 ../../cpu/cpu2 +tests/vircaps2xmldata/linux-caches/system/node/node0/cpu3 ../../cpu/cpu3 +tests/vircaps2xmldata/linux-caches/system/node/node0/cpu4 ../../cpu/cpu4 +tests/vircaps2xmldata/linux-caches/system/node/node0/cpu5 ../../cpu/cpu5 +tests/vircaps2xmldata/linux-caches/system/node/node0/cpu6 ../../cpu/cpu6 +tests/vircaps2xmldata/linux-caches/system/node/node0/cpu7 ../../cpu/cpu7 +tests/vircaps2xmldata/linux-hmat/system/node/node0/access1/targets/node1 ../../../node1 +tests/vircaps2xmldata/linux-resctrl-cdp/system ../linux-resctrl/system/ +tests/vircaps2xmldata/linux-resctrl-cmt/system ../linux-resctrl/system +tests/vircaps2xmldata/linux-resctrl-fake-feature/system ../linux-resctrl/system +tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpu0 ../../cpu/cpu0 +tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpu0 ../../cpu/cpu0 +tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu0 ../../cpu/cpu0 +tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu1 ../../cpu/cpu1 +tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu2 ../../cpu/cpu2 +tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu3 ../../cpu/cpu3 +tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu4 ../../cpu/cpu4 +tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu5 ../../cpu/cpu5 +tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu10 ../../cpu/cpu10 +tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu11 ../../cpu/cpu11 +tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu6 ../../cpu/cpu6 +tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu7 ../../cpu/cpu7 +tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu8 ../../cpu/cpu8 +tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu9 ../../cpu/cpu9 +tests/virfilecachedata/9ca150bf3119b75dcac8e8bae4bc3a28e75bc3e262757001e8b953580f5e75ef.cache 5f3154560c130108b282a2aa15b1658aa16923e46497dd8deeb6be287ddb0ca0.cache +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu10 ../../cpu/cpu10 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu100 ../../cpu/cpu100 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu101 ../../cpu/cpu101 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu102 ../../cpu/cpu102 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu103 ../../cpu/cpu103 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu11 ../../cpu/cpu11 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu12 ../../cpu/cpu12 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu13 ../../cpu/cpu13 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu14 ../../cpu/cpu14 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu144 ../../cpu/cpu144 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu145 ../../cpu/cpu145 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu146 ../../cpu/cpu146 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu147 ../../cpu/cpu147 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu148 ../../cpu/cpu148 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu149 ../../cpu/cpu149 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu15 ../../cpu/cpu15 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu150 ../../cpu/cpu150 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu151 ../../cpu/cpu151 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu152 ../../cpu/cpu152 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu153 ../../cpu/cpu153 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu154 ../../cpu/cpu154 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu155 ../../cpu/cpu155 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu156 ../../cpu/cpu156 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu157 ../../cpu/cpu157 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu158 ../../cpu/cpu158 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu159 ../../cpu/cpu159 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu16 ../../cpu/cpu16 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu17 ../../cpu/cpu17 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu18 ../../cpu/cpu18 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu19 ../../cpu/cpu19 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu20 ../../cpu/cpu20 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu21 ../../cpu/cpu21 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu22 ../../cpu/cpu22 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu23 ../../cpu/cpu23 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu24 ../../cpu/cpu24 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu25 ../../cpu/cpu25 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu26 ../../cpu/cpu26 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu27 ../../cpu/cpu27 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu28 ../../cpu/cpu28 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu29 ../../cpu/cpu29 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu30 ../../cpu/cpu30 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu31 ../../cpu/cpu31 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu32 ../../cpu/cpu32 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu33 ../../cpu/cpu33 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu34 ../../cpu/cpu34 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu35 ../../cpu/cpu35 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu36 ../../cpu/cpu36 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu37 ../../cpu/cpu37 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu38 ../../cpu/cpu38 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu39 ../../cpu/cpu39 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu56 ../../cpu/cpu56 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu57 ../../cpu/cpu57 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu58 ../../cpu/cpu58 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu59 ../../cpu/cpu59 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu60 ../../cpu/cpu60 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu61 ../../cpu/cpu61 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu62 ../../cpu/cpu62 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu63 ../../cpu/cpu63 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu64 ../../cpu/cpu64 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu65 ../../cpu/cpu65 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu66 ../../cpu/cpu66 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu67 ../../cpu/cpu67 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu68 ../../cpu/cpu68 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu69 ../../cpu/cpu69 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu70 ../../cpu/cpu70 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu71 ../../cpu/cpu71 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu8 ../../cpu/cpu8 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu80 ../../cpu/cpu80 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu81 ../../cpu/cpu81 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu82 ../../cpu/cpu82 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu83 ../../cpu/cpu83 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu84 ../../cpu/cpu84 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu85 ../../cpu/cpu85 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu86 ../../cpu/cpu86 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu87 ../../cpu/cpu87 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu88 ../../cpu/cpu88 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu89 ../../cpu/cpu89 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu9 ../../cpu/cpu9 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu90 ../../cpu/cpu90 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu91 ../../cpu/cpu91 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu92 ../../cpu/cpu92 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu93 ../../cpu/cpu93 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu94 ../../cpu/cpu94 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu95 ../../cpu/cpu95 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu96 ../../cpu/cpu96 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu97 ../../cpu/cpu97 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu98 ../../cpu/cpu98 +tests/virhostcpudata/linux-deconf-cpus/node/node0/cpu99 ../../cpu/cpu99 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu40 ../../cpu/cpu40 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu41 ../../cpu/cpu41 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu42 ../../cpu/cpu42 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu43 ../../cpu/cpu43 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu44 ../../cpu/cpu44 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu45 ../../cpu/cpu45 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu46 ../../cpu/cpu46 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu47 ../../cpu/cpu47 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu48 ../../cpu/cpu48 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu49 ../../cpu/cpu49 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu50 ../../cpu/cpu50 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu51 ../../cpu/cpu51 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu52 ../../cpu/cpu52 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu53 ../../cpu/cpu53 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu54 ../../cpu/cpu54 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu55 ../../cpu/cpu55 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu72 ../../cpu/cpu72 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu73 ../../cpu/cpu73 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu74 ../../cpu/cpu74 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu75 ../../cpu/cpu75 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu76 ../../cpu/cpu76 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu77 ../../cpu/cpu77 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu78 ../../cpu/cpu78 +tests/virhostcpudata/linux-deconf-cpus/node/node1/cpu79 ../../cpu/cpu79 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu104 ../../cpu/cpu104 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu105 ../../cpu/cpu105 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu106 ../../cpu/cpu106 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu107 ../../cpu/cpu107 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu108 ../../cpu/cpu108 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu109 ../../cpu/cpu109 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu110 ../../cpu/cpu110 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu111 ../../cpu/cpu111 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu112 ../../cpu/cpu112 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu113 ../../cpu/cpu113 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu114 ../../cpu/cpu114 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu115 ../../cpu/cpu115 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu116 ../../cpu/cpu116 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu117 ../../cpu/cpu117 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu118 ../../cpu/cpu118 +tests/virhostcpudata/linux-deconf-cpus/node/node16/cpu119 ../../cpu/cpu119 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu120 ../../cpu/cpu120 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu121 ../../cpu/cpu121 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu122 ../../cpu/cpu122 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu123 ../../cpu/cpu123 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu124 ../../cpu/cpu124 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu125 ../../cpu/cpu125 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu126 ../../cpu/cpu126 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu127 ../../cpu/cpu127 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu128 ../../cpu/cpu128 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu129 ../../cpu/cpu129 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu130 ../../cpu/cpu130 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu131 ../../cpu/cpu131 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu132 ../../cpu/cpu132 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu133 ../../cpu/cpu133 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu134 ../../cpu/cpu134 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu135 ../../cpu/cpu135 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu136 ../../cpu/cpu136 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu137 ../../cpu/cpu137 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu138 ../../cpu/cpu138 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu139 ../../cpu/cpu139 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu140 ../../cpu/cpu140 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu141 ../../cpu/cpu141 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu142 ../../cpu/cpu142 +tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu143 ../../cpu/cpu143 +tests/virhostcpudata/linux-high-ids/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-high-ids/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-high-ids/node/node0/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-high-ids/node/node0/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-high-ids/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-high-ids/node/node0/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-high-ids/node/node0/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-high-ids/node/node0/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-high-ids/node/node1/cpu10 ../../cpu/cpu10 +tests/virhostcpudata/linux-high-ids/node/node1/cpu11 ../../cpu/cpu11 +tests/virhostcpudata/linux-high-ids/node/node1/cpu12 ../../cpu/cpu12 +tests/virhostcpudata/linux-high-ids/node/node1/cpu13 ../../cpu/cpu13 +tests/virhostcpudata/linux-high-ids/node/node1/cpu14 ../../cpu/cpu14 +tests/virhostcpudata/linux-high-ids/node/node1/cpu15 ../../cpu/cpu15 +tests/virhostcpudata/linux-high-ids/node/node1/cpu8 ../../cpu/cpu8 +tests/virhostcpudata/linux-high-ids/node/node1/cpu9 ../../cpu/cpu9 +tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-subcores1/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-subcores1/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-subcores1/node/node0/cpu10 ../../cpu/cpu10 +tests/virhostcpudata/linux-subcores1/node/node0/cpu11 ../../cpu/cpu11 +tests/virhostcpudata/linux-subcores1/node/node0/cpu12 ../../cpu/cpu12 +tests/virhostcpudata/linux-subcores1/node/node0/cpu13 ../../cpu/cpu13 +tests/virhostcpudata/linux-subcores1/node/node0/cpu14 ../../cpu/cpu14 +tests/virhostcpudata/linux-subcores1/node/node0/cpu15 ../../cpu/cpu15 +tests/virhostcpudata/linux-subcores1/node/node0/cpu16 ../../cpu/cpu16 +tests/virhostcpudata/linux-subcores1/node/node0/cpu17 ../../cpu/cpu17 +tests/virhostcpudata/linux-subcores1/node/node0/cpu18 ../../cpu/cpu18 +tests/virhostcpudata/linux-subcores1/node/node0/cpu19 ../../cpu/cpu19 +tests/virhostcpudata/linux-subcores1/node/node0/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-subcores1/node/node0/cpu20 ../../cpu/cpu20 +tests/virhostcpudata/linux-subcores1/node/node0/cpu21 ../../cpu/cpu21 +tests/virhostcpudata/linux-subcores1/node/node0/cpu22 ../../cpu/cpu22 +tests/virhostcpudata/linux-subcores1/node/node0/cpu23 ../../cpu/cpu23 +tests/virhostcpudata/linux-subcores1/node/node0/cpu24 ../../cpu/cpu24 +tests/virhostcpudata/linux-subcores1/node/node0/cpu25 ../../cpu/cpu25 +tests/virhostcpudata/linux-subcores1/node/node0/cpu26 ../../cpu/cpu26 +tests/virhostcpudata/linux-subcores1/node/node0/cpu27 ../../cpu/cpu27 +tests/virhostcpudata/linux-subcores1/node/node0/cpu28 ../../cpu/cpu28 +tests/virhostcpudata/linux-subcores1/node/node0/cpu29 ../../cpu/cpu29 +tests/virhostcpudata/linux-subcores1/node/node0/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-subcores1/node/node0/cpu30 ../../cpu/cpu30 +tests/virhostcpudata/linux-subcores1/node/node0/cpu31 ../../cpu/cpu31 +tests/virhostcpudata/linux-subcores1/node/node0/cpu32 ../../cpu/cpu32 +tests/virhostcpudata/linux-subcores1/node/node0/cpu33 ../../cpu/cpu33 +tests/virhostcpudata/linux-subcores1/node/node0/cpu34 ../../cpu/cpu34 +tests/virhostcpudata/linux-subcores1/node/node0/cpu35 ../../cpu/cpu35 +tests/virhostcpudata/linux-subcores1/node/node0/cpu36 ../../cpu/cpu36 +tests/virhostcpudata/linux-subcores1/node/node0/cpu37 ../../cpu/cpu37 +tests/virhostcpudata/linux-subcores1/node/node0/cpu38 ../../cpu/cpu38 +tests/virhostcpudata/linux-subcores1/node/node0/cpu39 ../../cpu/cpu39 +tests/virhostcpudata/linux-subcores1/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-subcores1/node/node0/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-subcores1/node/node0/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-subcores1/node/node0/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-subcores1/node/node0/cpu8 ../../cpu/cpu8 +tests/virhostcpudata/linux-subcores1/node/node0/cpu9 ../../cpu/cpu9 +tests/virhostcpudata/linux-subcores1/node/node1/cpu40 ../../cpu/cpu40 +tests/virhostcpudata/linux-subcores1/node/node1/cpu41 ../../cpu/cpu41 +tests/virhostcpudata/linux-subcores1/node/node1/cpu42 ../../cpu/cpu42 +tests/virhostcpudata/linux-subcores1/node/node1/cpu43 ../../cpu/cpu43 +tests/virhostcpudata/linux-subcores1/node/node1/cpu44 ../../cpu/cpu44 +tests/virhostcpudata/linux-subcores1/node/node1/cpu45 ../../cpu/cpu45 +tests/virhostcpudata/linux-subcores1/node/node1/cpu46 ../../cpu/cpu46 +tests/virhostcpudata/linux-subcores1/node/node1/cpu47 ../../cpu/cpu47 +tests/virhostcpudata/linux-subcores1/node/node1/cpu48 ../../cpu/cpu48 +tests/virhostcpudata/linux-subcores1/node/node1/cpu49 ../../cpu/cpu49 +tests/virhostcpudata/linux-subcores1/node/node1/cpu50 ../../cpu/cpu50 +tests/virhostcpudata/linux-subcores1/node/node1/cpu51 ../../cpu/cpu51 +tests/virhostcpudata/linux-subcores1/node/node1/cpu52 ../../cpu/cpu52 +tests/virhostcpudata/linux-subcores1/node/node1/cpu53 ../../cpu/cpu53 +tests/virhostcpudata/linux-subcores1/node/node1/cpu54 ../../cpu/cpu54 +tests/virhostcpudata/linux-subcores1/node/node1/cpu55 ../../cpu/cpu55 +tests/virhostcpudata/linux-subcores1/node/node1/cpu56 ../../cpu/cpu56 +tests/virhostcpudata/linux-subcores1/node/node1/cpu57 ../../cpu/cpu57 +tests/virhostcpudata/linux-subcores1/node/node1/cpu58 ../../cpu/cpu58 +tests/virhostcpudata/linux-subcores1/node/node1/cpu59 ../../cpu/cpu59 +tests/virhostcpudata/linux-subcores1/node/node1/cpu60 ../../cpu/cpu60 +tests/virhostcpudata/linux-subcores1/node/node1/cpu61 ../../cpu/cpu61 +tests/virhostcpudata/linux-subcores1/node/node1/cpu62 ../../cpu/cpu62 +tests/virhostcpudata/linux-subcores1/node/node1/cpu63 ../../cpu/cpu63 +tests/virhostcpudata/linux-subcores1/node/node1/cpu64 ../../cpu/cpu64 +tests/virhostcpudata/linux-subcores1/node/node1/cpu65 ../../cpu/cpu65 +tests/virhostcpudata/linux-subcores1/node/node1/cpu66 ../../cpu/cpu66 +tests/virhostcpudata/linux-subcores1/node/node1/cpu67 ../../cpu/cpu67 +tests/virhostcpudata/linux-subcores1/node/node1/cpu68 ../../cpu/cpu68 +tests/virhostcpudata/linux-subcores1/node/node1/cpu69 ../../cpu/cpu69 +tests/virhostcpudata/linux-subcores1/node/node1/cpu70 ../../cpu/cpu70 +tests/virhostcpudata/linux-subcores1/node/node1/cpu71 ../../cpu/cpu71 +tests/virhostcpudata/linux-subcores1/node/node1/cpu72 ../../cpu/cpu72 +tests/virhostcpudata/linux-subcores1/node/node1/cpu73 ../../cpu/cpu73 +tests/virhostcpudata/linux-subcores1/node/node1/cpu74 ../../cpu/cpu74 +tests/virhostcpudata/linux-subcores1/node/node1/cpu75 ../../cpu/cpu75 +tests/virhostcpudata/linux-subcores1/node/node1/cpu76 ../../cpu/cpu76 +tests/virhostcpudata/linux-subcores1/node/node1/cpu77 ../../cpu/cpu77 +tests/virhostcpudata/linux-subcores1/node/node1/cpu78 ../../cpu/cpu78 +tests/virhostcpudata/linux-subcores1/node/node1/cpu79 ../../cpu/cpu79 +tests/virhostcpudata/linux-subcores1/node/node16/cpu100 ../../cpu/cpu100 +tests/virhostcpudata/linux-subcores1/node/node16/cpu101 ../../cpu/cpu101 +tests/virhostcpudata/linux-subcores1/node/node16/cpu102 ../../cpu/cpu102 +tests/virhostcpudata/linux-subcores1/node/node16/cpu103 ../../cpu/cpu103 +tests/virhostcpudata/linux-subcores1/node/node16/cpu104 ../../cpu/cpu104 +tests/virhostcpudata/linux-subcores1/node/node16/cpu105 ../../cpu/cpu105 +tests/virhostcpudata/linux-subcores1/node/node16/cpu106 ../../cpu/cpu106 +tests/virhostcpudata/linux-subcores1/node/node16/cpu107 ../../cpu/cpu107 +tests/virhostcpudata/linux-subcores1/node/node16/cpu108 ../../cpu/cpu108 +tests/virhostcpudata/linux-subcores1/node/node16/cpu109 ../../cpu/cpu109 +tests/virhostcpudata/linux-subcores1/node/node16/cpu110 ../../cpu/cpu110 +tests/virhostcpudata/linux-subcores1/node/node16/cpu111 ../../cpu/cpu111 +tests/virhostcpudata/linux-subcores1/node/node16/cpu112 ../../cpu/cpu112 +tests/virhostcpudata/linux-subcores1/node/node16/cpu113 ../../cpu/cpu113 +tests/virhostcpudata/linux-subcores1/node/node16/cpu114 ../../cpu/cpu114 +tests/virhostcpudata/linux-subcores1/node/node16/cpu115 ../../cpu/cpu115 +tests/virhostcpudata/linux-subcores1/node/node16/cpu116 ../../cpu/cpu116 +tests/virhostcpudata/linux-subcores1/node/node16/cpu117 ../../cpu/cpu117 +tests/virhostcpudata/linux-subcores1/node/node16/cpu118 ../../cpu/cpu118 +tests/virhostcpudata/linux-subcores1/node/node16/cpu119 ../../cpu/cpu119 +tests/virhostcpudata/linux-subcores1/node/node16/cpu80 ../../cpu/cpu80 +tests/virhostcpudata/linux-subcores1/node/node16/cpu81 ../../cpu/cpu81 +tests/virhostcpudata/linux-subcores1/node/node16/cpu82 ../../cpu/cpu82 +tests/virhostcpudata/linux-subcores1/node/node16/cpu83 ../../cpu/cpu83 +tests/virhostcpudata/linux-subcores1/node/node16/cpu84 ../../cpu/cpu84 +tests/virhostcpudata/linux-subcores1/node/node16/cpu85 ../../cpu/cpu85 +tests/virhostcpudata/linux-subcores1/node/node16/cpu86 ../../cpu/cpu86 +tests/virhostcpudata/linux-subcores1/node/node16/cpu87 ../../cpu/cpu87 +tests/virhostcpudata/linux-subcores1/node/node16/cpu88 ../../cpu/cpu88 +tests/virhostcpudata/linux-subcores1/node/node16/cpu89 ../../cpu/cpu89 +tests/virhostcpudata/linux-subcores1/node/node16/cpu90 ../../cpu/cpu90 +tests/virhostcpudata/linux-subcores1/node/node16/cpu91 ../../cpu/cpu91 +tests/virhostcpudata/linux-subcores1/node/node16/cpu92 ../../cpu/cpu92 +tests/virhostcpudata/linux-subcores1/node/node16/cpu93 ../../cpu/cpu93 +tests/virhostcpudata/linux-subcores1/node/node16/cpu94 ../../cpu/cpu94 +tests/virhostcpudata/linux-subcores1/node/node16/cpu95 ../../cpu/cpu95 +tests/virhostcpudata/linux-subcores1/node/node16/cpu96 ../../cpu/cpu96 +tests/virhostcpudata/linux-subcores1/node/node16/cpu97 ../../cpu/cpu97 +tests/virhostcpudata/linux-subcores1/node/node16/cpu98 ../../cpu/cpu98 +tests/virhostcpudata/linux-subcores1/node/node16/cpu99 ../../cpu/cpu99 +tests/virhostcpudata/linux-subcores1/node/node17/cpu120 ../../cpu/cpu120 +tests/virhostcpudata/linux-subcores1/node/node17/cpu121 ../../cpu/cpu121 +tests/virhostcpudata/linux-subcores1/node/node17/cpu122 ../../cpu/cpu122 +tests/virhostcpudata/linux-subcores1/node/node17/cpu123 ../../cpu/cpu123 +tests/virhostcpudata/linux-subcores1/node/node17/cpu124 ../../cpu/cpu124 +tests/virhostcpudata/linux-subcores1/node/node17/cpu125 ../../cpu/cpu125 +tests/virhostcpudata/linux-subcores1/node/node17/cpu126 ../../cpu/cpu126 +tests/virhostcpudata/linux-subcores1/node/node17/cpu127 ../../cpu/cpu127 +tests/virhostcpudata/linux-subcores1/node/node17/cpu128 ../../cpu/cpu128 +tests/virhostcpudata/linux-subcores1/node/node17/cpu129 ../../cpu/cpu129 +tests/virhostcpudata/linux-subcores1/node/node17/cpu130 ../../cpu/cpu130 +tests/virhostcpudata/linux-subcores1/node/node17/cpu131 ../../cpu/cpu131 +tests/virhostcpudata/linux-subcores1/node/node17/cpu132 ../../cpu/cpu132 +tests/virhostcpudata/linux-subcores1/node/node17/cpu133 ../../cpu/cpu133 +tests/virhostcpudata/linux-subcores1/node/node17/cpu134 ../../cpu/cpu134 +tests/virhostcpudata/linux-subcores1/node/node17/cpu135 ../../cpu/cpu135 +tests/virhostcpudata/linux-subcores1/node/node17/cpu136 ../../cpu/cpu136 +tests/virhostcpudata/linux-subcores1/node/node17/cpu137 ../../cpu/cpu137 +tests/virhostcpudata/linux-subcores1/node/node17/cpu138 ../../cpu/cpu138 +tests/virhostcpudata/linux-subcores1/node/node17/cpu139 ../../cpu/cpu139 +tests/virhostcpudata/linux-subcores1/node/node17/cpu140 ../../cpu/cpu140 +tests/virhostcpudata/linux-subcores1/node/node17/cpu141 ../../cpu/cpu141 +tests/virhostcpudata/linux-subcores1/node/node17/cpu142 ../../cpu/cpu142 +tests/virhostcpudata/linux-subcores1/node/node17/cpu143 ../../cpu/cpu143 +tests/virhostcpudata/linux-subcores1/node/node17/cpu144 ../../cpu/cpu144 +tests/virhostcpudata/linux-subcores1/node/node17/cpu145 ../../cpu/cpu145 +tests/virhostcpudata/linux-subcores1/node/node17/cpu146 ../../cpu/cpu146 +tests/virhostcpudata/linux-subcores1/node/node17/cpu147 ../../cpu/cpu147 +tests/virhostcpudata/linux-subcores1/node/node17/cpu148 ../../cpu/cpu148 +tests/virhostcpudata/linux-subcores1/node/node17/cpu149 ../../cpu/cpu149 +tests/virhostcpudata/linux-subcores1/node/node17/cpu150 ../../cpu/cpu150 +tests/virhostcpudata/linux-subcores1/node/node17/cpu151 ../../cpu/cpu151 +tests/virhostcpudata/linux-subcores1/node/node17/cpu152 ../../cpu/cpu152 +tests/virhostcpudata/linux-subcores1/node/node17/cpu153 ../../cpu/cpu153 +tests/virhostcpudata/linux-subcores1/node/node17/cpu154 ../../cpu/cpu154 +tests/virhostcpudata/linux-subcores1/node/node17/cpu155 ../../cpu/cpu155 +tests/virhostcpudata/linux-subcores1/node/node17/cpu156 ../../cpu/cpu156 +tests/virhostcpudata/linux-subcores1/node/node17/cpu157 ../../cpu/cpu157 +tests/virhostcpudata/linux-subcores1/node/node17/cpu158 ../../cpu/cpu158 +tests/virhostcpudata/linux-subcores1/node/node17/cpu159 ../../cpu/cpu159 +tests/virhostcpudata/linux-subcores2/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-subcores2/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-subcores2/node/node0/cpu10 ../../cpu/cpu10 +tests/virhostcpudata/linux-subcores2/node/node0/cpu11 ../../cpu/cpu11 +tests/virhostcpudata/linux-subcores2/node/node0/cpu12 ../../cpu/cpu12 +tests/virhostcpudata/linux-subcores2/node/node0/cpu13 ../../cpu/cpu13 +tests/virhostcpudata/linux-subcores2/node/node0/cpu14 ../../cpu/cpu14 +tests/virhostcpudata/linux-subcores2/node/node0/cpu15 ../../cpu/cpu15 +tests/virhostcpudata/linux-subcores2/node/node0/cpu16 ../../cpu/cpu16 +tests/virhostcpudata/linux-subcores2/node/node0/cpu17 ../../cpu/cpu17 +tests/virhostcpudata/linux-subcores2/node/node0/cpu18 ../../cpu/cpu18 +tests/virhostcpudata/linux-subcores2/node/node0/cpu19 ../../cpu/cpu19 +tests/virhostcpudata/linux-subcores2/node/node0/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-subcores2/node/node0/cpu20 ../../cpu/cpu20 +tests/virhostcpudata/linux-subcores2/node/node0/cpu21 ../../cpu/cpu21 +tests/virhostcpudata/linux-subcores2/node/node0/cpu22 ../../cpu/cpu22 +tests/virhostcpudata/linux-subcores2/node/node0/cpu23 ../../cpu/cpu23 +tests/virhostcpudata/linux-subcores2/node/node0/cpu24 ../../cpu/cpu24 +tests/virhostcpudata/linux-subcores2/node/node0/cpu25 ../../cpu/cpu25 +tests/virhostcpudata/linux-subcores2/node/node0/cpu26 ../../cpu/cpu26 +tests/virhostcpudata/linux-subcores2/node/node0/cpu27 ../../cpu/cpu27 +tests/virhostcpudata/linux-subcores2/node/node0/cpu28 ../../cpu/cpu28 +tests/virhostcpudata/linux-subcores2/node/node0/cpu29 ../../cpu/cpu29 +tests/virhostcpudata/linux-subcores2/node/node0/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-subcores2/node/node0/cpu30 ../../cpu/cpu30 +tests/virhostcpudata/linux-subcores2/node/node0/cpu31 ../../cpu/cpu31 +tests/virhostcpudata/linux-subcores2/node/node0/cpu32 ../../cpu/cpu32 +tests/virhostcpudata/linux-subcores2/node/node0/cpu33 ../../cpu/cpu33 +tests/virhostcpudata/linux-subcores2/node/node0/cpu34 ../../cpu/cpu34 +tests/virhostcpudata/linux-subcores2/node/node0/cpu35 ../../cpu/cpu35 +tests/virhostcpudata/linux-subcores2/node/node0/cpu36 ../../cpu/cpu36 +tests/virhostcpudata/linux-subcores2/node/node0/cpu37 ../../cpu/cpu37 +tests/virhostcpudata/linux-subcores2/node/node0/cpu38 ../../cpu/cpu38 +tests/virhostcpudata/linux-subcores2/node/node0/cpu39 ../../cpu/cpu39 +tests/virhostcpudata/linux-subcores2/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-subcores2/node/node0/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-subcores2/node/node0/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-subcores2/node/node0/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-subcores2/node/node0/cpu8 ../../cpu/cpu8 +tests/virhostcpudata/linux-subcores2/node/node0/cpu9 ../../cpu/cpu9 +tests/virhostcpudata/linux-subcores2/node/node1/cpu40 ../../cpu/cpu40 +tests/virhostcpudata/linux-subcores2/node/node1/cpu41 ../../cpu/cpu41 +tests/virhostcpudata/linux-subcores2/node/node1/cpu42 ../../cpu/cpu42 +tests/virhostcpudata/linux-subcores2/node/node1/cpu43 ../../cpu/cpu43 +tests/virhostcpudata/linux-subcores2/node/node1/cpu44 ../../cpu/cpu44 +tests/virhostcpudata/linux-subcores2/node/node1/cpu45 ../../cpu/cpu45 +tests/virhostcpudata/linux-subcores2/node/node1/cpu46 ../../cpu/cpu46 +tests/virhostcpudata/linux-subcores2/node/node1/cpu47 ../../cpu/cpu47 +tests/virhostcpudata/linux-subcores2/node/node1/cpu48 ../../cpu/cpu48 +tests/virhostcpudata/linux-subcores2/node/node1/cpu49 ../../cpu/cpu49 +tests/virhostcpudata/linux-subcores2/node/node1/cpu50 ../../cpu/cpu50 +tests/virhostcpudata/linux-subcores2/node/node1/cpu51 ../../cpu/cpu51 +tests/virhostcpudata/linux-subcores2/node/node1/cpu52 ../../cpu/cpu52 +tests/virhostcpudata/linux-subcores2/node/node1/cpu53 ../../cpu/cpu53 +tests/virhostcpudata/linux-subcores2/node/node1/cpu54 ../../cpu/cpu54 +tests/virhostcpudata/linux-subcores2/node/node1/cpu55 ../../cpu/cpu55 +tests/virhostcpudata/linux-subcores2/node/node1/cpu56 ../../cpu/cpu56 +tests/virhostcpudata/linux-subcores2/node/node1/cpu57 ../../cpu/cpu57 +tests/virhostcpudata/linux-subcores2/node/node1/cpu58 ../../cpu/cpu58 +tests/virhostcpudata/linux-subcores2/node/node1/cpu59 ../../cpu/cpu59 +tests/virhostcpudata/linux-subcores2/node/node1/cpu60 ../../cpu/cpu60 +tests/virhostcpudata/linux-subcores2/node/node1/cpu61 ../../cpu/cpu61 +tests/virhostcpudata/linux-subcores2/node/node1/cpu62 ../../cpu/cpu62 +tests/virhostcpudata/linux-subcores2/node/node1/cpu63 ../../cpu/cpu63 +tests/virhostcpudata/linux-subcores2/node/node1/cpu64 ../../cpu/cpu64 +tests/virhostcpudata/linux-subcores2/node/node1/cpu65 ../../cpu/cpu65 +tests/virhostcpudata/linux-subcores2/node/node1/cpu66 ../../cpu/cpu66 +tests/virhostcpudata/linux-subcores2/node/node1/cpu67 ../../cpu/cpu67 +tests/virhostcpudata/linux-subcores2/node/node1/cpu68 ../../cpu/cpu68 +tests/virhostcpudata/linux-subcores2/node/node1/cpu69 ../../cpu/cpu69 +tests/virhostcpudata/linux-subcores2/node/node1/cpu70 ../../cpu/cpu70 +tests/virhostcpudata/linux-subcores2/node/node1/cpu71 ../../cpu/cpu71 +tests/virhostcpudata/linux-subcores2/node/node1/cpu72 ../../cpu/cpu72 +tests/virhostcpudata/linux-subcores2/node/node1/cpu73 ../../cpu/cpu73 +tests/virhostcpudata/linux-subcores2/node/node1/cpu74 ../../cpu/cpu74 +tests/virhostcpudata/linux-subcores2/node/node1/cpu75 ../../cpu/cpu75 +tests/virhostcpudata/linux-subcores2/node/node1/cpu76 ../../cpu/cpu76 +tests/virhostcpudata/linux-subcores2/node/node1/cpu77 ../../cpu/cpu77 +tests/virhostcpudata/linux-subcores2/node/node1/cpu78 ../../cpu/cpu78 +tests/virhostcpudata/linux-subcores2/node/node1/cpu79 ../../cpu/cpu79 +tests/virhostcpudata/linux-subcores2/node/node16/cpu100 ../../cpu/cpu100 +tests/virhostcpudata/linux-subcores2/node/node16/cpu101 ../../cpu/cpu101 +tests/virhostcpudata/linux-subcores2/node/node16/cpu102 ../../cpu/cpu102 +tests/virhostcpudata/linux-subcores2/node/node16/cpu103 ../../cpu/cpu103 +tests/virhostcpudata/linux-subcores2/node/node16/cpu104 ../../cpu/cpu104 +tests/virhostcpudata/linux-subcores2/node/node16/cpu105 ../../cpu/cpu105 +tests/virhostcpudata/linux-subcores2/node/node16/cpu106 ../../cpu/cpu106 +tests/virhostcpudata/linux-subcores2/node/node16/cpu107 ../../cpu/cpu107 +tests/virhostcpudata/linux-subcores2/node/node16/cpu108 ../../cpu/cpu108 +tests/virhostcpudata/linux-subcores2/node/node16/cpu109 ../../cpu/cpu109 +tests/virhostcpudata/linux-subcores2/node/node16/cpu110 ../../cpu/cpu110 +tests/virhostcpudata/linux-subcores2/node/node16/cpu111 ../../cpu/cpu111 +tests/virhostcpudata/linux-subcores2/node/node16/cpu112 ../../cpu/cpu112 +tests/virhostcpudata/linux-subcores2/node/node16/cpu113 ../../cpu/cpu113 +tests/virhostcpudata/linux-subcores2/node/node16/cpu114 ../../cpu/cpu114 +tests/virhostcpudata/linux-subcores2/node/node16/cpu115 ../../cpu/cpu115 +tests/virhostcpudata/linux-subcores2/node/node16/cpu116 ../../cpu/cpu116 +tests/virhostcpudata/linux-subcores2/node/node16/cpu117 ../../cpu/cpu117 +tests/virhostcpudata/linux-subcores2/node/node16/cpu118 ../../cpu/cpu118 +tests/virhostcpudata/linux-subcores2/node/node16/cpu119 ../../cpu/cpu119 +tests/virhostcpudata/linux-subcores2/node/node16/cpu80 ../../cpu/cpu80 +tests/virhostcpudata/linux-subcores2/node/node16/cpu81 ../../cpu/cpu81 +tests/virhostcpudata/linux-subcores2/node/node16/cpu82 ../../cpu/cpu82 +tests/virhostcpudata/linux-subcores2/node/node16/cpu83 ../../cpu/cpu83 +tests/virhostcpudata/linux-subcores2/node/node16/cpu84 ../../cpu/cpu84 +tests/virhostcpudata/linux-subcores2/node/node16/cpu85 ../../cpu/cpu85 +tests/virhostcpudata/linux-subcores2/node/node16/cpu86 ../../cpu/cpu86 +tests/virhostcpudata/linux-subcores2/node/node16/cpu87 ../../cpu/cpu87 +tests/virhostcpudata/linux-subcores2/node/node16/cpu88 ../../cpu/cpu88 +tests/virhostcpudata/linux-subcores2/node/node16/cpu89 ../../cpu/cpu89 +tests/virhostcpudata/linux-subcores2/node/node16/cpu90 ../../cpu/cpu90 +tests/virhostcpudata/linux-subcores2/node/node16/cpu91 ../../cpu/cpu91 +tests/virhostcpudata/linux-subcores2/node/node16/cpu92 ../../cpu/cpu92 +tests/virhostcpudata/linux-subcores2/node/node16/cpu93 ../../cpu/cpu93 +tests/virhostcpudata/linux-subcores2/node/node16/cpu94 ../../cpu/cpu94 +tests/virhostcpudata/linux-subcores2/node/node16/cpu95 ../../cpu/cpu95 +tests/virhostcpudata/linux-subcores2/node/node16/cpu96 ../../cpu/cpu96 +tests/virhostcpudata/linux-subcores2/node/node16/cpu97 ../../cpu/cpu97 +tests/virhostcpudata/linux-subcores2/node/node16/cpu98 ../../cpu/cpu98 +tests/virhostcpudata/linux-subcores2/node/node16/cpu99 ../../cpu/cpu99 +tests/virhostcpudata/linux-subcores2/node/node17/cpu120 ../../cpu/cpu120 +tests/virhostcpudata/linux-subcores2/node/node17/cpu121 ../../cpu/cpu121 +tests/virhostcpudata/linux-subcores2/node/node17/cpu122 ../../cpu/cpu122 +tests/virhostcpudata/linux-subcores2/node/node17/cpu123 ../../cpu/cpu123 +tests/virhostcpudata/linux-subcores2/node/node17/cpu124 ../../cpu/cpu124 +tests/virhostcpudata/linux-subcores2/node/node17/cpu125 ../../cpu/cpu125 +tests/virhostcpudata/linux-subcores2/node/node17/cpu126 ../../cpu/cpu126 +tests/virhostcpudata/linux-subcores2/node/node17/cpu127 ../../cpu/cpu127 +tests/virhostcpudata/linux-subcores2/node/node17/cpu128 ../../cpu/cpu128 +tests/virhostcpudata/linux-subcores2/node/node17/cpu129 ../../cpu/cpu129 +tests/virhostcpudata/linux-subcores2/node/node17/cpu130 ../../cpu/cpu130 +tests/virhostcpudata/linux-subcores2/node/node17/cpu131 ../../cpu/cpu131 +tests/virhostcpudata/linux-subcores2/node/node17/cpu132 ../../cpu/cpu132 +tests/virhostcpudata/linux-subcores2/node/node17/cpu133 ../../cpu/cpu133 +tests/virhostcpudata/linux-subcores2/node/node17/cpu134 ../../cpu/cpu134 +tests/virhostcpudata/linux-subcores2/node/node17/cpu135 ../../cpu/cpu135 +tests/virhostcpudata/linux-subcores2/node/node17/cpu136 ../../cpu/cpu136 +tests/virhostcpudata/linux-subcores2/node/node17/cpu137 ../../cpu/cpu137 +tests/virhostcpudata/linux-subcores2/node/node17/cpu138 ../../cpu/cpu138 +tests/virhostcpudata/linux-subcores2/node/node17/cpu139 ../../cpu/cpu139 +tests/virhostcpudata/linux-subcores2/node/node17/cpu140 ../../cpu/cpu140 +tests/virhostcpudata/linux-subcores2/node/node17/cpu141 ../../cpu/cpu141 +tests/virhostcpudata/linux-subcores2/node/node17/cpu142 ../../cpu/cpu142 +tests/virhostcpudata/linux-subcores2/node/node17/cpu143 ../../cpu/cpu143 +tests/virhostcpudata/linux-subcores2/node/node17/cpu144 ../../cpu/cpu144 +tests/virhostcpudata/linux-subcores2/node/node17/cpu145 ../../cpu/cpu145 +tests/virhostcpudata/linux-subcores2/node/node17/cpu146 ../../cpu/cpu146 +tests/virhostcpudata/linux-subcores2/node/node17/cpu147 ../../cpu/cpu147 +tests/virhostcpudata/linux-subcores2/node/node17/cpu148 ../../cpu/cpu148 +tests/virhostcpudata/linux-subcores2/node/node17/cpu149 ../../cpu/cpu149 +tests/virhostcpudata/linux-subcores2/node/node17/cpu150 ../../cpu/cpu150 +tests/virhostcpudata/linux-subcores2/node/node17/cpu151 ../../cpu/cpu151 +tests/virhostcpudata/linux-subcores2/node/node17/cpu152 ../../cpu/cpu152 +tests/virhostcpudata/linux-subcores2/node/node17/cpu153 ../../cpu/cpu153 +tests/virhostcpudata/linux-subcores2/node/node17/cpu154 ../../cpu/cpu154 +tests/virhostcpudata/linux-subcores2/node/node17/cpu155 ../../cpu/cpu155 +tests/virhostcpudata/linux-subcores2/node/node17/cpu156 ../../cpu/cpu156 +tests/virhostcpudata/linux-subcores2/node/node17/cpu157 ../../cpu/cpu157 +tests/virhostcpudata/linux-subcores2/node/node17/cpu158 ../../cpu/cpu158 +tests/virhostcpudata/linux-subcores2/node/node17/cpu159 ../../cpu/cpu159 +tests/virhostcpudata/linux-subcores3/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-subcores3/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-subcores3/node/node0/cpu10 ../../cpu/cpu10 +tests/virhostcpudata/linux-subcores3/node/node0/cpu11 ../../cpu/cpu11 +tests/virhostcpudata/linux-subcores3/node/node0/cpu12 ../../cpu/cpu12 +tests/virhostcpudata/linux-subcores3/node/node0/cpu13 ../../cpu/cpu13 +tests/virhostcpudata/linux-subcores3/node/node0/cpu14 ../../cpu/cpu14 +tests/virhostcpudata/linux-subcores3/node/node0/cpu15 ../../cpu/cpu15 +tests/virhostcpudata/linux-subcores3/node/node0/cpu16 ../../cpu/cpu16 +tests/virhostcpudata/linux-subcores3/node/node0/cpu17 ../../cpu/cpu17 +tests/virhostcpudata/linux-subcores3/node/node0/cpu18 ../../cpu/cpu18 +tests/virhostcpudata/linux-subcores3/node/node0/cpu19 ../../cpu/cpu19 +tests/virhostcpudata/linux-subcores3/node/node0/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-subcores3/node/node0/cpu20 ../../cpu/cpu20 +tests/virhostcpudata/linux-subcores3/node/node0/cpu21 ../../cpu/cpu21 +tests/virhostcpudata/linux-subcores3/node/node0/cpu22 ../../cpu/cpu22 +tests/virhostcpudata/linux-subcores3/node/node0/cpu23 ../../cpu/cpu23 +tests/virhostcpudata/linux-subcores3/node/node0/cpu24 ../../cpu/cpu24 +tests/virhostcpudata/linux-subcores3/node/node0/cpu25 ../../cpu/cpu25 +tests/virhostcpudata/linux-subcores3/node/node0/cpu26 ../../cpu/cpu26 +tests/virhostcpudata/linux-subcores3/node/node0/cpu27 ../../cpu/cpu27 +tests/virhostcpudata/linux-subcores3/node/node0/cpu28 ../../cpu/cpu28 +tests/virhostcpudata/linux-subcores3/node/node0/cpu29 ../../cpu/cpu29 +tests/virhostcpudata/linux-subcores3/node/node0/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-subcores3/node/node0/cpu30 ../../cpu/cpu30 +tests/virhostcpudata/linux-subcores3/node/node0/cpu31 ../../cpu/cpu31 +tests/virhostcpudata/linux-subcores3/node/node0/cpu32 ../../cpu/cpu32 +tests/virhostcpudata/linux-subcores3/node/node0/cpu33 ../../cpu/cpu33 +tests/virhostcpudata/linux-subcores3/node/node0/cpu34 ../../cpu/cpu34 +tests/virhostcpudata/linux-subcores3/node/node0/cpu35 ../../cpu/cpu35 +tests/virhostcpudata/linux-subcores3/node/node0/cpu36 ../../cpu/cpu36 +tests/virhostcpudata/linux-subcores3/node/node0/cpu37 ../../cpu/cpu37 +tests/virhostcpudata/linux-subcores3/node/node0/cpu38 ../../cpu/cpu38 +tests/virhostcpudata/linux-subcores3/node/node0/cpu39 ../../cpu/cpu39 +tests/virhostcpudata/linux-subcores3/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-subcores3/node/node0/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-subcores3/node/node0/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-subcores3/node/node0/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-subcores3/node/node0/cpu8 ../../cpu/cpu8 +tests/virhostcpudata/linux-subcores3/node/node0/cpu9 ../../cpu/cpu9 +tests/virhostcpudata/linux-subcores3/node/node1/cpu40 ../../cpu/cpu40 +tests/virhostcpudata/linux-subcores3/node/node1/cpu41 ../../cpu/cpu41 +tests/virhostcpudata/linux-subcores3/node/node1/cpu42 ../../cpu/cpu42 +tests/virhostcpudata/linux-subcores3/node/node1/cpu43 ../../cpu/cpu43 +tests/virhostcpudata/linux-subcores3/node/node1/cpu44 ../../cpu/cpu44 +tests/virhostcpudata/linux-subcores3/node/node1/cpu45 ../../cpu/cpu45 +tests/virhostcpudata/linux-subcores3/node/node1/cpu46 ../../cpu/cpu46 +tests/virhostcpudata/linux-subcores3/node/node1/cpu47 ../../cpu/cpu47 +tests/virhostcpudata/linux-subcores3/node/node1/cpu48 ../../cpu/cpu48 +tests/virhostcpudata/linux-subcores3/node/node1/cpu49 ../../cpu/cpu49 +tests/virhostcpudata/linux-subcores3/node/node1/cpu50 ../../cpu/cpu50 +tests/virhostcpudata/linux-subcores3/node/node1/cpu51 ../../cpu/cpu51 +tests/virhostcpudata/linux-subcores3/node/node1/cpu52 ../../cpu/cpu52 +tests/virhostcpudata/linux-subcores3/node/node1/cpu53 ../../cpu/cpu53 +tests/virhostcpudata/linux-subcores3/node/node1/cpu54 ../../cpu/cpu54 +tests/virhostcpudata/linux-subcores3/node/node1/cpu55 ../../cpu/cpu55 +tests/virhostcpudata/linux-subcores3/node/node1/cpu56 ../../cpu/cpu56 +tests/virhostcpudata/linux-subcores3/node/node1/cpu57 ../../cpu/cpu57 +tests/virhostcpudata/linux-subcores3/node/node1/cpu58 ../../cpu/cpu58 +tests/virhostcpudata/linux-subcores3/node/node1/cpu59 ../../cpu/cpu59 +tests/virhostcpudata/linux-subcores3/node/node1/cpu60 ../../cpu/cpu60 +tests/virhostcpudata/linux-subcores3/node/node1/cpu61 ../../cpu/cpu61 +tests/virhostcpudata/linux-subcores3/node/node1/cpu62 ../../cpu/cpu62 +tests/virhostcpudata/linux-subcores3/node/node1/cpu63 ../../cpu/cpu63 +tests/virhostcpudata/linux-subcores3/node/node1/cpu64 ../../cpu/cpu64 +tests/virhostcpudata/linux-subcores3/node/node1/cpu65 ../../cpu/cpu65 +tests/virhostcpudata/linux-subcores3/node/node1/cpu66 ../../cpu/cpu66 +tests/virhostcpudata/linux-subcores3/node/node1/cpu67 ../../cpu/cpu67 +tests/virhostcpudata/linux-subcores3/node/node1/cpu68 ../../cpu/cpu68 +tests/virhostcpudata/linux-subcores3/node/node1/cpu69 ../../cpu/cpu69 +tests/virhostcpudata/linux-subcores3/node/node1/cpu70 ../../cpu/cpu70 +tests/virhostcpudata/linux-subcores3/node/node1/cpu71 ../../cpu/cpu71 +tests/virhostcpudata/linux-subcores3/node/node1/cpu72 ../../cpu/cpu72 +tests/virhostcpudata/linux-subcores3/node/node1/cpu73 ../../cpu/cpu73 +tests/virhostcpudata/linux-subcores3/node/node1/cpu74 ../../cpu/cpu74 +tests/virhostcpudata/linux-subcores3/node/node1/cpu75 ../../cpu/cpu75 +tests/virhostcpudata/linux-subcores3/node/node1/cpu76 ../../cpu/cpu76 +tests/virhostcpudata/linux-subcores3/node/node1/cpu77 ../../cpu/cpu77 +tests/virhostcpudata/linux-subcores3/node/node1/cpu78 ../../cpu/cpu78 +tests/virhostcpudata/linux-subcores3/node/node1/cpu79 ../../cpu/cpu79 +tests/virhostcpudata/linux-subcores3/node/node16/cpu100 ../../cpu/cpu100 +tests/virhostcpudata/linux-subcores3/node/node16/cpu101 ../../cpu/cpu101 +tests/virhostcpudata/linux-subcores3/node/node16/cpu102 ../../cpu/cpu102 +tests/virhostcpudata/linux-subcores3/node/node16/cpu103 ../../cpu/cpu103 +tests/virhostcpudata/linux-subcores3/node/node16/cpu104 ../../cpu/cpu104 +tests/virhostcpudata/linux-subcores3/node/node16/cpu105 ../../cpu/cpu105 +tests/virhostcpudata/linux-subcores3/node/node16/cpu106 ../../cpu/cpu106 +tests/virhostcpudata/linux-subcores3/node/node16/cpu107 ../../cpu/cpu107 +tests/virhostcpudata/linux-subcores3/node/node16/cpu108 ../../cpu/cpu108 +tests/virhostcpudata/linux-subcores3/node/node16/cpu109 ../../cpu/cpu109 +tests/virhostcpudata/linux-subcores3/node/node16/cpu110 ../../cpu/cpu110 +tests/virhostcpudata/linux-subcores3/node/node16/cpu111 ../../cpu/cpu111 +tests/virhostcpudata/linux-subcores3/node/node16/cpu112 ../../cpu/cpu112 +tests/virhostcpudata/linux-subcores3/node/node16/cpu113 ../../cpu/cpu113 +tests/virhostcpudata/linux-subcores3/node/node16/cpu114 ../../cpu/cpu114 +tests/virhostcpudata/linux-subcores3/node/node16/cpu115 ../../cpu/cpu115 +tests/virhostcpudata/linux-subcores3/node/node16/cpu116 ../../cpu/cpu116 +tests/virhostcpudata/linux-subcores3/node/node16/cpu117 ../../cpu/cpu117 +tests/virhostcpudata/linux-subcores3/node/node16/cpu118 ../../cpu/cpu118 +tests/virhostcpudata/linux-subcores3/node/node16/cpu119 ../../cpu/cpu119 +tests/virhostcpudata/linux-subcores3/node/node16/cpu80 ../../cpu/cpu80 +tests/virhostcpudata/linux-subcores3/node/node16/cpu81 ../../cpu/cpu81 +tests/virhostcpudata/linux-subcores3/node/node16/cpu82 ../../cpu/cpu82 +tests/virhostcpudata/linux-subcores3/node/node16/cpu83 ../../cpu/cpu83 +tests/virhostcpudata/linux-subcores3/node/node16/cpu84 ../../cpu/cpu84 +tests/virhostcpudata/linux-subcores3/node/node16/cpu85 ../../cpu/cpu85 +tests/virhostcpudata/linux-subcores3/node/node16/cpu86 ../../cpu/cpu86 +tests/virhostcpudata/linux-subcores3/node/node16/cpu87 ../../cpu/cpu87 +tests/virhostcpudata/linux-subcores3/node/node16/cpu88 ../../cpu/cpu88 +tests/virhostcpudata/linux-subcores3/node/node16/cpu89 ../../cpu/cpu89 +tests/virhostcpudata/linux-subcores3/node/node16/cpu90 ../../cpu/cpu90 +tests/virhostcpudata/linux-subcores3/node/node16/cpu91 ../../cpu/cpu91 +tests/virhostcpudata/linux-subcores3/node/node16/cpu92 ../../cpu/cpu92 +tests/virhostcpudata/linux-subcores3/node/node16/cpu93 ../../cpu/cpu93 +tests/virhostcpudata/linux-subcores3/node/node16/cpu94 ../../cpu/cpu94 +tests/virhostcpudata/linux-subcores3/node/node16/cpu95 ../../cpu/cpu95 +tests/virhostcpudata/linux-subcores3/node/node16/cpu96 ../../cpu/cpu96 +tests/virhostcpudata/linux-subcores3/node/node16/cpu97 ../../cpu/cpu97 +tests/virhostcpudata/linux-subcores3/node/node16/cpu98 ../../cpu/cpu98 +tests/virhostcpudata/linux-subcores3/node/node16/cpu99 ../../cpu/cpu99 +tests/virhostcpudata/linux-subcores3/node/node17/cpu120 ../../cpu/cpu120 +tests/virhostcpudata/linux-subcores3/node/node17/cpu121 ../../cpu/cpu121 +tests/virhostcpudata/linux-subcores3/node/node17/cpu122 ../../cpu/cpu122 +tests/virhostcpudata/linux-subcores3/node/node17/cpu123 ../../cpu/cpu123 +tests/virhostcpudata/linux-subcores3/node/node17/cpu124 ../../cpu/cpu124 +tests/virhostcpudata/linux-subcores3/node/node17/cpu125 ../../cpu/cpu125 +tests/virhostcpudata/linux-subcores3/node/node17/cpu126 ../../cpu/cpu126 +tests/virhostcpudata/linux-subcores3/node/node17/cpu127 ../../cpu/cpu127 +tests/virhostcpudata/linux-subcores3/node/node17/cpu128 ../../cpu/cpu128 +tests/virhostcpudata/linux-subcores3/node/node17/cpu129 ../../cpu/cpu129 +tests/virhostcpudata/linux-subcores3/node/node17/cpu130 ../../cpu/cpu130 +tests/virhostcpudata/linux-subcores3/node/node17/cpu131 ../../cpu/cpu131 +tests/virhostcpudata/linux-subcores3/node/node17/cpu132 ../../cpu/cpu132 +tests/virhostcpudata/linux-subcores3/node/node17/cpu133 ../../cpu/cpu133 +tests/virhostcpudata/linux-subcores3/node/node17/cpu134 ../../cpu/cpu134 +tests/virhostcpudata/linux-subcores3/node/node17/cpu135 ../../cpu/cpu135 +tests/virhostcpudata/linux-subcores3/node/node17/cpu136 ../../cpu/cpu136 +tests/virhostcpudata/linux-subcores3/node/node17/cpu137 ../../cpu/cpu137 +tests/virhostcpudata/linux-subcores3/node/node17/cpu138 ../../cpu/cpu138 +tests/virhostcpudata/linux-subcores3/node/node17/cpu139 ../../cpu/cpu139 +tests/virhostcpudata/linux-subcores3/node/node17/cpu140 ../../cpu/cpu140 +tests/virhostcpudata/linux-subcores3/node/node17/cpu141 ../../cpu/cpu141 +tests/virhostcpudata/linux-subcores3/node/node17/cpu142 ../../cpu/cpu142 +tests/virhostcpudata/linux-subcores3/node/node17/cpu143 ../../cpu/cpu143 +tests/virhostcpudata/linux-subcores3/node/node17/cpu144 ../../cpu/cpu144 +tests/virhostcpudata/linux-subcores3/node/node17/cpu145 ../../cpu/cpu145 +tests/virhostcpudata/linux-subcores3/node/node17/cpu146 ../../cpu/cpu146 +tests/virhostcpudata/linux-subcores3/node/node17/cpu147 ../../cpu/cpu147 +tests/virhostcpudata/linux-subcores3/node/node17/cpu148 ../../cpu/cpu148 +tests/virhostcpudata/linux-subcores3/node/node17/cpu149 ../../cpu/cpu149 +tests/virhostcpudata/linux-subcores3/node/node17/cpu150 ../../cpu/cpu150 +tests/virhostcpudata/linux-subcores3/node/node17/cpu151 ../../cpu/cpu151 +tests/virhostcpudata/linux-subcores3/node/node17/cpu152 ../../cpu/cpu152 +tests/virhostcpudata/linux-subcores3/node/node17/cpu153 ../../cpu/cpu153 +tests/virhostcpudata/linux-subcores3/node/node17/cpu154 ../../cpu/cpu154 +tests/virhostcpudata/linux-subcores3/node/node17/cpu155 ../../cpu/cpu155 +tests/virhostcpudata/linux-subcores3/node/node17/cpu156 ../../cpu/cpu156 +tests/virhostcpudata/linux-subcores3/node/node17/cpu157 ../../cpu/cpu157 +tests/virhostcpudata/linux-subcores3/node/node17/cpu158 ../../cpu/cpu158 +tests/virhostcpudata/linux-subcores3/node/node17/cpu159 ../../cpu/cpu159 +tests/virhostcpudata/linux-test2/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-test2/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-test3/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-test3/node/node0/cpu12 ../../cpu/cpu12 +tests/virhostcpudata/linux-test3/node/node0/cpu16 ../../cpu/cpu16 +tests/virhostcpudata/linux-test3/node/node0/cpu20 ../../cpu/cpu20 +tests/virhostcpudata/linux-test3/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-test3/node/node0/cpu8 ../../cpu/cpu8 +tests/virhostcpudata/linux-test3/node/node1/cpu24 ../../cpu/cpu24 +tests/virhostcpudata/linux-test3/node/node1/cpu28 ../../cpu/cpu28 +tests/virhostcpudata/linux-test3/node/node1/cpu32 ../../cpu/cpu32 +tests/virhostcpudata/linux-test3/node/node1/cpu36 ../../cpu/cpu36 +tests/virhostcpudata/linux-test3/node/node1/cpu40 ../../cpu/cpu40 +tests/virhostcpudata/linux-test3/node/node1/cpu44 ../../cpu/cpu44 +tests/virhostcpudata/linux-test3/node/node2/cpu11 ../../cpu/cpu11 +tests/virhostcpudata/linux-test3/node/node2/cpu15 ../../cpu/cpu15 +tests/virhostcpudata/linux-test3/node/node2/cpu19 ../../cpu/cpu19 +tests/virhostcpudata/linux-test3/node/node2/cpu23 ../../cpu/cpu23 +tests/virhostcpudata/linux-test3/node/node2/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-test3/node/node2/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-test3/node/node3/cpu27 ../../cpu/cpu27 +tests/virhostcpudata/linux-test3/node/node3/cpu31 ../../cpu/cpu31 +tests/virhostcpudata/linux-test3/node/node3/cpu35 ../../cpu/cpu35 +tests/virhostcpudata/linux-test3/node/node3/cpu39 ../../cpu/cpu39 +tests/virhostcpudata/linux-test3/node/node3/cpu43 ../../cpu/cpu43 +tests/virhostcpudata/linux-test3/node/node3/cpu47 ../../cpu/cpu47 +tests/virhostcpudata/linux-test3/node/node4/cpu10 ../../cpu/cpu10 +tests/virhostcpudata/linux-test3/node/node4/cpu14 ../../cpu/cpu14 +tests/virhostcpudata/linux-test3/node/node4/cpu18 ../../cpu/cpu18 +tests/virhostcpudata/linux-test3/node/node4/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-test3/node/node4/cpu22 ../../cpu/cpu22 +tests/virhostcpudata/linux-test3/node/node4/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-test3/node/node5/cpu26 ../../cpu/cpu26 +tests/virhostcpudata/linux-test3/node/node5/cpu30 ../../cpu/cpu30 +tests/virhostcpudata/linux-test3/node/node5/cpu34 ../../cpu/cpu34 +tests/virhostcpudata/linux-test3/node/node5/cpu38 ../../cpu/cpu38 +tests/virhostcpudata/linux-test3/node/node5/cpu42 ../../cpu/cpu42 +tests/virhostcpudata/linux-test3/node/node5/cpu46 ../../cpu/cpu46 +tests/virhostcpudata/linux-test3/node/node6/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-test3/node/node6/cpu13 ../../cpu/cpu13 +tests/virhostcpudata/linux-test3/node/node6/cpu17 ../../cpu/cpu17 +tests/virhostcpudata/linux-test3/node/node6/cpu21 ../../cpu/cpu21 +tests/virhostcpudata/linux-test3/node/node6/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-test3/node/node6/cpu9 ../../cpu/cpu9 +tests/virhostcpudata/linux-test3/node/node7/cpu25 ../../cpu/cpu25 +tests/virhostcpudata/linux-test3/node/node7/cpu29 ../../cpu/cpu29 +tests/virhostcpudata/linux-test3/node/node7/cpu33 ../../cpu/cpu33 +tests/virhostcpudata/linux-test3/node/node7/cpu37 ../../cpu/cpu37 +tests/virhostcpudata/linux-test3/node/node7/cpu41 ../../cpu/cpu41 +tests/virhostcpudata/linux-test3/node/node7/cpu45 ../../cpu/cpu45 +tests/virhostcpudata/linux-test4/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-test4/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-test4/node/node0/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-test4/node/node0/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-test4/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-test4/node/node0/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-test4/node/node0/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-test4/node/node0/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-test4/node/node1/cpu10 ../../cpu/cpu10 +tests/virhostcpudata/linux-test4/node/node1/cpu11 ../../cpu/cpu11 +tests/virhostcpudata/linux-test4/node/node1/cpu12 ../../cpu/cpu12 +tests/virhostcpudata/linux-test4/node/node1/cpu13 ../../cpu/cpu13 +tests/virhostcpudata/linux-test4/node/node1/cpu14 ../../cpu/cpu14 +tests/virhostcpudata/linux-test4/node/node1/cpu15 ../../cpu/cpu15 +tests/virhostcpudata/linux-test4/node/node1/cpu8 ../../cpu/cpu8 +tests/virhostcpudata/linux-test4/node/node1/cpu9 ../../cpu/cpu9 +tests/virhostcpudata/linux-test6/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-test6/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-test6/node/node0/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-test6/node/node0/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-test6/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-test6/node/node0/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-test6/node/node0/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-test6/node/node0/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-test7/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-test7/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-test7/node/node0/cpu10 ../../cpu/cpu10 +tests/virhostcpudata/linux-test7/node/node0/cpu11 ../../cpu/cpu11 +tests/virhostcpudata/linux-test7/node/node0/cpu12 ../../cpu/cpu12 +tests/virhostcpudata/linux-test7/node/node0/cpu13 ../../cpu/cpu13 +tests/virhostcpudata/linux-test7/node/node0/cpu14 ../../cpu/cpu14 +tests/virhostcpudata/linux-test7/node/node0/cpu15 ../../cpu/cpu15 +tests/virhostcpudata/linux-test7/node/node0/cpu16 ../../cpu/cpu16 +tests/virhostcpudata/linux-test7/node/node0/cpu17 ../../cpu/cpu17 +tests/virhostcpudata/linux-test7/node/node0/cpu18 ../../cpu/cpu18 +tests/virhostcpudata/linux-test7/node/node0/cpu19 ../../cpu/cpu19 +tests/virhostcpudata/linux-test7/node/node0/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-test7/node/node0/cpu20 ../../cpu/cpu20 +tests/virhostcpudata/linux-test7/node/node0/cpu21 ../../cpu/cpu21 +tests/virhostcpudata/linux-test7/node/node0/cpu22 ../../cpu/cpu22 +tests/virhostcpudata/linux-test7/node/node0/cpu23 ../../cpu/cpu23 +tests/virhostcpudata/linux-test7/node/node0/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-test7/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-test7/node/node0/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-test7/node/node0/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-test7/node/node0/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-test7/node/node0/cpu8 ../../cpu/cpu8 +tests/virhostcpudata/linux-test7/node/node0/cpu9 ../../cpu/cpu9 +tests/virhostcpudata/linux-test8/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-test8/node/node0/cpu12 ../../cpu/cpu12 +tests/virhostcpudata/linux-test8/node/node0/cpu16 ../../cpu/cpu16 +tests/virhostcpudata/linux-test8/node/node0/cpu20 ../../cpu/cpu20 +tests/virhostcpudata/linux-test8/node/node0/cpu24 ../../cpu/cpu24 +tests/virhostcpudata/linux-test8/node/node0/cpu28 ../../cpu/cpu28 +tests/virhostcpudata/linux-test8/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-test8/node/node0/cpu8 ../../cpu/cpu8 +tests/virhostcpudata/linux-test8/node/node1/cpu32 ../../cpu/cpu32 +tests/virhostcpudata/linux-test8/node/node1/cpu36 ../../cpu/cpu36 +tests/virhostcpudata/linux-test8/node/node1/cpu40 ../../cpu/cpu40 +tests/virhostcpudata/linux-test8/node/node1/cpu44 ../../cpu/cpu44 +tests/virhostcpudata/linux-test8/node/node1/cpu48 ../../cpu/cpu48 +tests/virhostcpudata/linux-test8/node/node1/cpu52 ../../cpu/cpu52 +tests/virhostcpudata/linux-test8/node/node1/cpu56 ../../cpu/cpu56 +tests/virhostcpudata/linux-test8/node/node1/cpu60 ../../cpu/cpu60 +tests/virhostcpudata/linux-test8/node/node2/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-test8/node/node2/cpu13 ../../cpu/cpu13 +tests/virhostcpudata/linux-test8/node/node2/cpu17 ../../cpu/cpu17 +tests/virhostcpudata/linux-test8/node/node2/cpu21 ../../cpu/cpu21 +tests/virhostcpudata/linux-test8/node/node2/cpu25 ../../cpu/cpu25 +tests/virhostcpudata/linux-test8/node/node2/cpu29 ../../cpu/cpu29 +tests/virhostcpudata/linux-test8/node/node2/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-test8/node/node2/cpu9 ../../cpu/cpu9 +tests/virhostcpudata/linux-test8/node/node3/cpu33 ../../cpu/cpu33 +tests/virhostcpudata/linux-test8/node/node3/cpu37 ../../cpu/cpu37 +tests/virhostcpudata/linux-test8/node/node3/cpu41 ../../cpu/cpu41 +tests/virhostcpudata/linux-test8/node/node3/cpu45 ../../cpu/cpu45 +tests/virhostcpudata/linux-test8/node/node3/cpu49 ../../cpu/cpu49 +tests/virhostcpudata/linux-test8/node/node3/cpu53 ../../cpu/cpu53 +tests/virhostcpudata/linux-test8/node/node3/cpu57 ../../cpu/cpu57 +tests/virhostcpudata/linux-test8/node/node3/cpu61 ../../cpu/cpu61 +tests/virhostcpudata/linux-test8/node/node4/cpu10 ../../cpu/cpu10 +tests/virhostcpudata/linux-test8/node/node4/cpu14 ../../cpu/cpu14 +tests/virhostcpudata/linux-test8/node/node4/cpu18 ../../cpu/cpu18 +tests/virhostcpudata/linux-test8/node/node4/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-test8/node/node4/cpu22 ../../cpu/cpu22 +tests/virhostcpudata/linux-test8/node/node4/cpu26 ../../cpu/cpu26 +tests/virhostcpudata/linux-test8/node/node4/cpu30 ../../cpu/cpu30 +tests/virhostcpudata/linux-test8/node/node4/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-test8/node/node5/cpu34 ../../cpu/cpu34 +tests/virhostcpudata/linux-test8/node/node5/cpu38 ../../cpu/cpu38 +tests/virhostcpudata/linux-test8/node/node5/cpu42 ../../cpu/cpu42 +tests/virhostcpudata/linux-test8/node/node5/cpu46 ../../cpu/cpu46 +tests/virhostcpudata/linux-test8/node/node5/cpu50 ../../cpu/cpu50 +tests/virhostcpudata/linux-test8/node/node5/cpu54 ../../cpu/cpu54 +tests/virhostcpudata/linux-test8/node/node5/cpu58 ../../cpu/cpu58 +tests/virhostcpudata/linux-test8/node/node5/cpu62 ../../cpu/cpu62 +tests/virhostcpudata/linux-test8/node/node6/cpu35 ../../cpu/cpu35 +tests/virhostcpudata/linux-test8/node/node6/cpu39 ../../cpu/cpu39 +tests/virhostcpudata/linux-test8/node/node6/cpu43 ../../cpu/cpu43 +tests/virhostcpudata/linux-test8/node/node6/cpu47 ../../cpu/cpu47 +tests/virhostcpudata/linux-test8/node/node6/cpu51 ../../cpu/cpu51 +tests/virhostcpudata/linux-test8/node/node6/cpu55 ../../cpu/cpu55 +tests/virhostcpudata/linux-test8/node/node6/cpu59 ../../cpu/cpu59 +tests/virhostcpudata/linux-test8/node/node6/cpu63 ../../cpu/cpu63 +tests/virhostcpudata/linux-test8/node/node7/cpu11 ../../cpu/cpu11 +tests/virhostcpudata/linux-test8/node/node7/cpu15 ../../cpu/cpu15 +tests/virhostcpudata/linux-test8/node/node7/cpu19 ../../cpu/cpu19 +tests/virhostcpudata/linux-test8/node/node7/cpu23 ../../cpu/cpu23 +tests/virhostcpudata/linux-test8/node/node7/cpu27 ../../cpu/cpu27 +tests/virhostcpudata/linux-test8/node/node7/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-test8/node/node7/cpu31 ../../cpu/cpu31 +tests/virhostcpudata/linux-test8/node/node7/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-with-die/node/node0/cpu0 ../../cpu/cpu0 +tests/virhostcpudata/linux-with-die/node/node0/cpu1 ../../cpu/cpu1 +tests/virhostcpudata/linux-with-die/node/node0/cpu10 ../../cpu/cpu10 +tests/virhostcpudata/linux-with-die/node/node0/cpu11 ../../cpu/cpu11 +tests/virhostcpudata/linux-with-die/node/node0/cpu2 ../../cpu/cpu2 +tests/virhostcpudata/linux-with-die/node/node0/cpu3 ../../cpu/cpu3 +tests/virhostcpudata/linux-with-die/node/node0/cpu4 ../../cpu/cpu4 +tests/virhostcpudata/linux-with-die/node/node0/cpu5 ../../cpu/cpu5 +tests/virhostcpudata/linux-with-die/node/node0/cpu6 ../../cpu/cpu6 +tests/virhostcpudata/linux-with-die/node/node0/cpu7 ../../cpu/cpu7 +tests/virhostcpudata/linux-with-die/node/node0/cpu8 ../../cpu/cpu8 +tests/virhostcpudata/linux-with-die/node/node0/cpu9 ../../cpu/cpu9 +tests/virstoragetestdata/images/sub/link1 ../qcow2_raw-raw-reldir.qcow2 +tests/virstoragetestdata/images/sub/link2 ../qcow2_qcow2-qcow2-symlink_raw-raw-reldir.qcow2 +tests/virstoragetestdata/lookup/sub/link2 ../wrap +tests/vmx2xmldata/cdrom-ide-file-missing-datastore.xml cdrom-ide-empty.xml +tests/vmx2xmldata/cdrom-ide-file-missing-file.xml cdrom-ide-empty.xml +tests/vmx2xmldata/serial-pipe-client-app.xml serial-pipe.xml +tests/vmx2xmldata/serial-pipe-client-vm.xml serial-pipe.xml +tests/vmx2xmldata/serial-pipe-server-app.xml serial-pipe.xml +tests/vmx2xmldata/serial-pipe-server-vm.xml serial-pipe.xml