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>

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);

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 */

src/qemu/qemu_command.c

@@ -8478,8 +8478,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
 
         memset(vhostfd, -1, vhostfdSize * sizeof(vhostfd[0]));
 
-        if (qemuInterfaceOpenVhostNet(def, net, qemuCaps,
+        if (qemuInterfaceOpenVhostNet(def, net, vhostfd, &vhostfdSize) < 0)
-                                      vhostfd, &vhostfdSize) < 0)
             goto cleanup;
     }
 

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,
+        if (qemuInterfaceOpenVhostNet(vm->def, net, vhostfd, &vhostfdSize) < 0)
-                                      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,
+        if (qemuInterfaceOpenVhostNet(vm->def, net, vhostfd, &vhostfdSize) < 0)
-                                      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,
+        if (qemuInterfaceOpenVhostNet(vm->def, net, vhostfd, &vhostfdSize) < 0)
-                                      vhostfd, &vhostfdSize) < 0)
             goto cleanup;
         break;
 

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) &&
+    if (!qemuDomainSupportsNicdev(def, net)) {
-          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 "

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__ */

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>