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