]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: test CAPS_HDA_MICRO
authorMarc-André Lureau <marcandre.lureau@gmail.com>
Tue, 15 May 2012 22:55:08 +0000 (00:55 +0200)
committerEric Blake <eblake@redhat.com>
Thu, 17 May 2012 17:12:40 +0000 (11:12 -0600)
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemuhelptest.c

index a3c87d1df329307dfa214db72478764c45200a4a..b410648f6c794d88f481e48acc444c028a43f3bc 100644 (file)
@@ -162,6 +162,9 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST,
               "scsi-cd",
               "ide-cd",
               "no-user-config",
+
+              "hda-micro", /* 95 */
+
     );
 
 struct qemu_feature_flags {
@@ -1397,6 +1400,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags)
     /* Which devices exist. */
     if (strstr(str, "name \"hda-duplex\""))
         qemuCapsSet(flags, QEMU_CAPS_HDA_DUPLEX);
+    if (strstr(str, "name \"hda-micro\""))
+        qemuCapsSet(flags, QEMU_CAPS_HDA_MICRO);
     if (strstr(str, "name \"ccid-card-emulated\""))
         qemuCapsSet(flags, QEMU_CAPS_CCID_EMULATED);
     if (strstr(str, "name \"ccid-card-passthru\""))
index 0e0899ed8ee2fefacdfdf1627108734a8996e1b1..64831e2bdfd946a8e03d7ca37778c3a09b850f22 100644 (file)
@@ -130,6 +130,7 @@ enum qemuCapsFlags {
     QEMU_CAPS_SCSI_CD            = 92, /* -device scsi-cd */
     QEMU_CAPS_IDE_CD             = 93, /* -device ide-cd */
     QEMU_CAPS_NO_USER_CONFIG     = 94, /* -no-user-config */
+    QEMU_CAPS_HDA_MICRO          = 95, /* -device hda-micro */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 };
index 57d1859e320fe165774ae2aa9491b5b6c9028ff8..46cc9731eba2290ecacf585ff5d91ed9bcbc8a09 100644 (file)
@@ -752,7 +752,8 @@ mymain(void)
             QEMU_CAPS_SCSI_BLOCK,
             QEMU_CAPS_SCSI_CD,
             QEMU_CAPS_IDE_CD,
-            QEMU_CAPS_NO_USER_CONFIG);
+            QEMU_CAPS_NO_USER_CONFIG,
+            QEMU_CAPS_HDA_MICRO);
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }