[PATCH 1/3] qemu_capabilities: Re-add QEMU_CAPS_DEVICE_USB_NET capability

Rayhan Faizel posted 3 patches 1 year, 10 months ago
There is a newer version of this series
[PATCH 1/3] qemu_capabilities: Re-add QEMU_CAPS_DEVICE_USB_NET capability
Posted by Rayhan Faizel 1 year, 10 months ago
This capability was previously prefixed with X_ due to not being in use.

Signed-off-by: Rayhan Faizel <rayhan.faizel@gmail.com>
---
 src/qemu/qemu_capabilities.c                          | 3 ++-
 src/qemu/qemu_capabilities.h                          | 2 +-
 tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml     | 1 +
 tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml       | 1 +
 tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml     | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml       | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml     | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml     | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml       | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml     | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml     | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml     | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml       | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml     | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml       | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml       | 1 +
 tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml         | 1 +
 tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml     | 1 +
 tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml       | 1 +
 tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml     | 1 +
 tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml      | 1 +
 tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml       | 1 +
 tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml      | 1 +
 tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml      | 1 +
 39 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 21f93c6774..eea80529f6 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -238,7 +238,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "device-video-primary", /* X_QEMU_CAPS_DEVICE_VIDEO_PRIMARY */
               "s390-sclp", /* QEMU_CAPS_DEVICE_SCLPCONSOLE */
               "usb-serial", /* QEMU_CAPS_DEVICE_USB_SERIAL */
-              "usb-net", /* X_QEMU_CAPS_DEVICE_USB_NET */
+              "usb-net", /* QEMU_CAPS_DEVICE_USB_NET */
 
               /* 125 */
               "add-fd", /* X_QEMU_CAPS_ADD_FD */
@@ -1266,6 +1266,7 @@ 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-ccw", QEMU_CAPS_DEVICE_VIRTIO_RNG },
     { "virtio-rng-device", QEMU_CAPS_DEVICE_VIRTIO_RNG },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5082967cba..ed5614c753 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -216,7 +216,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     X_QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video device */
     QEMU_CAPS_DEVICE_SCLPCONSOLE, /* -device sclpconsole */
     QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */
-    X_QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */
+    QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */
 
     /* 125 */
     X_QEMU_CAPS_ADD_FD, /* -add-fd */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
index 33d06fface..806467c2a9 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
@@ -27,6 +27,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
index 80f503fc46..1d6c2c0622 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
@@ -27,6 +27,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
index 40e3211c57..bb8512ed8e 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@@ -33,6 +33,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
index 1044a49742..4e8e73f4a0 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
@@ -27,6 +27,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
index 1806e6316e..94c1bd588d 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
@@ -27,6 +27,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
index f68d88f39b..35b5679d7a 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
@@ -31,6 +31,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
index 1741c003cb..df78e4a59b 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@@ -33,6 +33,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
index c863baa71c..a473a4c6df 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@@ -33,6 +33,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
index ddd30feaff..e3e3164659 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@@ -27,6 +27,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
index be3d464df3..ceae0c28f8 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
@@ -27,6 +27,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
index 9280e92fd8..327e6946ee 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@@ -31,6 +31,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index da6229f8e2..f8999b1ab1 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -33,6 +33,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
index 7cf7c0707b..9ac1327989 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@@ -26,6 +26,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index ffaa7c2a71..d4c30d7345 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -32,6 +32,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index 22a1fc3ac7..fd6150b02d 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -32,6 +32,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
index 13253f13c0..17b999bf4b 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@@ -31,6 +31,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index 719e7120a3..883e30d76e 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -25,6 +25,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index 010f142dee..f0a87390c6 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -32,6 +32,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
index b359f22b03..2a37989538 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@@ -30,6 +30,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
index c6f31b94fd..0e72365bb3 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@@ -31,6 +31,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index 2efa4d6259..4c4b8d2e5d 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -31,6 +31,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index 843225b19d..f7aada242d 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -32,6 +32,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index 3fda8bf6ea..36b2eb6204 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -30,6 +30,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 0d43787fa9..0ed41515c0 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -32,6 +32,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index 7a73f762de..e272f6d2bb 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -31,6 +31,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index 5ba0c24a4d..8a3d441db5 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -31,6 +31,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index 887cb02fa0..466e2c2576 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -32,6 +32,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
index 9af900aaa3..11c28dd374 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@@ -24,6 +24,7 @@
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index 62a42c3ab6..a17b91bcab 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -32,6 +32,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index 744261be10..ce6519999d 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -14,6 +14,7 @@
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index 907fc39b99..b9bf81253c 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -32,6 +32,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
index fe4c65c9b7..ce278d337e 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@@ -27,6 +27,7 @@
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
index e26dc43963..c9adb06fc3 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@@ -29,6 +29,7 @@
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
index bfe59f0c29..275b77d5b2 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
@@ -30,6 +30,7 @@
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
index 70e85bef28..7cc528015d 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
@@ -14,6 +14,7 @@
   <flag name='vnc'/>
   <flag name='s390-sclp'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
index 40716fa8d1..274d09ea73 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@@ -32,6 +32,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
index 1873663353..037cc118ca 100644
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@@ -32,6 +32,7 @@
   <flag name='cirrus-vga'/>
   <flag name='vmware-svga'/>
   <flag name='usb-serial'/>
+  <flag name='usb-net'/>
   <flag name='virtio-rng'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-- 
2.34.1
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
Re: [PATCH 1/3] qemu_capabilities: Re-add QEMU_CAPS_DEVICE_USB_NET capability
Posted by Peter Krempa 1 year, 10 months ago
On Tue, Apr 02, 2024 at 02:01:16 +0530, Rayhan Faizel wrote:
> This capability was previously prefixed with X_ due to not being in use.

This was done as all qemu versions do support this device and even when
compiled out libvirt has fallback code which tries to use any unknown
network device model directly with qemu to preserve backwards
compatibility.

While I didn't check what you want to do with this, the capability most
likely won't be needed for it.
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
Re: [PATCH 1/3] qemu_capabilities: Re-add QEMU_CAPS_DEVICE_USB_NET capability
Posted by Peter Krempa 1 year, 10 months ago
On Tue, Apr 02, 2024 at 09:39:59 +0200, Peter Krempa wrote:
> On Tue, Apr 02, 2024 at 02:01:16 +0530, Rayhan Faizel wrote:
> > This capability was previously prefixed with X_ due to not being in use.
> 
> This was done as all qemu versions do support this device and even when
> compiled out libvirt has fallback code which tries to use any unknown
> network device model directly with qemu to preserve backwards
> compatibility.
> 
> While I didn't check what you want to do with this, the capability most
> likely won't be needed for it.

Yup, looked at the rest of the patches and they don't even use it.

NACK to this patch.
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org