qemu: add usb-net caps flag

QEMU_CAPS_DEVICE_USB_NET /* -device usb-net */

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 451e95a7f93e63994cd7e98bdc03e80c6e86f7b4..876a75915d07efd1ce1891ddbbe2abde14aadde7 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -201,6 +201,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST,
               "device-video-primary",
               "s390-sclp",
               "usb-serial",
+              "usb-net",
 
     );
 
@@ -1348,6 +1349,7 @@ struct qemuCapsStringFlags qemuCapsObjectTypes[] = {
     { "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},
 };
 
 

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index e887fff0ca8a20c06f39a75b1296ff955f6b3809..089fa304e22a5c9fa536d5bb366ff68013e35ba2 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -164,6 +164,7 @@ enum qemuCapsFlags {
                                            for primary video device */
     QEMU_CAPS_SCLP_S390          = 124, /* -device sclp* */
     QEMU_CAPS_DEVICE_USB_SERIAL  = 125, /* -device usb-serial */
+    QEMU_CAPS_DEVICE_USB_NET     = 126, /* -device usb-net */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 };

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index b71c29244edf4effd30c4e7d633e6e5dc2f6a7eb..08091dee53ed1099c1752136f421b62accb3086f 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -396,7 +396,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_VGA,
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_DEVICE_VMWARE_SVGA,
-            QEMU_CAPS_DEVICE_USB_SERIAL);
+            QEMU_CAPS_DEVICE_USB_SERIAL,
+            QEMU_CAPS_DEVICE_USB_NET);
     DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
             QEMU_CAPS_VNC_COLON,
             QEMU_CAPS_NO_REBOOT,
@@ -504,7 +505,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_VGA,
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_DEVICE_VMWARE_SVGA,
-            QEMU_CAPS_DEVICE_USB_SERIAL);
+            QEMU_CAPS_DEVICE_USB_SERIAL,
+            QEMU_CAPS_DEVICE_USB_NET);
     DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0,
             QEMU_CAPS_VNC_COLON,
             QEMU_CAPS_NO_REBOOT,
@@ -568,7 +570,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_VGA,
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_DEVICE_VMWARE_SVGA,
-            QEMU_CAPS_DEVICE_USB_SERIAL);
+            QEMU_CAPS_DEVICE_USB_SERIAL,
+            QEMU_CAPS_DEVICE_USB_NET);
     DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0,
             QEMU_CAPS_VNC_COLON,
             QEMU_CAPS_NO_REBOOT,
@@ -719,7 +722,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_VGA,
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_DEVICE_VMWARE_SVGA,
-            QEMU_CAPS_DEVICE_USB_SERIAL);
+            QEMU_CAPS_DEVICE_USB_SERIAL,
+            QEMU_CAPS_DEVICE_USB_NET);
     DO_TEST("qemu-1.1.0", 1001000, 0, 0,
             QEMU_CAPS_VNC_COLON,
             QEMU_CAPS_NO_REBOOT,
@@ -806,7 +810,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_VGA,
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_DEVICE_VMWARE_SVGA,
-            QEMU_CAPS_DEVICE_USB_SERIAL);
+            QEMU_CAPS_DEVICE_USB_SERIAL,
+            QEMU_CAPS_DEVICE_USB_NET);
     DO_TEST("qemu-1.2.0", 1002000, 0, 0,
             QEMU_CAPS_VNC_COLON,
             QEMU_CAPS_NO_REBOOT,
@@ -904,7 +909,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_DEVICE_VMWARE_SVGA,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-            QEMU_CAPS_DEVICE_USB_SERIAL);
+            QEMU_CAPS_DEVICE_USB_SERIAL,
+            QEMU_CAPS_DEVICE_USB_NET);
     DO_TEST("qemu-kvm-1.2.0", 1002000, 1, 0,
             QEMU_CAPS_VNC_COLON,
             QEMU_CAPS_NO_REBOOT,
@@ -1007,7 +1013,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_DEVICE_VMWARE_SVGA,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-            QEMU_CAPS_DEVICE_USB_SERIAL);
+            QEMU_CAPS_DEVICE_USB_SERIAL,
+            QEMU_CAPS_DEVICE_USB_NET);
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }