[PATCH 0/5] qemu: Remove VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE support and fix <readonly>
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
From: Peter Krempa <pkrempa@redhat.com> The support was dropped since v3.1.0-29-g93aee84f5. Refuse the config at validation step. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_validate.c | 8 +------- 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 | 2 -- tests/qemuxmlconfdata/fs9p.x86_64-latest.xml | 6 ------ tests/qemuxmlconfdata/fs9p.xml | 5 ----- 7 files changed, 3 insertions(+), 35 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index b3db2c71d8..642244b62e 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -5136,13 +5136,7 @@ qemuValidateDomainDeviceDefFS(virDomainFSDef *fs, break; case VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE: - if (fs->accessmode != VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("only supports passthrough accessmode")); - return -1; - } - break; - + /* removed since qemu 4.0.0 see v3.1.0-29-g93aee84f57 */ case VIR_DOMAIN_FS_DRIVER_TYPE_LOOP: case VIR_DOMAIN_FS_DRIVER_TYPE_NBD: case VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP: diff --git a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args index c7353dd8e4..6771547e80 100644 --- a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args @@ -32,9 +32,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-9p-ccw","id":"fs0","fsdev":"fsdev-fs0","mount_tag":"/import/from/host","devno":"fe.0.0001"}' \ -fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2 \ -device '{"driver":"virtio-9p-ccw","id":"fs1","fsdev":"fsdev-fs1","mount_tag":"/import/from/host2","devno":"fe.0.0002"}' \ --fsdev handle,writeout=immediate,id=fsdev-fs2,path=/export/to/guest3 \ --device '{"driver":"virtio-9p-ccw","id":"fs2","fsdev":"fsdev-fs2","mount_tag":"/import/from/host3","devno":"fe.0.0003"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0004"}' \ +-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0003"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.xml b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.xml index eb85ac4824..debf50c99b 100644 --- a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.xml +++ b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.xml @@ -35,15 +35,9 @@ <target dir='/import/from/host2'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/> </filesystem> - <filesystem type='mount' accessmode='passthrough'> - <driver type='handle' wrpolicy='immediate'/> - <source dir='/export/to/guest3'/> - <target dir='/import/from/host3'/> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/> - </filesystem> <audio id='1' type='none'/> <memballoon model='virtio'> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0004'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/> </memballoon> <panic model='s390'/> </devices> diff --git a/tests/qemuxmlconfdata/fs9p-ccw.xml b/tests/qemuxmlconfdata/fs9p-ccw.xml index ca221abcce..f3d71b4997 100644 --- a/tests/qemuxmlconfdata/fs9p-ccw.xml +++ b/tests/qemuxmlconfdata/fs9p-ccw.xml @@ -27,10 +27,5 @@ <source dir='/export/to/guest2'/> <target dir='/import/from/host2'/> </filesystem> - <filesystem> - <driver type='handle' wrpolicy='immediate'/> - <source dir='/export/to/guest3'/> - <target dir='/import/from/host3'/> - </filesystem> </devices> </domain> diff --git a/tests/qemuxmlconfdata/fs9p.x86_64-latest.args b/tests/qemuxmlconfdata/fs9p.x86_64-latest.args index 6baa45a828..ece83b6b24 100644 --- a/tests/qemuxmlconfdata/fs9p.x86_64-latest.args +++ b/tests/qemuxmlconfdata/fs9p.x86_64-latest.args @@ -30,8 +30,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_tag":"/import/from/host","bus":"pci.0","addr":"0x2"}' \ -fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2 \ -device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_tag":"/import/from/host2","bus":"pci.0","addr":"0x3"}' \ --fsdev handle,writeout=immediate,id=fsdev-fs2,path=/export/to/guest3 \ --device '{"driver":"virtio-9p-pci","id":"fs2","fsdev":"fsdev-fs2","mount_tag":"/import/from/host3","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/fs9p.x86_64-latest.xml b/tests/qemuxmlconfdata/fs9p.x86_64-latest.xml index 9d31f21bf3..91cb445c9f 100644 --- a/tests/qemuxmlconfdata/fs9p.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/fs9p.x86_64-latest.xml @@ -30,12 +30,6 @@ <target dir='/import/from/host2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </filesystem> - <filesystem type='mount' accessmode='passthrough'> - <driver type='handle' wrpolicy='immediate'/> - <source dir='/export/to/guest3'/> - <target dir='/import/from/host3'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </filesystem> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> diff --git a/tests/qemuxmlconfdata/fs9p.xml b/tests/qemuxmlconfdata/fs9p.xml index a86bf26c56..b7475c9f94 100644 --- a/tests/qemuxmlconfdata/fs9p.xml +++ b/tests/qemuxmlconfdata/fs9p.xml @@ -24,11 +24,6 @@ <source dir='/export/to/guest2'/> <target dir='/import/from/host2'/> </filesystem> - <filesystem> - <driver type='handle' wrpolicy='immediate'/> - <source dir='/export/to/guest3'/> - <target dir='/import/from/host3'/> - </filesystem> <memballoon model='none'/> </devices> </domain> -- 2.53.0
From: Peter Krempa <pkrempa@redhat.com> The capability output was hardcoded but is no longer supported. Drop it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- 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 - 83 files changed, 1 insertion(+), 84 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 65d8aac4fb..d480483317 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6916,8 +6916,7 @@ virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps *qemuCaps, VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS); VIR_DOMAIN_CAPS_ENUM_SET(filesystem->driverType, - VIR_DOMAIN_FS_DRIVER_TYPE_PATH, - VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE); + VIR_DOMAIN_FS_DRIVER_TYPE_PATH); } diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml index bf6393dc03..db891b6666 100644 --- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml @@ -887,7 +887,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml index d6f710e56e..c3d8f6e754 100644 --- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml @@ -1786,7 +1786,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml index fb031b916e..afc3f00495 100644 --- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml @@ -1869,7 +1869,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml index 8a5348d2a8..81f08a8f79 100644 --- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml @@ -1869,7 +1869,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml index 334aa5e31f..02513d9844 100644 --- a/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml @@ -185,7 +185,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.0.0.aarch64.xml b/tests/domaincapsdata/qemu_10.0.0.aarch64.xml index 334aa5e31f..02513d9844 100644 --- a/tests/domaincapsdata/qemu_10.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_10.0.0.aarch64.xml @@ -185,7 +185,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.0.0.ppc64.xml b/tests/domaincapsdata/qemu_10.0.0.ppc64.xml index 8082fb9556..7e0c161837 100644 --- a/tests/domaincapsdata/qemu_10.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_10.0.0.ppc64.xml @@ -131,7 +131,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.0.0.s390x.xml b/tests/domaincapsdata/qemu_10.0.0.s390x.xml index ca741192ba..bb7ac562b7 100644 --- a/tests/domaincapsdata/qemu_10.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_10.0.0.s390x.xml @@ -308,7 +308,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml index 6a4ea003f7..c1e1ceb591 100644 --- a/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml @@ -885,7 +885,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml index f12dd845ba..c5d88c5a35 100644 --- a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml @@ -1784,7 +1784,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml index 6c370de5dd..fac2de36a3 100644 --- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml +++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml @@ -940,7 +940,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml index 60cc9eee3d..fd57e6140b 100644 --- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml @@ -2131,7 +2131,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml index 4afecf627f..07a43aea11 100644 --- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml +++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml @@ -2251,7 +2251,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml index b3c7bc60b5..08087e7c6e 100644 --- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml @@ -2255,7 +2255,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.1.0.s390x.xml b/tests/domaincapsdata/qemu_10.1.0.s390x.xml index 976943491e..21006dd5a9 100644 --- a/tests/domaincapsdata/qemu_10.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_10.1.0.s390x.xml @@ -376,7 +376,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml index 7d33362f0e..afc8277f84 100644 --- a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml +++ b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml @@ -938,7 +938,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml index 9cb65712a4..17a37b4b53 100644 --- a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml @@ -2129,7 +2129,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml index e30b64e068..885108ac70 100644 --- a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml +++ b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml @@ -141,7 +141,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml index fde3055148..8873fcd4de 100644 --- a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml @@ -1237,7 +1237,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml index 771ef3a0f6..86343810df 100644 --- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml +++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml @@ -2252,7 +2252,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml index f0e08907ff..45d9a2cea1 100644 --- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml @@ -2255,7 +2255,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_10.2.0-virt.aarch64.xml index beb9a49ee3..a3eee83d89 100644 --- a/tests/domaincapsdata/qemu_10.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_10.2.0-virt.aarch64.xml @@ -175,7 +175,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.2.0.aarch64.xml b/tests/domaincapsdata/qemu_10.2.0.aarch64.xml index beb9a49ee3..a3eee83d89 100644 --- a/tests/domaincapsdata/qemu_10.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_10.2.0.aarch64.xml @@ -175,7 +175,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml b/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml index 87c35d229c..9c76772fc4 100644 --- a/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml +++ b/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml @@ -139,7 +139,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml index a838126991..8da8bf782d 100644 --- a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml @@ -1235,7 +1235,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml index aa62aa1502..4b951a5ed4 100644 --- a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml @@ -1237,7 +1237,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml index 0bfe92db7d..aef68494d3 100644 --- a/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml @@ -2255,7 +2255,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_11.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_11.0.0-virt.aarch64.xml index 4d41b6427d..f0ff7ebf77 100644 --- a/tests/domaincapsdata/qemu_11.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_11.0.0-virt.aarch64.xml @@ -175,7 +175,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_11.0.0.aarch64.xml b/tests/domaincapsdata/qemu_11.0.0.aarch64.xml index 4d41b6427d..f0ff7ebf77 100644 --- a/tests/domaincapsdata/qemu_11.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_11.0.0.aarch64.xml @@ -175,7 +175,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_11.0.0.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0.x86_64.xml index 29e15817c8..4648a3a071 100644 --- a/tests/domaincapsdata/qemu_11.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0.x86_64.xml @@ -1235,7 +1235,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 96dcc32019..2a1720152c 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -1090,7 +1090,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index a92050ad5b..7ae519a22a 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -1890,7 +1890,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml index 958d20e74c..a8d5060874 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -132,7 +132,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index eb347adce9..b1fe0c0d71 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -1088,7 +1088,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 0c3d00865e..52e0fb3fca 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -1119,7 +1119,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 6b5dff857b..6329ed586c 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1916,7 +1916,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml index d6a6e75bec..1e8a341a29 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -134,7 +134,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index c568ae3d80..1ec5fae356 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -1117,7 +1117,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 5e13f1f7fb..c3c8aa1cfd 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -1086,7 +1086,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index f9114422bd..ef910eb1a0 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -1864,7 +1864,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml index 0b3518a5a8..9a3e8e44ab 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -127,7 +127,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index f574894ad0..f1a52c2af9 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -1084,7 +1084,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml index 1fdde871f8..f06572b7d7 100644 --- a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml @@ -1089,7 +1089,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index b4c4153953..408ed56c2f 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -1091,7 +1091,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 989c3e274c..8c385813f0 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -1569,7 +1569,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 989c3e274c..8c385813f0 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -1569,7 +1569,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata/qemu_7.2.0.ppc.xml index b4bdf3b651..28545a27dd 100644 --- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml +++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml @@ -126,7 +126,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 6efa244ffa..f15fc2ff21 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -1089,7 +1089,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index 70a3b9c7d7..5bce758303 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -1173,7 +1173,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index 0010cfa60e..90fee27397 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -1664,7 +1664,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index ac8c8980e7..ccc712a2d3 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -1171,7 +1171,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index e9d807828a..5314fd6cc8 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -1432,7 +1432,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index e834e3eb82..9bb23f1cea 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -1686,7 +1686,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml index 37417ec648..05c5db9564 100644 --- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml @@ -395,7 +395,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 5de8bc1cd8..2d3841c84d 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -1430,7 +1430,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml index a2f9591382..e5b2ff08ae 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -1433,7 +1433,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml index 1625ddf4e0..781fb6af2e 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml @@ -134,7 +134,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml index ac1c1b840e..fa0d1b4c8a 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -1652,7 +1652,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml index 83fc9e37a7..fb20d51516 100644 --- a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml @@ -184,7 +184,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml index af75894ff1..22000a62fd 100644 --- a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml @@ -138,7 +138,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml index 83fc9e37a7..fb20d51516 100644 --- a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml @@ -184,7 +184,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml index a1ad0529e5..1f04e38092 100644 --- a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml +++ b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml @@ -128,7 +128,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.2.0.s390x.xml b/tests/domaincapsdata/qemu_8.2.0.s390x.xml index 84be7cd967..b557f55ded 100644 --- a/tests/domaincapsdata/qemu_8.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.2.0.s390x.xml @@ -396,7 +396,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index e423689076..241ac58b6d 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -1431,7 +1431,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index 2851138ffe..e06b5b7e0a 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -1434,7 +1434,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 253bed40ed..4cd7024138 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -1582,7 +1582,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.0.0.sparc.xml b/tests/domaincapsdata/qemu_9.0.0.sparc.xml index f999c8ed71..e8c868c6de 100644 --- a/tests/domaincapsdata/qemu_9.0.0.sparc.xml +++ b/tests/domaincapsdata/qemu_9.0.0.sparc.xml @@ -107,7 +107,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> </enum> </filesystem> <tpm supported='no'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 2316859d5b..611eda247f 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -1432,7 +1432,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 1cf269504c..9f241b4031 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -1570,7 +1570,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml index 85dffd3455..1ddf120fe0 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml @@ -145,7 +145,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 76b2707b9c..59280f40c9 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -1687,7 +1687,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml index c052b8329b..efcb197b1f 100644 --- a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml @@ -134,7 +134,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsdata/qemu_9.1.0.s390x.xml index bc62fdfaa4..408c018b1f 100644 --- a/tests/domaincapsdata/qemu_9.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml @@ -260,7 +260,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index baaa17f68d..336e8891f3 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -1568,7 +1568,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml b/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml index 65bb9dc9bd..37b9e0db78 100644 --- a/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml +++ b/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml @@ -178,7 +178,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> </enum> </filesystem> <tpm supported='yes'> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml index a21c69e416..5f67243a48 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml @@ -767,7 +767,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index df0d995276..ec854b6f38 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -1628,7 +1628,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml index 2b860a23ca..0966567de4 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml @@ -1734,7 +1734,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index 24113a3514..26826ffa08 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -1734,7 +1734,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.2.0.s390x.xml b/tests/domaincapsdata/qemu_9.2.0.s390x.xml index bba9ce7558..f79d8cd643 100644 --- a/tests/domaincapsdata/qemu_9.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.2.0.s390x.xml @@ -260,7 +260,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml index f12c89f40b..c56683e9f1 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml @@ -765,7 +765,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 529415bcb4..9d9be7e764 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -1626,7 +1626,6 @@ <filesystem supported='yes'> <enum name='driverType'> <value>path</value> - <value>handle</value> <value>virtiofs</value> </enum> </filesystem> -- 2.53.0
From: Peter Krempa <pkrempa@redhat.com> Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7801d99738..18f33a9d14 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2468,9 +2468,6 @@ qemuBuildFSStr(virDomainFSDef *fs) if (fs->dmode) { virBufferAsprintf(&opt, ",dmode=%04o", fs->dmode); } - } else if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE) { - /* removed since qemu 4.0.0 see v3.1.0-29-g93aee84f57 */ - virBufferAddLit(&opt, "handle"); } if (fs->wrpolicy) -- 2.53.0
From: Peter Krempa <pkrempa@redhat.com> Short-form booleans are deprecated in qemu since qemu 6.0. Switch to the proper 'readonly=on' format. Closes: https://gitlab.com/libvirt/libvirt/-/work_items/864 Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 18f33a9d14..5b7423e354 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2478,7 +2478,7 @@ qemuBuildFSStr(virDomainFSDef *fs) virQEMUBuildBufferEscapeComma(&opt, fs->src->path); if (fs->readonly) - virBufferAddLit(&opt, ",readonly"); + virBufferAddLit(&opt, ",readonly=on"); return virBufferContentAndReset(&opt); } -- 2.53.0
From: Peter Krempa <pkrempa@redhat.com> Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxmlconfdata/fs9p.x86_64-latest.args | 2 ++ tests/qemuxmlconfdata/fs9p.x86_64-latest.xml | 7 +++++++ tests/qemuxmlconfdata/fs9p.xml | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/tests/qemuxmlconfdata/fs9p.x86_64-latest.args b/tests/qemuxmlconfdata/fs9p.x86_64-latest.args index ece83b6b24..d1505cce80 100644 --- a/tests/qemuxmlconfdata/fs9p.x86_64-latest.args +++ b/tests/qemuxmlconfdata/fs9p.x86_64-latest.args @@ -30,6 +30,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_tag":"/import/from/host","bus":"pci.0","addr":"0x2"}' \ -fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2 \ -device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_tag":"/import/from/host2","bus":"pci.0","addr":"0x3"}' \ +-fsdev local,security_model=mapped,id=fsdev-fs2,path=/export/to/guest-ro,readonly=on \ +-device '{"driver":"virtio-9p-pci","id":"fs2","fsdev":"fsdev-fs2","mount_tag":"/import/from/host-ro","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/fs9p.x86_64-latest.xml b/tests/qemuxmlconfdata/fs9p.x86_64-latest.xml index 91cb445c9f..f313247eab 100644 --- a/tests/qemuxmlconfdata/fs9p.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/fs9p.x86_64-latest.xml @@ -30,6 +30,13 @@ <target dir='/import/from/host2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </filesystem> + <filesystem type='mount' accessmode='mapped'> + <driver type='path'/> + <source dir='/export/to/guest-ro'/> + <target dir='/import/from/host-ro'/> + <readonly/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </filesystem> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> diff --git a/tests/qemuxmlconfdata/fs9p.xml b/tests/qemuxmlconfdata/fs9p.xml index b7475c9f94..c82039a9e4 100644 --- a/tests/qemuxmlconfdata/fs9p.xml +++ b/tests/qemuxmlconfdata/fs9p.xml @@ -24,6 +24,12 @@ <source dir='/export/to/guest2'/> <target dir='/import/from/host2'/> </filesystem> + <filesystem accessmode='mapped'> + <driver type='path'/> + <source dir='/export/to/guest-ro'/> + <target dir='/import/from/host-ro'/> + <readonly/> + </filesystem> <memballoon model='none'/> </devices> </domain> -- 2.53.0
On 3/23/26 09:00, Peter Krempa via Devel wrote:
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
91 files changed, 17 insertions(+), 120 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Michal Prívozník -
Peter Krempa