[libvirt] [RFC PATCH 07/12] qemu: implement support for qemu64-x86_64-cpu

Zhu Guihua zhugh.fnst at cn.fujitsu.com
Wed Jan 21 08:00:59 UTC 2015


This patch adds a new capability bit QEMU_CAPS_QEMU64_X86_64_CPU.

Signed-off-by: Zhu Guihua <zhugh.fnst at cn.fujitsu.com>
---
 src/qemu/qemu_capabilities.c | 3 +++
 src/qemu/qemu_capabilities.h | 1 +
 src/qemu/qemu_command.c      | 1 -
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 13f3cd3..56bb588 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -277,6 +277,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "vmware-svga.vgamem_mb",
               "qxl.vgamem_mb",
               "qxl-vga.vgamem_mb",
+              "qemu64-x86_64-cpu",
     );
 
 
@@ -1524,6 +1525,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "usb-audio", QEMU_CAPS_OBJECT_USB_AUDIO },
     { "iothread", QEMU_CAPS_OBJECT_IOTHREAD},
     { "ivshmem", QEMU_CAPS_DEVICE_IVSHMEM },
+    { "qemu64-x86_64-cpu", QEMU_CAPS_DEVICE_QEMU64_CPU },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = {
@@ -3157,6 +3159,7 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps,
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT);
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_QEMU64_CPU);
     }
 
     ret = 0;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 12e1688..479fe4c 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -223,6 +223,7 @@ typedef enum {
     QEMU_CAPS_VMWARE_SVGA_VGAMEM = 181, /* -device vmware-svga.vgamem_mb */
     QEMU_CAPS_QXL_VGAMEM         = 182, /* -device qxl.vgamem_mb */
     QEMU_CAPS_QXL_VGA_VGAMEM     = 183, /* -device qxl-vga.vgamem_mb */
+    QEMU_CAPS_DEVICE_QEMU64_CPU  = 184, /* -device qemu64-x86_64-cpu */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 69d0a2a..2ee3e10 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5876,7 +5876,6 @@ qemuBuildRNGDeviceArgs(virCommandPtr cmd,
     return ret;
 }
 
-
 static char *qemuBuildTPMBackendStr(const virDomainDef *def,
                                     virQEMUCapsPtr qemuCaps,
                                     const char *emulator)
-- 
1.9.3




More information about the libvir-list mailing list