- Devel - libvirt List Archives

[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

[RFC] Reintroducing customisable hotplug timeouts
by Akash Kulhalli 24 Mar '26

24 Mar '26

I'd like to resurface an earlier proposal [1] to make the unplug timeout user-configurable. With production guests running sustained, non-trivial workloads, we find that hot(un)plug operations regularly takes longer than the current default of 5s. However, the inability to easily configure this timeout means that in the worst case a recompilation with appropriate values set is required for each deployment, which is cumbersome to maintain and patch. The previous proposal [1] also initially made the timeout configurable, however that was specifically for the ppc64 architecture. Therefore, imposing this change for an entire architecture made sense, since it was a universal requirement for that platform. With deployment environments as diverse and varied as x86, having a single, inconfigurable value does not make as much sense now. For x86, such a change is not ideal since the desired timeout value depends very heavily on the deployment environment in use - if it is being performed by a human anything more than 10s is an undesirable user experience [2], as pointed out in the original discussion. However, more relaxed timeout values (e.g. 15-20s) can be more acceptable if the operations are background/ not directly user-facing. It is in these cases where the ability to change the timeout more easily becomes more desirable. To prevent misconfiguration, while maintaining the same out-of-box experience for existing users, I'd also like to propose the following- 1. As mentioned in the original proposal [1], the timeout cannot be set to a value lower than the default timeout of 5s; in these cases a warning will be emitted and the timeout will be reset to the default value. 2. Including an upper cap would also be desirable, in my opinion - any API consumer should not wait endlessly for an async operation to finish. 3. This configuration option will only be described in qemu.conf, not imposed - the out-of-box experience will remain unchanged at the current default (5s) for everyone who does not wish to tweak/is unaware of this value. An administrator who knowingly changes these values is therefore not blindsided by any perceived "hangs" resulting from the use of an increased timeout window. Since this would be a clearly documented and explicitly opt-in behaviour, the benefits in the form of easy modification based on evolving operational needs would be quite significant. Given the varying nature of production environments and specific operational needs at scale, it would therefore be beneficial to reconsider the merits of the original proposal. [1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/TXYV… [2] https://www.nngroup.com/articles/response-times-3-important-limits/

4 11

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

24 Mar '26

On 24/3/26 04:19, Pierrick Bouvier wrote: > On 3/23/26 8:21 AM, Philippe Mathieu-Daudé wrote: >> 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(-) >> > > By curiosity, is this patch goal is simply to remove a deprecated > feature/code, or does it unlock something beyond it? > No judgment here, that's a genuine question, and both are valid reasons! In a previous thread Daniel said past deprecation period, feature must be removed, otherwise undeprecated and re-introduced. I'm just trying to be consistent with the deprecation process, removing what doesn't seem worth to re-introduce (for the code I'm able to figure out at least). Maybe we should clarify the deprecation process, clarifying that, and mentioning that maintainers sending pull request to commit patches with deprecations are also a commitment to remove code when the proper released is out. > Looks good to me, to the limit of my qapi knowledge :). > Reviewed-by: Pierrick Bouvier <pierrick.bouvier(a)linaro.org> Thanks!

3 2

Re: [PATCH-for-11.0] qapi: Remove deprecated SchemaInfoEnumMember::values field
by Peter Krempa 24 Mar '26

24 Mar '26

On Mon, Mar 23, 2026 at 20:19:45 -0700, Pierrick Bouvier wrote: > On 3/23/26 8:21 AM, Philippe Mathieu-Daudé wrote: > > 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(-) > > > > By curiosity, is this patch goal is simply to remove a deprecated > feature/code, or does it unlock something beyond it? > No judgment here, that's a genuine question, and both are valid reasons! This patch also shaves off a nice 1.3k lines of duplicate data from the prettified reply from query-qmp-schema. (In libvirt we capture dumps of the schema which we use for internal testing as well as validation that the monitor command handlers and commandline generators (by proxy) don't use deprecated and or non-existent members.) > Looks good to me, to the limit of my qapi knowledge :). > Reviewed-by: Pierrick Bouvier <pierrick.bouvier(a)linaro.org> On behalf of libvirt (and since I didn't look at the code at all; just at the output): ACKed-by: Peter Krempa <pkrempa(a)redhat.com>

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-for-11.0] qapi: Remove deprecated SchemaInfoEnumMember::values field
by Philippe Mathieu-Daudé 23 Mar '26

23 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

1 0

[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