July 2024 - Devel - libvirt List Archives

[PATCH v1] security_manager: Ensure top lock is acquired before nested locks
by hongmianquan 04 Jul '24

04 Jul '24

We need to ensure top lock is acquired before nested lock. Otherwise deadlock issues may arise. We have the stack security driver, which internally manages other security drivers, we call them "top" and "nested". We call virSecurityStackPreFork() to lock the top one, and it also locks and then unlocks the nested drivers prior to fork. Then in qemuSecurityPostFork(), it unlocks the top one, but not the nested ones. Thus, if one of the nested drivers ("dac" or "selinux") is still locked, it will cause a deadlock. We discovered this case: the nested list obtained through the qemuSecurityGetNested() will be locked for subsequent use, such as in virQEMUDriverCreateCapabilities(), where the nested list is locked using qemuSecurityGetDOI, but the top one is not locked beforehand. The problem stack is as follows: libvirtd thread1 libvirtd thread2 child libvirtd | | | | | | virsh capabilities qemuProcessLanuch | | | | | lock top | | | | lock nested | | | | | | fork------------------->|(held nested lock) | | | | | | unlock nested unlock top unlock top | | qemuSecuritySetSocketLabel | | lock nested (deadlock) In this commit, we ensure that the top lock is acquired before the nested lock, so during fork, it's not possible for another task to acquire the nested lock. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1303031 Signed-off-by: hongmianquan <hongmianquan(a)bytedance.com> --- src/libvirt_private.syms | 3 ++- src/qemu/qemu_conf.c | 9 ++++++++- src/qemu/qemu_driver.c | 16 +++++++++------- src/qemu/qemu_security.h | 2 ++ src/security/security_manager.c | 22 ++++++++++++++++++++++ src/security/security_manager.h | 2 ++ 6 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bac4a8a366..39cdb90772 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1806,7 +1806,8 @@ virSecurityManagerTransactionAbort; virSecurityManagerTransactionCommit; virSecurityManagerTransactionStart; virSecurityManagerVerify; - +virSecurityManagerStackLock; +virSecurityManagerStackUnlock; # security/security_util.h virSecurityXATTRNamespaceDefined; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4050a82341..21f0739fd5 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1380,6 +1380,9 @@ virCaps *virQEMUDriverCreateCapabilities(virQEMUDriver *driver) return NULL; } + /* Ensure top lock is acquired before nested locks */ + qemuSecurityStackLock(driver->securityManager); + /* access sec drivers and create a sec model for each one */ if (!(sec_managers = qemuSecurityGetNested(driver->securityManager))) return NULL; @@ -1402,8 +1405,10 @@ virCaps *virQEMUDriverCreateCapabilities(virQEMUDriver *driver) lbl = qemuSecurityGetBaseLabel(sec_managers[i], virtTypes[j]); type = virDomainVirtTypeToString(virtTypes[j]); if (lbl && - virCapabilitiesHostSecModelAddBaseLabel(sm, type, lbl) < 0) + virCapabilitiesHostSecModelAddBaseLabel(sm, type, lbl) < 0) { + qemuSecurityStackUnlock(driver->securityManager); return NULL; + } } VIR_DEBUG("Initialized caps for security driver \"%s\" with " @@ -1412,6 +1417,8 @@ virCaps *virQEMUDriverCreateCapabilities(virQEMUDriver *driver) caps->host.numa = virCapabilitiesHostNUMANewHost(); caps->host.cpu = virQEMUDriverGetHostCPU(driver); + + qemuSecurityStackUnlock(driver->securityManager); return g_steal_pointer(&caps); } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fc1704f4fc..c980a0990f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -560,7 +560,6 @@ qemuStateInitialize(bool privileged, bool autostart = true; size_t i; const char *defsecmodel = NULL; - g_autofree virSecurityManager **sec_managers = NULL; g_autoptr(virIdentity) identity = virIdentityGetCurrent(); qemu_driver = g_new0(virQEMUDriver, 1); @@ -835,11 +834,8 @@ qemuStateInitialize(bool privileged, if (!qemu_driver->qemuCapsCache) goto error; - if (!(sec_managers = qemuSecurityGetNested(qemu_driver->securityManager))) - goto error; - - if (sec_managers[0] != NULL) - defsecmodel = qemuSecurityGetModel(sec_managers[0]); + if (qemu_driver->securityManager != NULL) + defsecmodel = qemuSecurityGetModel(qemu_driver->securityManager); if (!(qemu_driver->xmlopt = virQEMUDriverCreateXMLConf(qemu_driver, defsecmodel))) @@ -5663,7 +5659,12 @@ static int qemuDomainGetSecurityLabelList(virDomainPtr dom, ret = 0; } else { int len = 0; - virSecurityManager ** mgrs = qemuSecurityGetNested(driver->securityManager); + virSecurityManager ** mgrs = NULL; + + /* Ensure top lock is acquired before nested locks */ + qemuSecurityStackLock(driver->securityManager); + + mgrs = qemuSecurityGetNested(driver->securityManager); if (!mgrs) goto cleanup; @@ -5688,6 +5689,7 @@ static int qemuDomainGetSecurityLabelList(virDomainPtr dom, } cleanup: + qemuSecurityStackUnlock(driver->securityManager); virDomainObjEndAPI(&vm); return ret; } diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index 41da33debc..19fcb3c939 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -151,3 +151,5 @@ int qemuSecurityCommandRun(virQEMUDriver *driver, #define qemuSecuritySetTapFDLabel virSecurityManagerSetTapFDLabel #define qemuSecurityStackAddNested virSecurityManagerStackAddNested #define qemuSecurityVerify virSecurityManagerVerify +#define qemuSecurityStackLock virSecurityManagerStackLock +#define qemuSecurityStackUnlock virSecurityManagerStackUnlock \ No newline at end of file diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 24f2f3d3dc..c49c4f708f 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -989,6 +989,28 @@ virSecurityManagerGetNested(virSecurityManager *mgr) return list; } +/* + * Usually called before virSecurityManagerGetNested(). + * We need to ensure locking the stack security manager before + * locking the nested security manager to maintain the correct + * synchronization state. + * It must be followed by a call virSecurityManagerStackUnlock(). + */ +void +virSecurityManagerStackLock(virSecurityManager *mgr) +{ + if (STREQ("stack", mgr->drv->name)) + virObjectLock(mgr); +} + + +void +virSecurityManagerStackUnlock(virSecurityManager *mgr) +{ + if (STREQ("stack", mgr->drv->name)) + virObjectUnlock(mgr); +} + /** * virSecurityManagerDomainSetPathLabel: diff --git a/src/security/security_manager.h b/src/security/security_manager.h index a416af3215..bb6d22bc31 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -158,6 +158,8 @@ int virSecurityManagerSetTapFDLabel(virSecurityManager *mgr, char *virSecurityManagerGetMountOptions(virSecurityManager *mgr, virDomainDef *vm); virSecurityManager ** virSecurityManagerGetNested(virSecurityManager *mgr); +void virSecurityManagerStackLock(virSecurityManager *mgr); +void virSecurityManagerStackUnlock(virSecurityManager *mgr); typedef enum { VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN = 1 << 0, -- 2.11.0

3 4

Re: [PATCH v1] security_manager: Ensure top lock is acquired before nested locks
by ByteDance 03 Jul '24

03 Jul '24

Yes, we have recently encountered this issue, and it is exactly the same as the scenario described in the bug report. We investigated the code and found this potential problem. The issue occurs when collecting information through the ‘virsh capabilities' while concurrently creating vm. The higher the frequency and concurrency, the more likely the issue will reproduce. We believe this is a very rare bug; our environment has been running for three years, and we've only encountered this issue once. To successfully reproduce the problem, we constructed a test case by adding a sleep between the lock nested and unlock. But we still need to try to fix this issue, even though the probability is very low.

1 0

[PATCH v2] conf: Fix rawio/sgio checks for non-scsi hostdev devices
by Rayhan Faizel 03 Jul '24

03 Jul '24

The current hostdev parsing logic sets rawio or sgio even if the hostdev type is not 'scsi'. The rawio field in virDomainHostdevSubsysSCSI overlaps with wwpn field in virDomainHostdevSubsysSCSIVHost, consequently setting a bogus pointer value such as 0x1 or 0x2 from virDomainHostdevSubsysSCSIVHost's point of view. This leads to a segmentation fault when it attempts to free wwpn. While setting sgio does not appear to crash, it shares the same flawed logic as setting rawio. Instead, we ensure these are set only after the hostdev type check succeeds. This patch also adds two test cases to exercise both scenarios. Fixes: bdb95b520c53f9bacc6504fc51381bac4813be38 Signed-off-by: Rayhan Faizel <rayhan.faizel(a)gmail.com> --- [Changes in v2] - Reworked fix to use temporary variables instead of xpath queries. - Added comments for future reference. - Mention fixed commit. src/conf/domain_conf.c | 26 +++++++++--- ...scsi-vhost-rawio-invalid.x86_64-latest.err | 1 + .../hostdev-scsi-vhost-rawio-invalid.xml | 41 +++++++++++++++++++ ...-scsi-vhost-sgio-invalid.x86_64-latest.err | 1 + .../hostdev-scsi-vhost-sgio-invalid.xml | 41 +++++++++++++++++++ tests/qemuxmlconftest.c | 2 + 6 files changed, 106 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.xml create mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 334152c4ff..7033b4e9fe 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6220,6 +6220,8 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, virDomainHostdevSubsysMediatedDev *mdevsrc = &def->source.subsys.u.mdev; virTristateBool managed; g_autofree char *model = NULL; + virDomainDeviceSGIO sgio; + virTristateBool rawio; int rv; /* @managed can be read from the xml document - it is always an @@ -6259,7 +6261,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, if ((rv = virXMLPropEnum(node, "sgio", virDomainDeviceSGIOTypeFromString, VIR_XML_PROP_NONZERO, - &scsisrc->sgio)) < 0) { + &sgio)) < 0) { return -1; } @@ -6269,18 +6271,30 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, _("sgio is only supported for scsi host device")); return -1; } + + /* Set sgio only after checking if hostdev type is 'scsi' to avoid + * clobbering other union structures. + */ + scsisrc->sgio = sgio; } if ((rv = virXMLPropTristateBool(node, "rawio", VIR_XML_PROP_NONE, - &scsisrc->rawio)) < 0) { + &rawio)) < 0) { return -1; } - if (rv > 0 && def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("rawio is only supported for scsi host device")); - return -1; + if (rv > 0) { + if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("rawio is only supported for scsi host device")); + return -1; + } + + /* Set rawio only after checking if hostdev type is 'scsi' to avoid + * clobbering other union structures. + */ + scsisrc->rawio = rawio; } if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV && diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.x86_64-latest.err new file mode 100644 index 0000000000..ddaf449658 --- /dev/null +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.x86_64-latest.err @@ -0,0 +1 @@ +XML error: rawio is only supported for scsi host device diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.xml new file mode 100644 index 0000000000..80760ab941 --- /dev/null +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <hostdev mode='subsystem' type='scsi_host' rawio='yes'> + <source protocol='vhost' wwpn='naa.5123456789abcde0'/> + </hostdev> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.x86_64-latest.err new file mode 100644 index 0000000000..32256aad1c --- /dev/null +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.x86_64-latest.err @@ -0,0 +1 @@ +XML error: sgio is only supported for scsi host device diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.xml new file mode 100644 index 0000000000..c549bddc1d --- /dev/null +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <hostdev mode='subsystem' type='scsi_host' sgio='filtered'> + <source protocol='vhost' wwpn='naa.5123456789abcde0'/> + </hostdev> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 8e0d47c6fd..1236ed5df1 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2993,6 +2993,8 @@ mymain(void) DO_TEST_CAPS_LATEST("sound-device-virtio") DO_TEST_CAPS_LATEST_FAILURE("disk-network-iscsi-zero-hosts-invalid") + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-vhost-rawio-invalid") + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-vhost-sgio-invalid") /* check that all input files were actually used here */ if (testConfXMLCheck(existingTestCases) < 0) -- 2.34.1

2 1

[PATCH] qemuDomainChangeNet: forbid changing portgroup
by Adam Julis 03 Jul '24

03 Jul '24

Changing the postgroup attribute caused unexpected behavior. Although it can be implemented, it has a non-trivial solution. No requirement or use has yet been found for implementing this feature, so it has been disabled for hot-plug. Resolves: https://issues.redhat.com/browse/RHEL-7299 Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- src/qemu/qemu_hotplug.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4a3f4f657e..08ca7ab973 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3937,6 +3937,13 @@ qemuDomainChangeNet(virQEMUDriver *driver, else needBridgeChange = true; } + + if (STRNEQ_NULLABLE(olddev->data.network.portgroup, newdev->data.network.portgroup)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify network device portgroup attribute")); + goto cleanup; + } + /* other things handled in common code directly below this switch */ break; -- 2.45.2

2 1

[PATCH] qemu_domain: Check if driver->domainEventState is NULL
by Rayhan Faizel 03 Jul '24

03 Jul '24

Under the test environment, driver->domainEventState is uninitialized. If a disk gets dropped, it will attempt to queue an event which will cause a segmentation fault. This crash does not occur during normal use. This patch adds a quick check to ensure driver->domainEventState is not NULL along with a testcase exercising the dropping of disks with startupPolicy set as 'optional'. Signed-off-by: Rayhan Faizel <rayhan.faizel(a)gmail.com> --- src/qemu/qemu_domain.c | 3 +- ...tuppolicy-optional-drop.x86_64-latest.args | 33 ++++++++++++++++ ...rtuppolicy-optional-drop.x86_64-latest.xml | 38 +++++++++++++++++++ .../disk-startuppolicy-optional-drop.xml | 23 +++++++++++ tests/qemuxmlconftest.c | 2 + 5 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7ba2ea4a5e..109c5bbd52 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7592,7 +7592,8 @@ qemuDomainCheckRemoveOptionalDisk(virQEMUDriver *driver, virDomainDiskDefFree(disk); } - virObjectEventStateQueue(driver->domainEventState, event); + if (driver->domainEventState) + virObjectEventStateQueue(driver->domainEventState, event); } diff --git a/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.args b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.args new file mode 100644 index 0000000000..13ddbc1a5d --- /dev/null +++ b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.xml new file mode 100644 index 0000000000..27d0639109 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.xml @@ -0,0 +1,38 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='volume' device='disk'> + <driver name='qemu'/> + <source pool='inactive' volume='inactive' startupPolicy='optional'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='scsi' index='0' model='lsilogic'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.xml b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.xml new file mode 100644 index 0000000000..c6c59978c6 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.xml @@ -0,0 +1,23 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='volume' device='disk'> + <source pool='inactive' volume='inactive' startupPolicy='optional'/> + <target dev='sda'/> + </disk> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 5700ea314f..16ecc1b7e4 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2986,6 +2986,8 @@ mymain(void) DO_TEST_CAPS_LATEST("net-usb") DO_TEST_CAPS_LATEST("sound-device-virtio") + DO_TEST_CAPS_LATEST("disk-startuppolicy-optional-drop") + /* check that all input files were actually used here */ if (testConfXMLCheck(existingTestCases) < 0) ret = -1; -- 2.34.1

2 2

Re: [PATCH v2] security_manager: Ensure top lock is acquired before nested locks
by ByteDance 03 Jul '24

03 Jul '24

Hello, Mr. Krempa. I apologize for the interruption. I came across your discussion on Bugzilla regarding https://bugzilla.redhat.com/show_bug.cgi?id=1303031, we have encountered the same issue in our usage and have identified a potential occurrence path. I hope to discuss this further with you. Thank you for your time.

1 0

[PATCH] conf: Fix rawio/sgio checks for non-scsi hostdev devices
by Rayhan Faizel 02 Jul '24

02 Jul '24

The current hostdev parsing logic sets rawio or sgio even if the hostdev type is not 'scsi'. The rawio field in virDomainHostdevSubsysSCSI overlaps with wwpn field in virDomainHostdevSubsysSCSIVHost, consequently setting a bogus pointer value such as 0x1 or 0x2 from virDomainHostdevSubsysSCSIVHost's point of view. This leads to a segmentation fault when it attempts to free wwpn. While setting sgio does not appear to crash, it shares the same flawed logic as setting rawio. Instead, we test the presence of their xpaths along with the hostdev type before setting either attributes. This patch also adds two test cases to exercise both scenarios. Signed-off-by: Rayhan Faizel <rayhan.faizel(a)gmail.com> --- src/conf/domain_conf.c | 33 ++++++++------- ...scsi-vhost-rawio-invalid.x86_64-latest.err | 1 + .../hostdev-scsi-vhost-rawio-invalid.xml | 41 +++++++++++++++++++ ...-scsi-vhost-sgio-invalid.x86_64-latest.err | 1 + .../hostdev-scsi-vhost-sgio-invalid.xml | 41 +++++++++++++++++++ tests/qemuxmlconftest.c | 2 + 6 files changed, 102 insertions(+), 17 deletions(-) create mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.xml create mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 334152c4ff..5f8c6f2672 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6220,7 +6220,6 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, virDomainHostdevSubsysMediatedDev *mdevsrc = &def->source.subsys.u.mdev; virTristateBool managed; g_autofree char *model = NULL; - int rv; /* @managed can be read from the xml document - it is always an * attribute of the toplevel element, no matter what type of @@ -6256,33 +6255,33 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, return -1; } - if ((rv = virXMLPropEnum(node, "sgio", - virDomainDeviceSGIOTypeFromString, - VIR_XML_PROP_NONZERO, - &scsisrc->sgio)) < 0) { + if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && + virXPathBoolean("boolean(./@sgio)", ctxt)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("sgio is only supported for scsi host device")); return -1; } - if (rv > 0) { - if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("sgio is only supported for scsi host device")); - return -1; - } - } - - if ((rv = virXMLPropTristateBool(node, "rawio", - VIR_XML_PROP_NONE, - &scsisrc->rawio)) < 0) { + if (virXMLPropEnum(node, "sgio", + virDomainDeviceSGIOTypeFromString, + VIR_XML_PROP_NONZERO, + &scsisrc->sgio) < 0) { return -1; } - if (rv > 0 && def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) { + if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && + virXPathBoolean("boolean(./@rawio)", ctxt)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("rawio is only supported for scsi host device")); return -1; } + if (virXMLPropTristateBool(node, "rawio", + VIR_XML_PROP_NONE, + &scsisrc->rawio) < 0) { + return -1; + } + if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV && def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST) { if (model) { diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.x86_64-latest.err new file mode 100644 index 0000000000..ddaf449658 --- /dev/null +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.x86_64-latest.err @@ -0,0 +1 @@ +XML error: rawio is only supported for scsi host device diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.xml new file mode 100644 index 0000000000..80760ab941 --- /dev/null +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-rawio-invalid.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <hostdev mode='subsystem' type='scsi_host' rawio='yes'> + <source protocol='vhost' wwpn='naa.5123456789abcde0'/> + </hostdev> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.x86_64-latest.err new file mode 100644 index 0000000000..32256aad1c --- /dev/null +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.x86_64-latest.err @@ -0,0 +1 @@ +XML error: sgio is only supported for scsi host device diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.xml new file mode 100644 index 0000000000..c549bddc1d --- /dev/null +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-sgio-invalid.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <hostdev mode='subsystem' type='scsi_host' sgio='filtered'> + <source protocol='vhost' wwpn='naa.5123456789abcde0'/> + </hostdev> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 8e0d47c6fd..1236ed5df1 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2993,6 +2993,8 @@ mymain(void) DO_TEST_CAPS_LATEST("sound-device-virtio") DO_TEST_CAPS_LATEST_FAILURE("disk-network-iscsi-zero-hosts-invalid") + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-vhost-rawio-invalid") + DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-vhost-sgio-invalid") /* check that all input files were actually used here */ if (testConfXMLCheck(existingTestCases) < 0) -- 2.34.1

3 3

[PATCH RESEND 0/5] Introduce pstore device
by Michal Privoznik 02 Jul '24

02 Jul '24

This is a rebased version of: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/VWR6… which doesn't apply cleanly anymore due to recent changes to qemu_capabilities.c. Michal Prívozník (5): qemu_capabilities: Introduce QEMU_CAPS_DEVICE_ACPI_ERST conf: Introduce pstore device qemu: Build cmd line for pstore device security: Set seclabels for pstore device NEWS: Document pstore device addition NEWS.rst | 7 + docs/formatdomain.rst | 32 ++++ src/ch/ch_domain.c | 1 + src/conf/domain_conf.c | 153 ++++++++++++++++++ src/conf/domain_conf.h | 19 +++ src/conf/domain_postparse.c | 1 + src/conf/domain_validate.c | 30 ++++ src/conf/schemas/domaincommon.rng | 25 +++ src/conf/virconftypes.h | 2 + src/hyperv/hyperv_driver.c | 1 + src/libvirt_private.syms | 2 + src/libxl/libxl_driver.c | 6 + src/lxc/lxc_driver.c | 6 + src/qemu/qemu_alias.c | 10 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 52 ++++++ src/qemu/qemu_domain.c | 3 + src/qemu/qemu_domain_address.c | 11 ++ src/qemu/qemu_driver.c | 3 + src/qemu/qemu_hotplug.c | 5 + src/qemu/qemu_validate.c | 26 +++ src/security/security_dac.c | 10 ++ src/security/security_selinux.c | 9 ++ src/security/virt-aa-helper.c | 4 + .../caps_7.0.0_aarch64+hvf.xml | 1 + .../caps_7.0.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 + .../caps_7.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 + .../caps_7.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + .../caps_7.2.0_x86_64+hvf.xml | 1 + .../caps_7.2.0_x86_64.xml | 1 + .../caps_8.0.0_x86_64.xml | 1 + .../caps_8.1.0_x86_64.xml | 1 + .../caps_8.2.0_aarch64.xml | 1 + .../caps_8.2.0_armv7l.xml | 1 + .../caps_8.2.0_loongarch64.xml | 1 + .../caps_8.2.0_x86_64.xml | 1 + .../caps_9.0.0_x86_64.xml | 1 + .../caps_9.1.0_x86_64.xml | 1 + .../pstore-acpi-erst.x86_64-latest.args | 38 +++++ .../pstore-acpi-erst.x86_64-latest.xml | 1 + tests/qemuxmlconfdata/pstore-acpi-erst.xml | 53 ++++++ tests/qemuxmlconftest.c | 1 + 46 files changed, 531 insertions(+) create mode 100644 tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args create mode 120000 tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/pstore-acpi-erst.xml -- 2.44.2

1 5

[PATCH v2 00/14] hw: define and enforce a standard lifecycle for versioned machines
by Daniel P. Berrangé 01 Jul '24

01 Jul '24

Thomas proposed a new deprecation and removal policy for versioned machine types that would see them liable for deletion after 6 years: https://lists.nongnu.org/archive/html/qemu-devel/2024-04/msg04683.html This suggest was met with broad approval, however, I suggested that we could take it further and actually mark them deprecated sooner, at the 3 year timeframe, and also fully automate the enablement of the runtime deprecation warning without developer intervention on every release cycle. This series implements my suggestions. The first patch introduces some helper macros and documents a standard code pattern for defining versioned machine types across targets. The next 6 patches convert existing targets with versioned machine types (arm, s390x, ppc, m68k, i386) to use the new helper macros and code patterns. A further patch introduces some helper macros for automating the handling of deprecation and deletion of versioned machine types. Two more patches then enable the deprecation and deletion logic across all versioned machines Finally we do some cleanup and document the new policy. ........a tangent about VERSION file handling....... One oddity here, is that during the development and release candidate phases the automatic logic in this series has an off-by-1 error. This is because when we, for example, add the "9.1" machine type versions, the VERSION file is still reporting '9.0.50', and then '9.0.9{1,2,3,4}'. IOW, during development and in rc candidates, we fail to deprecate and delete 1 machine type. We should already have deprecated the 6.1 machine types, but the most recently deprecated is 6.0. This is pretty harmless since the final release does the right thing. I wonder, however, whether we would benefit from changing how we update the VERSION file. eg instead of re-using the micro digit to indicate a dev or rc snapshot, represent those explicitly. eg "9.1.0-dev" and "9.1.0-rc1", "9.1.0-rc2", etc in VERSION. We don't use the full QEMU_VERSION in the code in all that many places. It appears in some help messages for command line tools, and in QMP query-version response, and in a few other misc places. At a glance it appears all of those places would easily handle a tagged version. For release candidates in particular I think it would be saner to show the user the actual version the release is about to become, rather than the previous release's version. This would make the reported version match the rc tarball naming too which would be nice. Anyway, this isn't a blocker for this machine type versioning proposal, just a thought.... Changed in v2: - Various docs improvements and minor fixes from original review - Rebased and resolved conflicts with Philippe's merged series Daniel P. Berrangé (14): include/hw: add helpers for defining versioned machine types hw/arm: convert 'virt' machine definitions to use new macros hw/s390x: convert 'ccw' machine definitions to use new macros hw/ppc: convert 'spapr' machine definitions to use new macros hw/m68k: convert 'virt' machine definitions to use new macros hw/i386: convert 'i440fx' machine definitions to use new macros hw/i386: convert 'q35' machine definitions to use new macros include/hw: add macros for deprecation & removal of versioned machines include/hw: temporarily disable deletion of versioned machine types hw: set deprecation info for all versioned machine types hw: skip registration of outdated versioned machine types hw/ppc: remove obsolete manual deprecation reason string of spapr machines hw/i386: remove obsolete manual deprecation reason string of i440fx machines docs: document special exception for machine type deprecation & removal docs/about/deprecated.rst | 13 ++ hw/arm/virt.c | 30 ++-- hw/i386/pc_piix.c | 220 ++++++++++++--------------- hw/i386/pc_q35.c | 215 +++++++++++--------------- hw/m68k/virt.c | 53 ++++--- hw/ppc/spapr.c | 96 ++++++------ hw/s390x/s390-virtio-ccw.c | 98 ++++++------ include/hw/boards.h | 298 +++++++++++++++++++++++++++++++++++++ include/hw/i386/pc.h | 28 ++++ 9 files changed, 681 insertions(+), 370 deletions(-) -- 2.43.0

3 29

[PATCH 0/9] Bump minimal QEMU version to 5.2.0
by Michal Privoznik 01 Jul '24

01 Jul '24

*** BLURB HERE *** Michal Prívozník (9): qemucapabilitiesdata: Rename sparc capabilities qemusecuritytest: drop disk-network-tlsx509-vxhs test case qemuxmlconfdata: Drop tests relying on <qemu-5.2.0 qemucapabilitiesdata: Drop tests relying on <qemu-5.2.0 qemu_capabilities: Require QEMU-5.2.0 or newer qemu_capabilities: Drop version check for QEMU_CAPS_ENABLE_FIPS and QEMU_CAPS_NETDEV_USER qemu_capabilities: Retire QEMU_CAPS_ENABLE_FIPS qemu_capabilities: Retire QEMU_CAPS_VXHS qemu: Drop _virQEMUDriver::hostFips src/qemu/qemu_capabilities.c | 20 +- src/qemu/qemu_capabilities.h | 4 +- src/qemu/qemu_command.c | 15 - src/qemu/qemu_conf.h | 1 - src/qemu/qemu_driver.c | 9 - src/qemu/qemu_process.c | 3 +- ...u_5.1.0.sparc.xml => qemu_5.2.0.sparc.xml} | 0 .../caps_4.2.0_aarch64.replies | 21813 ------------ .../caps_4.2.0_aarch64.xml | 373 - .../caps_4.2.0_ppc64.replies | 24301 ------------- .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1051 - .../caps_4.2.0_s390x.replies | 22315 ------------ .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 3187 -- .../caps_4.2.0_x86_64.replies | 26761 -------------- .../caps_4.2.0_x86_64.xml | 2529 -- .../caps_5.0.0_aarch64.replies | 23211 ------------ .../caps_5.0.0_aarch64.xml | 397 - .../caps_5.0.0_ppc64.replies | 26212 -------------- .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1072 - .../caps_5.0.0_riscv64.replies | 19500 ---------- .../caps_5.0.0_riscv64.xml | 127 - .../caps_5.0.0_x86_64.replies | 28425 --------------- .../caps_5.0.0_x86_64.xml | 2834 -- .../caps_5.1.0_x86_64.replies | 29546 ---------------- .../caps_5.1.0_x86_64.xml | 3104 -- ...sparc.replies => caps_5.2.0_sparc.replies} | 4 +- ...s_5.1.0_sparc.xml => caps_5.2.0_sparc.xml} | 5 +- tests/qemusecuritytest.c | 1 - .../aarch64-gic-default.aarch64-4.2.0.args | 31 - .../aarch64-gic-default.aarch64-4.2.0.xml | 26 - .../aarch64-gic-none.aarch64-4.2.0.args | 31 - .../aarch64-gic-none.aarch64-4.2.0.xml | 26 - .../aarch64-virt-virtio.aarch64-4.2.0.args | 54 - .../aarch64-virt-virtio.aarch64-4.2.0.xml | 94 - .../audio-default-sdl.x86_64-4.2.0.args | 37 - .../audio-default-sdl.x86_64-4.2.0.xml | 44 - .../audio-default-spice.x86_64-4.2.0.args | 36 - .../audio-default-spice.x86_64-4.2.0.xml | 46 - .../audio-default-vnc.x86_64-4.2.0.args | 36 - .../audio-default-vnc.x86_64-4.2.0.xml | 46 - ...-host-model-fallback-kvm.x86_64-4.2.0.args | 33 - ...u-host-model-fallback-kvm.x86_64-4.2.0.xml | 29 - ...-host-model-fallback-kvm.x86_64-5.0.0.args | 33 - ...u-host-model-fallback-kvm.x86_64-5.0.0.xml | 29 - ...-host-model-fallback-kvm.x86_64-5.1.0.args | 33 - ...u-host-model-fallback-kvm.x86_64-5.1.0.xml | 29 - ...-host-model-fallback-tcg.x86_64-4.2.0.args | 33 - ...u-host-model-fallback-tcg.x86_64-4.2.0.xml | 29 - ...-host-model-fallback-tcg.x86_64-5.0.0.args | 33 - ...u-host-model-fallback-tcg.x86_64-5.0.0.xml | 29 - ...-host-model-fallback-tcg.x86_64-5.1.0.args | 33 - ...u-host-model-fallback-tcg.x86_64-5.1.0.xml | 29 - .../cpu-host-model-kvm.x86_64-4.2.0.args | 38 - .../cpu-host-model-kvm.x86_64-4.2.0.xml | 48 - .../cpu-host-model-kvm.x86_64-5.0.0.args | 38 - .../cpu-host-model-kvm.x86_64-5.0.0.xml | 48 - .../cpu-host-model-kvm.x86_64-5.1.0.args | 38 - .../cpu-host-model-kvm.x86_64-5.1.0.xml | 48 - ...ost-model-nofallback-kvm.x86_64-4.2.0.args | 33 - ...host-model-nofallback-kvm.x86_64-4.2.0.xml | 29 - ...ost-model-nofallback-kvm.x86_64-5.0.0.args | 33 - ...host-model-nofallback-kvm.x86_64-5.0.0.xml | 29 - ...ost-model-nofallback-kvm.x86_64-5.1.0.args | 33 - ...host-model-nofallback-kvm.x86_64-5.1.0.xml | 29 - ...ost-model-nofallback-tcg.x86_64-4.2.0.args | 33 - ...host-model-nofallback-tcg.x86_64-4.2.0.xml | 29 - ...ost-model-nofallback-tcg.x86_64-5.0.0.args | 33 - ...host-model-nofallback-tcg.x86_64-5.0.0.xml | 29 - ...ost-model-nofallback-tcg.x86_64-5.1.0.args | 33 - ...host-model-nofallback-tcg.x86_64-5.1.0.xml | 29 - .../cpu-host-model-tcg.x86_64-4.2.0.args | 38 - .../cpu-host-model-tcg.x86_64-4.2.0.xml | 48 - .../cpu-host-model-tcg.x86_64-5.0.0.args | 38 - .../cpu-host-model-tcg.x86_64-5.0.0.xml | 48 - .../cpu-host-model-tcg.x86_64-5.1.0.args | 38 - .../cpu-host-model-tcg.x86_64-5.1.0.xml | 48 - ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 45 - ...disk-network-tlsx509-vxhs.x86_64-5.0.0.xml | 56 - .../disk-network-tlsx509-vxhs.xml | 50 - .../disk-network-vxhs.x86_64-5.0.0.args | 35 - .../disk-network-vxhs.x86_64-5.0.0.xml | 38 - tests/qemuxmlconfdata/disk-network-vxhs.xml | 32 - .../disk-vhostuser-numa.x86_64-4.2.0.args | 39 - .../disk-vhostuser-numa.x86_64-4.2.0.xml | 48 - .../fips-enabled.x86_64-5.1.0.args | 37 - .../fips-enabled.x86_64-5.1.0.xml | 40 - ...dev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args | 36 - ...tdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml | 45 - .../hugepages-memaccess3.x86_64-5.1.0.err | 1 - ...iothreads-disk-virtio-ccw.s390x-4.2.0.args | 39 - .../iothreads-disk-virtio-ccw.s390x-4.2.0.xml | 41 - .../iothreads-disk-virtio-ccw.xml | 34 - ...acpi-root-hotplug-disable.x86_64-5.1.0.err | 1 - ...-acpi-root-hotplug-enable.x86_64-5.1.0.err | 1 - .../pseries-features.ppc64-4.2.0.args | 30 - .../pseries-features.ppc64-4.2.0.xml | 40 - ...q35-default-devices-only.x86_64-4.2.0.args | 38 - .../q35-default-devices-only.x86_64-4.2.0.xml | 50 - .../q35-multifunction.x86_64-4.2.0.args | 53 - .../q35-multifunction.x86_64-4.2.0.xml | 125 - .../q35-pcie-autoadd.x86_64-4.2.0.args | 67 - .../q35-pcie-autoadd.x86_64-4.2.0.xml | 154 - .../q35-pcie.x86_64-4.2.0.args | 68 - .../qemuxmlconfdata/q35-pcie.x86_64-4.2.0.xml | 158 - .../q35-virt-manager-basic.x86_64-4.2.0.args | 63 - .../q35-virt-manager-basic.x86_64-4.2.0.xml | 128 - .../sound-device.x86_64-4.2.0.args | 49 - .../sound-device.x86_64-4.2.0.xml | 61 - ...alloon-freepage-reporting.x86_64-5.0.0.err | 1 - tests/qemuxmlconftest.c | 47 - 110 files changed, 11 insertions(+), 240326 deletions(-) rename tests/domaincapsdata/{qemu_5.1.0.sparc.xml => qemu_5.2.0.sparc.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies delete mode 100644 tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml delete mode 100644 tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml rename tests/qemucapabilitiesdata/{caps_5.1.0_sparc.replies => caps_5.2.0_sparc.replies} (99%) rename tests/qemucapabilitiesdata/{caps_5.1.0_sparc.xml => caps_5.2.0_sparc.xml} (96%) delete mode 100644 tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.xml delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args delete mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.xml delete mode 100644 tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args delete mode 100644 tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml delete mode 100644 tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.xml delete mode 100644 tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.args delete mode 100644 tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.xml delete mode 100644 tests/qemuxmlconfdata/disk-network-vxhs.xml delete mode 100644 tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.args delete mode 100644 tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.xml delete mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-5.1.0.err delete mode 100644 tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.xml delete mode 100644 tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err delete mode 100644 tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err delete mode 100644 tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.args delete mode 100644 tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.xml delete mode 100644 tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err -- 2.44.2

2 18