[libvirt] [PATCH 3/9] qemu: drop unused QEMU_CAPS_DEVICE_USB_NET

Added by commit fc66c1603c and not used since. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - 24 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ab99b3f1cc..b4658541c5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/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 }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b83e380c4a..0bd280f1d3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/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 */ diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index b752b74036..355d9b55af 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -57,7 +57,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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 2b7ea53144..903cb5b110 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index d6254eb2ba..f6f4c4bf49 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 13b5d5d9e0..807a0309a8 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index cb2740ad14..df27f3621c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 1add2b6e4b..b3e5c36203 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 007585924d..9e555473ac 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index f6bcc59744..c230df3461 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 3c1a704100..e06b935f95 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 877362eaef..741364d3bc 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index edf944bc35..12b607d7ee 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 15bf9db373..c568a12f7c 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 666b7bed17..0f55489dec 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index f63e141326..ae94e9eeaa 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 8d43234514..b116d425ad 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 3f51550018..f86147a48b 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 7021a6dfa3..b2f221c004 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 360b99fde1..5f78ed2000 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index f3e7d238f7..e05b5b5db4 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index f3db1cb134..86f24c415b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 6892c9bd64..67e0edd13b 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 747f51b799..217fbf119f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/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'/> -- 2.16.4