qemu: drop unused QEMU_CAPS_DEVICE_USB_NET

Added by commit fc66c160 and not used since.

Also, the device was present in QEMU 1.5.0 so this capability
will not be needed if we ever decide to implement usb-net support.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>

src/qemu/qemu_capabilities.c

@@ -1072,7 +1072,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "cirrus-vga", QEMU_CAPS_DEVICE_CIRRUS_VGA },
     { "vmware-svga", QEMU_CAPS_DEVICE_VMWARE_SVGA },
     { "usb-serial", QEMU_CAPS_DEVICE_USB_SERIAL },
-    { "usb-net", QEMU_CAPS_DEVICE_USB_NET },
     { "virtio-rng-pci", QEMU_CAPS_DEVICE_VIRTIO_RNG },
     { "virtio-rng-s390", QEMU_CAPS_DEVICE_VIRTIO_RNG },
     { "virtio-rng-ccw", QEMU_CAPS_DEVICE_VIRTIO_RNG },

src/qemu/qemu_capabilities.h

@@ -224,7 +224,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 125 */
     QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */
-    QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */
+    X_QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */
     X_QEMU_CAPS_ADD_FD, /* -add-fd */
     QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */
     QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml

@@ -59,7 +59,6 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml

@@ -60,7 +60,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml

@@ -60,7 +60,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml

@@ -60,7 +60,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml

@@ -45,7 +45,6 @@
   <flag name='VGA'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml

@@ -44,7 +44,6 @@
   <flag name='VGA'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -60,7 +60,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml

@@ -58,7 +58,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml

@@ -45,7 +45,6 @@
   <flag name='VGA'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml

@@ -44,7 +44,6 @@
   <flag name='VGA'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -58,7 +58,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -60,7 +60,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -60,7 +60,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml

@@ -47,7 +47,6 @@
   <flag name='VGA'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml

@@ -44,7 +44,6 @@
   <flag name='VGA'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -60,7 +60,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -60,7 +60,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -60,7 +60,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml

@@ -43,7 +43,6 @@
   <flag name='VGA'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -60,7 +60,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml

@@ -44,7 +44,6 @@
   <flag name='VGA'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>

tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml

@@ -58,7 +58,6 @@
   <flag name='vmware-svga'/>
   <flag name='device-video-primary'/>
   <flag name='usb-serial'/>
-  <flag name='usb-net'/>
   <flag name='nbd-server'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>