- Devel - libvirt List Archives

[PATCH] util: Fix comment in virBitmapNewData
by Martin Kletzander 26 Mar '26

26 Mar '26

From: Martin Kletzander <mkletzan(a)redhat.com> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. src/util/virbitmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 1a3e75671c25..78545501b791 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -601,8 +601,7 @@ virBitmapNewCopy(virBitmap *src) * Allocate a bitmap from a chunk of data containing bits * information * - * Returns a pointer to the allocated bitmap or NULL if - * memory cannot be allocated. + * Returns a pointer to the allocated bitmap. */ virBitmap * virBitmapNewData(const void *data, -- 2.53.0

1 0

[PATCH] tests/virhostcputest: Remove duplicit g_autofree
by Martin Kletzander 26 Mar '26

26 Mar '26

From: Martin Kletzander <mkletzan(a)redhat.com> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. tests/virhostcputest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index cf310cb4cec4..4e65e5febf93 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -218,7 +218,7 @@ linuxTestNodeCPUStats(const void *data) const struct nodeCPUStatsData *testData = data; int result = -1; g_autofree char *cpustatfile = NULL; - g_autofree g_autofree char *outfile = NULL; + g_autofree char *outfile = NULL; cpustatfile = g_strdup_printf("%s/virhostcpudata/linux-cpustat-%s.stat", abs_srcdir, testData->name); -- 2.53.0

1 0

[PATCH v2 0/4] hyperv: Add snapshot create/delete support
by Jonathon Jongsma 24 Mar '26

24 Mar '26

Add ability to create and delete basic snapshots in thed hyperv driver. Changes in v2: - re-word error message about configuring disks / memory for snapshots - split out the utility function for extracting async method output params Jonathon Jongsma (4): hyperv: Add snapshot related WMI class definitions hyperv: Implement domainSnapshotDelete() hyperv: Add a utility function for getting method output params hyperv: Implement domainSnapshotCreateXML() src/hyperv/hyperv_driver.c | 129 ++++++++++++++++++++++++ src/hyperv/hyperv_wmi.c | 139 ++++++++++++++++++++++++++ src/hyperv/hyperv_wmi.h | 17 ++++ src/hyperv/hyperv_wmi_generator.input | 42 ++++++++ 4 files changed, 327 insertions(+) -- 2.53.0

1 4

[PATCH 0/4] qemu: Fix multiple issues in block information gathering
by Peter Krempa 24 Mar '26

24 Mar '26

virDomainGetBlockInfo didn't log arguments and updates of disk state qemuDomainGetStatsBlockExportDisk didn't export information about <dataStore> in the bulk stats. Peter Krempa (4): virDomainGetBlockInfo: Log 'disk' argument qemuDomainGetStatsBlockExportDisk: Export stats also for 'dataStore' qemu: monitor: Separate stats from capacity properties in qemuBlockStats qemuDomainGetBlockInfo: Add debug statement when updating disk physical size src/libvirt-domain.c | 9 ++++++--- src/qemu/qemu_driver.c | 15 +++++++++++++++ src/qemu/qemu_monitor.h | 1 + 3 files changed, 22 insertions(+), 3 deletions(-) -- 2.53.0

2 5

[PATCH v2 0/2] qemu: Fix monitor access during offline migration
by Peter Krempa 24 Mar '26

24 Mar '26

New version to fix offline migration. This time for real. Previously I thought I've got the right place, but my migration setup wasn't ready so I didn't bother actually testing it. It turns out that the place I've fixed before didn't actually trigger the bug due to a lucky scenario. Changes to v1: - qemuMigrationSrcBeginXML: Don't call 'qemuMigrationSrcBeginPhaseBlockDirtyBitmaps' with offline VM New patch which actually fixes the bug. - qemuMigrationSrcBeginPhase: Don't call 'qemuBlockNodesEnsureActive' with offline VM Updated commit message now states why 'qemuBlockNodesEnsureActive' doesn't actually cause the same failure due to absence of qemuCaps on an offline VM. Peter Krempa (2): qemuMigrationSrcBeginXML: Don't call 'qemuMigrationSrcBeginPhaseBlockDirtyBitmaps' with offline VM qemuMigrationSrcBeginPhase: Don't call 'qemuBlockNodesEnsureActive' with offline VM src/qemu/qemu_migration.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.53.0

2 3

[PATCH] build: Drop numad dependency on numactl
by Jim Fehlig 24 Mar '26

24 Mar '26

From: Jim Fehlig <jfehlig(a)suse.com> The numad and numactl options are orthogonal. numactl support does not need to be enabled to enable numad support. Drop the dependency. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- AFAIK that's the case. And if not, the dependency should be expressed in the numad package. meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 57a87b9a78..1c2d0deb34 100644 --- a/meson.build +++ b/meson.build @@ -2020,10 +2020,10 @@ if not get_option('nss').disabled() endif endif -if not get_option('numad').disabled() and numactl_dep.found() and host_machine.system() == 'linux' +if not get_option('numad').disabled() and host_machine.system() == 'linux' conf.set('WITH_NUMAD', 1) elif get_option('numad').enabled() - error('You must have a Linux host with numactl enabled for numad support.') + error('You must have a Linux host for numad support.') endif # nwfilter should only be compiled for linux, and only if the -- 2.51.0

2 2

[PATCH-for-11.0] qapi: Remove deprecated SchemaInfoEnumMember::values field
by Philippe Mathieu-Daudé 24 Mar '26

24 Mar '26

SchemaInfoEnumMember::values field has been deprecated for more than 5 years (see commit 75ecee72625 "qapi: Enable enum member introspection to show more than name"), it should be safe enough to remove. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 7 +++++++ qapi/introspect.json | 12 +----------- scripts/qapi/introspect.py | 3 +-- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index a6d6a713265..afb0d383c27 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -101,12 +101,6 @@ Use the more generic commands ``block-export-add`` and ``block-export-del`` instead. As part of this deprecation, where ``nbd-server-add`` used a single ``bitmap``, the new ``block-export-add`` uses a list of ``bitmaps``. -``query-qmp-schema`` return value member ``values`` (since 6.2) -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Member ``values`` in return value elements with meta-type ``enum`` is -deprecated. Use ``members`` instead. - ``drive-backup`` (since 6.2) '''''''''''''''''''''''''''' diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index e75db084108..9eb4ef67ff4 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -787,6 +787,13 @@ $VM,debug-threads=on`` instead. This argument has always been ignored. +``query-qmp-schema`` return value member ``values`` (removed in 11.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Member ``values`` in return value elements with meta-type ``enum`` has +been replaced by ``members`` instead. + + QEMU Machine Protocol (QMP) events ---------------------------------- diff --git a/qapi/introspect.json b/qapi/introspect.json index c8432c8ed8e..71b10baabaf 100644 --- a/qapi/introspect.json +++ b/qapi/introspect.json @@ -159,22 +159,12 @@ # @members: the enum type's members, in no particular order. # (since 6.2) # -# @values: the enumeration type's member names, in no particular -# order. Redundant with @members. Just for backward -# compatibility. -# -# Features: -# -# @deprecated: Member @values is deprecated. Use @members instead. -# # Values of this type are JSON string on the wire. # # Since: 2.5 ## { 'struct': 'SchemaInfoEnum', - 'data': { 'members': [ 'SchemaInfoEnumMember' ], - 'values': { 'type': [ 'str' ], - 'features': [ 'deprecated' ] } } } + 'data': { 'members': [ 'SchemaInfoEnumMember' ] } } ## # @SchemaInfoEnumMember: diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 7e28de2279a..daeb3d77b23 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -318,8 +318,7 @@ def visit_enum_type(self, name: str, info: Optional[QAPISourceInfo], prefix: Optional[str]) -> None: self._gen_tree( name, 'enum', - {'members': [self._gen_enum_member(m) for m in members], - 'values': [Annotated(m.name, m.ifcond) for m in members]}, + {'members': [self._gen_enum_member(m) for m in members]}, ifcond, features ) -- 2.53.0

2 1

[PATCH v2 00/21] qom: introduce property flags to track external user input
by Zhao Liu 23 Mar '26

23 Mar '26

Hi, This is the v2 trying to introduce property flags to detect user's property setting (from CLI/QMP/HMP). I dropped RFC tag since previous RFC v1 [1]. Though this work the follow-up of v2.6 & v2.7 machines' removal [2], now it is decoupled from [2] totally since v2 doesn't detect compat property and only focuses on external user setting, so this series is based on master branch at the commit 28a6ca268c2c ("Merge tag 'single- binary-20260203' of https://github.com/philmd/qemu into staging"). And you can also find the code here: https://gitlab.com/zhao.liu/qemu/-/tree/prop-flags-v2.3-02-08-2026 This series introduces 3 property flags: * USER_SET: Any external user property setting (from CLI/HMP/QMP) is marked as USER_SET. * DEPRECATED: Once a property is marked as DEPRECATED, any external user property setting will trigger a warning. * INTERNAL: Once a property is marked as INTERNAL, any external user property setting will cause an error. More details or document for these 3 flags, you can refer patch 7. Compared with RFC v1, v2 mainly: * introduce USER_SET property flag to identify all user's setting. - patch 7 for document. * construct DEPRECATED & INTERNAL flag on USER_SET. - patch 7 for document. * cover more comprehensive user set cases. - patch 8-13. * provide examples about new flags (USER_SET/DEPRECATED/INTELNAL). - patch 15/16/17 are examples for DEPRECATED flag. - patch 18 is the example for INTERNAL flag. - patch 20 is the example for USER_SET flag. I think v2 should now cover "nearly" all cases (patch 8-13) where users set properties: one approach is to trace the call chain of object_property_set(). Even if there are cases that were missed, they can be easily addressed based on this series: object_property_set(obj, ...); /* Insert this call after object_property_set(). */ object_property_set_flags(obj, ..., OBJ_PROP_FLAG_USER_SET, ...); [1]: RFC v1: https://lore.kernel.org/qemu-devel/20251202170502.3228625-1-zhao1.liu@intel… [2]: hw/i386/pc: Remove deprecated 2.6 and 2.7 PC machines https://lore.kernel.org/qemu-devel/20260108033051.777361-1-zhao1.liu@intel.… Thanks and Best Regards, Zhao --- Zhao Liu (21): qom/object: use BIT macro for ObjectPropertyFlags qom/object: cache ObjectPropertyFlags in ObjectProperty qom/object: factor out object_class_property_try_add() qom/object: add flags argument in object_{class_}property_try_add() qom/object: rename object_{class_}property_try_add() to object_{class_}property_add_full() qom/object: add helpers to set/get/clear property flags qom/object: introduce user interaction flags for properties qom/object: add from_user argument in object_property_parse() qom/object: mark global property set from CLI as USER_SET qom/qom-hmp-cmd: mark properties set from HMP (non-JSON) "qom-set" as USER_SET qom/qom-qmp-cmd: mark properties set from QMP/HMP (JSON) "qom-set" as USER_SET qom/object_interfaces: mark properties set from qdict & keyval as USER_SET system/vl: mark property set in object_parse_property_opt() as USER_SET hw/core/qdev-properties: allow qdev properties accept flags target/i386: deprecate fill-mtrr-mask property target/i386: deprecate cpuid-0xb property hw/intc/ioapic: deprecate version property target/i386: mark x-consistent-cache property as internal-only target/i386: remove redundant validation for lbr-fmt property target/i386: detect user provided lbr-fmt via property flag hw/core/qdev-properties: support valid default value for DEFINE_PROP_UINT64_CHECKMASK docs/about/deprecated.rst | 31 +++++ hw/core/qdev-properties.c | 29 ++-- hw/i386/sgx.c | 2 +- hw/intc/ioapic.c | 3 +- include/hw/core/qdev-properties.h | 38 +++--- include/qom/object.h | 215 +++++++++++++++++++++++++++--- qom/object.c | 177 ++++++++++++++++++++---- qom/object_interfaces.c | 5 + qom/qom-hmp-cmds.c | 2 +- qom/qom-qmp-cmds.c | 7 +- system/vl.c | 6 +- target/i386/cpu.c | 28 ++-- 12 files changed, 448 insertions(+), 95 deletions(-) -- 2.34.1

9 44

[PATCH v1 1/2] qemuxmlconftest: Update 's390x' tests using 'virt-4.2' machine type
by Shalini Chellathurai Saroja 23 Mar '26

23 Mar '26

The 'virt 4.2' machine type is removed in QEMU 10.2. So pin the existing tests to qemu-10.0 and add tests for 'virt-10.0' machine type. Signed-off-by: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- ...cpu-kvm-ccw-virtio-10.0.s390x-latest.args} | 2 +- ...t-cpu-kvm-ccw-virtio-10.0.s390x-latest.xml | 25 +++++++++++++++ .../s390-default-cpu-kvm-ccw-virtio-10.0.xml | 16 ++++++++++ ...t-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args | 32 +++++++++++++++++++ ...t-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.xml} | 0 ...-cpu-tcg-ccw-virtio-10.0.s390x-latest.args | 32 +++++++++++++++++++ ...t-cpu-tcg-ccw-virtio-10.0.s390x-latest.xml | 27 ++++++++++++++++ .../s390-default-cpu-tcg-ccw-virtio-10.0.xml | 16 ++++++++++ ...-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.args} | 0 ...t-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.xml} | 0 tests/qemuxmlconftest.c | 6 ++-- 11 files changed, 153 insertions(+), 3 deletions(-) rename tests/qemuxmlconfdata/{s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args => s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.args} (95%) create mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.xml create mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args rename tests/qemuxmlconfdata/{s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml => s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.xml} (100%) create mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.args create mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.xml rename tests/qemuxmlconfdata/{s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args => s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.args} (100%) rename tests/qemuxmlconfdata/{s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml => s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.xml} (100%) diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.args similarity index 95% rename from tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.args index 9fc3134702..71678a29cf 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -name guest=test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ --machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-machine s390-ccw-virtio-10.0,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ -cpu gen17a-base,nnpa=on,aen=on,gen17ptff=on,ccf=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,msa13_pckmo=on,msa11_pckmo=on,msa10_pckmo=on,sthyi=on,edat=on,ri=on,deflate=on,msa13=on,msa11=on,msa10=on,edat2=on,vxpdeh3=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh3=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,ineff_nc_tx=on,apqci=on,cte=off,ais=on,bpb=off,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=off,cmm=on,vxpdeh2=on,csske=off \ -m size=262144k \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.xml new file mode 100644 index 0000000000..b07f5ca23e --- /dev/null +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>test</name> + <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid> + <memory unit='KiB'>262144</memory> + <currentMemory unit='KiB'>262144</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio-10.0'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='host-model' check='partial'/> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <controller type='pci' index='0' model='pci-root'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> + </memballoon> + <panic model='s390'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.xml new file mode 100644 index 0000000000..c29c7a4382 --- /dev/null +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.xml @@ -0,0 +1,16 @@ +<domain type='kvm'> + <name>test</name> + <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid> + <memory>262144</memory> + <currentMemory>262144</currentMemory> + <os> + <type arch='s390x' machine='s390-ccw-virtio-10.0'>hvm</type> + </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-s390x</emulator> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args new file mode 100644 index 0000000000..3f3de9a668 --- /dev/null +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-test \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=test,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ +-machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-accel kvm \ +-cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=off,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,apqci=on,cte=off,ais=on,bpb=off,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=off,cmm=on,vxpdeh2=on \ +-m size=262144k \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.xml similarity index 100% rename from tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.xml diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.args new file mode 100644 index 0000000000..a3e60cd6ab --- /dev/null +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-test \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=test,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ +-machine s390-ccw-virtio-10.0,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-accel tcg \ +-cpu qemu \ +-m size=262144k \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.xml new file mode 100644 index 0000000000..77a299744c --- /dev/null +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>test</name> + <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid> + <memory unit='KiB'>262144</memory> + <currentMemory unit='KiB'>262144</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio-10.0'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</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-s390x</emulator> + <controller type='pci' index='0' model='pci-root'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> + </memballoon> + <panic model='s390'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.xml new file mode 100644 index 0000000000..3d687585cd --- /dev/null +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.xml @@ -0,0 +1,16 @@ +<domain type='qemu'> + <name>test</name> + <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid> + <memory>262144</memory> + <currentMemory>262144</currentMemory> + <os> + <type arch='s390x' machine='s390-ccw-virtio-10.0'>hvm</type> + </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-s390x</emulator> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.args similarity index 100% rename from tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.args diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.xml similarity index 100% rename from tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.xml diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 4b396d521a..14aa723ec5 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2977,8 +2977,10 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-tcg-pseries-3.1", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-kvm-pseries-4.2", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-tcg-pseries-4.2", "ppc64"); - DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-4.2", "s390x"); - DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-4.2", "s390x"); + DO_TEST_CAPS_ARCH_VER("s390-default-cpu-kvm-ccw-virtio-4.2", "s390x", "10.0.0"); + DO_TEST_CAPS_ARCH_VER("s390-default-cpu-tcg-ccw-virtio-4.2", "s390x", "10.0.0"); + DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-10.0", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-10.0", "s390x"); DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-pc", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-pc", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-q35", "x86_64"); -- 2.52.0

2 4

[PATCH 0/5] qemu: Remove VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE support and fix <readonly>
by Peter Krempa 23 Mar '26

23 Mar '26

VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE isn't supported since qemu-4.0 but we do declare that it is supported. Remove that. Also <readonly> converts to ",readonly" which is deprecated and removed and ",readonly=on" must be used instead. Peter Krempa (5): qemu: validate: Reject configs with VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE qemu: capabilities: Don't advertise support for VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE qemuBuildFSStr: Drop code for VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE qemuBuildFSStr: Properly format 'readonly' attribute qemuxmlconftest: Add missing test for <readonly> attribute of p9-fs devices src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_command.c | 5 +---- src/qemu/qemu_validate.c | 8 +------- tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml | 1 - tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml | 1 - tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml | 1 - tests/domaincapsdata/qemu_10.0.0.aarch64.xml | 1 - tests/domaincapsdata/qemu_10.0.0.ppc64.xml | 1 - tests/domaincapsdata/qemu_10.0.0.s390x.xml | 1 - tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml | 1 - tests/domaincapsdata/qemu_10.0.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml | 1 - tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml | 1 - tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_10.1.0.s390x.xml | 1 - tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml | 1 - tests/domaincapsdata/qemu_10.1.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml | 1 - tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml | 1 - tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_10.2.0-virt.aarch64.xml | 1 - tests/domaincapsdata/qemu_10.2.0.aarch64.xml | 1 - tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml | 1 - tests/domaincapsdata/qemu_10.2.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_11.0.0-virt.aarch64.xml | 1 - tests/domaincapsdata/qemu_11.0.0.aarch64.xml | 1 - tests/domaincapsdata/qemu_11.0.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 - tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 - tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 1 - tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml | 1 - tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 1 - tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_7.2.0.ppc.xml | 1 - tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.1.0.s390x.xml | 1 - tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml | 1 - tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml | 1 - tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml | 1 - tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 1 - tests/domaincapsdata/qemu_8.2.0.armv7l.xml | 1 - tests/domaincapsdata/qemu_8.2.0.s390x.xml | 1 - tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_9.0.0.sparc.xml | 1 - tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml | 1 - tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml | 1 - tests/domaincapsdata/qemu_9.1.0.s390x.xml | 1 - tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 1 - tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml | 1 - tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml | 1 - tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 1 - tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml | 1 - tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_9.2.0.s390x.xml | 1 - tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml | 1 - tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 1 - tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args | 4 +--- tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.xml | 8 +------- tests/qemuxmlconfdata/fs9p-ccw.xml | 5 ----- tests/qemuxmlconfdata/fs9p.x86_64-latest.args | 4 ++-- tests/qemuxmlconfdata/fs9p.x86_64-latest.xml | 9 +++++---- tests/qemuxmlconfdata/fs9p.xml | 9 +++++---- 91 files changed, 17 insertions(+), 120 deletions(-) -- 2.53.0

2 6