qemu: deprecate QEMU_CAPS_VHOST_NET

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 4b6a86d3b8dd97f5648ecd41d5f2559159d0a12e..4fb586f1d9c7e28aa1ddf8e5b0a2cee5e682658f 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3631,7 +3631,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 75f389fd2d0fdbdf256caa81866cb4b9b66b90e2..2f15da0729145f1bcb143918bd8ccf27a81c2b32 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -91,7 +91,7 @@ typedef enum {
 
     /* 30 */
     X_QEMU_CAPS_RTC, /* The -rtc flag for clock options */
-    QEMU_CAPS_VHOST_NET, /* vhost-net support available */
+    X_QEMU_CAPS_VHOST_NET, /* vhost-net support available */
     X_QEMU_CAPS_RTC_TD_HACK, /* -rtc-td-hack available */
     QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */
     QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 314b20f30e4e4d5cb1d317e24aba676ca2286609..0c109c63e74ee1dbbf1a40e360e07c73eb8ea0a0 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8478,8 +8478,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
 
         memset(vhostfd, -1, vhostfdSize * sizeof(vhostfd[0]));
 
-        if (qemuInterfaceOpenVhostNet(def, net, qemuCaps,
-                                      vhostfd, &vhostfdSize) < 0)
+        if (qemuInterfaceOpenVhostNet(def, net, vhostfd, &vhostfdSize) < 0)
             goto cleanup;
     }
 

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 9c52bccdf13acbef709d652de3fb92bbc1ca3899..8d3191f9718dd8b586e05f6b6009d99dcbed5a89 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -895,8 +895,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
                                        tapfd, &tapfdSize) < 0)
             goto cleanup;
         iface_connected = true;
-        if (qemuInterfaceOpenVhostNet(vm->def, net, priv->qemuCaps,
-                                      vhostfd, &vhostfdSize) < 0)
+        if (qemuInterfaceOpenVhostNet(vm->def, net, vhostfd, &vhostfdSize) < 0)
             goto cleanup;
         break;
 
@@ -916,8 +915,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
                                        VIR_NETDEV_VPORT_PROFILE_OP_CREATE) < 0)
             goto cleanup;
         iface_connected = true;
-        if (qemuInterfaceOpenVhostNet(vm->def, net, priv->qemuCaps,
-                                      vhostfd, &vhostfdSize) < 0)
+        if (qemuInterfaceOpenVhostNet(vm->def, net, vhostfd, &vhostfdSize) < 0)
             goto cleanup;
         break;
 
@@ -936,8 +934,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
                                          tapfd, tapfdSize) < 0)
             goto cleanup;
         iface_connected = true;
-        if (qemuInterfaceOpenVhostNet(vm->def, net, priv->qemuCaps,
-                                      vhostfd, &vhostfdSize) < 0)
+        if (qemuInterfaceOpenVhostNet(vm->def, net, vhostfd, &vhostfdSize) < 0)
             goto cleanup;
         break;
 

diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
index 2a11cda5c9e6ef7214119cb9513b653da29fb3f6..ffa4b875c0d1aab70709dbf60504dc618d342946 100644 (file)
--- a/src/qemu/qemu_interface.c
+++ b/src/qemu/qemu_interface.c
@@ -624,7 +624,6 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def,
 int
 qemuInterfaceOpenVhostNet(virDomainDefPtr def,
                           virDomainNetDefPtr net,
-                          virQEMUCapsPtr qemuCaps,
                           int *vhostfd,
                           size_t *vhostfdSize)
 {
@@ -645,8 +644,7 @@ qemuInterfaceOpenVhostNet(virDomainDefPtr def,
     /* If qemu doesn't support vhost-net mode (including the -netdev and
      * -device command options), don't try to open the device.
      */
-    if (!(virQEMUCapsGet(qemuCaps, QEMU_CAPS_VHOST_NET) &&
-          qemuDomainSupportsNicdev(def, net))) {
+    if (!qemuDomainSupportsNicdev(def, net)) {
         if (net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            "%s", _("vhost-net is not supported with "

diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h
index a7faa0b3da71a9e7c8328c3a2aaf252c91cebf91..45fdbc4b8e92da561e7b1756b728c21b42d37063 100644 (file)
--- a/src/qemu/qemu_interface.h
+++ b/src/qemu/qemu_interface.h
@@ -56,7 +56,6 @@ int qemuInterfaceBridgeConnect(virDomainDefPtr def,
 
 int qemuInterfaceOpenVhostNet(virDomainDefPtr def,
                               virDomainNetDefPtr net,
-                              virQEMUCapsPtr qemuCaps,
                               int *vhostfd,
                               size_t *vhostfdSize);
 #endif /* __QEMU_INTERFACE_H__ */

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 7c955619d0a2d9cf346647b3f67d0b6fd4c0d9ff..3cc8c22c26de5036333501766f00b48cbb5ef760 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 367bccb45f7ce8fe10fa4ada9368f1f810df725d..617759bf8662d057ce39825858cc463f5ab946fc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 33177319ce49cb0f29dbced455863381ec05ac50..a02826bb093818acdb08408d4ed3b10eb1f99fd2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index a3cab2311ab0b981e3f982ebf9ec31ac74e92cb1..49458e74398bd673f1bae7fd331d6699615e9544 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 41f074eeec1f64f8a8f0ae496864c89c87e725c9..c74e636dc1776e8fe13b92a8ac36f76ef1451952 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 7845bdc4c562a71737df8bf063400c840d7f7e84..cfac4d99ae13863320a09cf67696144e0925c16e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index f049a526081cd942976230e640c2cb35118e9187..0b105afaec93762b60fc3a19d2c6cf6893d4aef1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 159e8ff1b4f5a7807546574e7a2e58256c9b8de6..a2eb37e9facddcd69824d296baad9e0bfc601831 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index df387eb0d75cd6298faf7af63e8db63cbe1953f1..23ba2678f7173fdbe668eb2c14a3cf346b5ec6e2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 9d639179c8f487a0fe99a7771c26996d3039e86f..1eadfb6cc06a49b33104f6864a344240346aa870 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 5d82833fe44551524d441dbfa8d1df1f601664c4..34f5567146ac19dede63554e18e673b85682b0c0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index af9d76bf8d9678a26fd2e535a43c7be405fe3c70..bd675a946fb418715478702310dad99e507e0cf9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='enable-kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index e826063cc604bac515c018342420aed41df82994..821ddca4f5b588618cd9c5f62f51a8d02817e0f7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='nodefconfig'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index c625b4370d659adb5b79d45f762218e8b14fda69..f2cfab0a7939da4c3b6ce1d6b641acdb415f3f38 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 3cd75995a6bd2fa8b0d76f085e4189a6dded3370..fa3140ffd46ca5b52077be13ba543b59b288ab6a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 935cb8065654efa35e72b77de5b0dc7d8a005ed5..4217dc9c3bed9a0a4d1b197d39b56311ebde61f2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 1f60ea7b0fadc4d759306e2ef84291a8860ca2db..eaab5d467423aa0c660baba9441a02d87cc08e02 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 8c41977cabdc2e07b9a9fec03ab2a9b72680f25f..d519a93a9847a7aec9898cdcb2d97d54bb139cce 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 2dd9569b69221791d0f4efab7febb592635f9dbb..80bb743f3b8321868565f24834ec5c50a07e03c5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 3f564ac7e24eba02e737fcd1dda2eaa27c0c57a4..a20a762227b288e3b6be1ad1978a8596a4cbe1ee 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 83ec66d5ea125439853e3701df6e272af13e1cc8..6f66983e707b337937c91c58cab247f93f245a3b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 8b31e10913942901fb2382d569f9c7170350ba7f..b8b4a5f22c511cadca6b34fa9060b0eec2ce6904 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 724d622514200f3be004dfda8cf40e40da83221c..f45a5023dbbab7f3656aa3bb19208167de6ba3f1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index e04b10f1601082f1517e77096f50ffb96e414e6b..5031a9450d947398302b031b0bded217bdf13a73 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
   <flag name='boot-menu'/>
   <flag name='fsdev'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 627179eef4db349e51594e7d7c1d8f32ed672e4e..2078c4533c6cbcb1ea22c347d86267a8b2a03c71 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='vhost-net'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>