[libvirt] [PATCH v3 1/3] Introduce QEMU_CAPS_ARM_VIRT_PCI

Pavel Fedin p.fedin at samsung.com
Mon Jul 6 12:59:25 UTC 2015


This capability specifies that "virt" machine on ARM has PCI controller.
Enabled when qemu version is at least 2.3.0.

Signed-off-by: Pavel Fedin <p.fedin at samsung.com>
---
 src/qemu/qemu_capabilities.c | 5 +++++
 src/qemu/qemu_capabilities.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 27686c3..0dc034f 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -287,6 +287,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "aarch64-off",
 
               "vhost-user-multiqueue", /* 190 */
+              "arm-virt-pci",
     );
 
 
@@ -3352,6 +3353,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
         qemuCaps->version >= 2003000)
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF);
 
+    /* 'virt' machine has PCI controller from v2.3.0 onwards */
+    if (qemuCaps->version >= 2003000)
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_ARM_VIRT_PCI);
+
     /* vhost-user supports multi-queue from v2.4.0 onwards,
      * but there is no way to query for that capability */
     if (qemuCaps->version >= 2004000)
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 30aa504..f4180a8 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -230,6 +230,7 @@ typedef enum {
     QEMU_CAPS_DEVICE_PCI_SERIAL  = 188, /* -device pci-serial */
     QEMU_CAPS_CPU_AARCH64_OFF    = 189, /* -cpu ...,aarch64=off */
     QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */
+    QEMU_CAPS_ARM_VIRT_PCI       = 191, /* ARM 'virt' machine has PCI bus */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 } virQEMUCapsFlags;
-- 
1.9.5.msysgit.0




More information about the libvir-list mailing list