[libvirt] [PATCH libvirt 1/8] qemu: test CAPS_HDA_MICRO

Marc-André Lureau marcandre.lureau at gmail.com
Tue May 15 22:55:08 UTC 2012


---
 src/qemu/qemu_capabilities.c |    5 +++++
 src/qemu/qemu_capabilities.h |    1 +
 tests/qemuhelptest.c         |    3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a3c87d1..b410648 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -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\""))
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 0e0899e..64831e2 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -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 */
 };
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 57d1859..46cc973 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -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;
 }
-- 
1.7.10.1




More information about the libvir-list mailing list