]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Introduce QEMU_CAPS_ARM_VIRT_PCI
authorPavel Fedin <p.fedin@samsung.com>
Thu, 11 Jun 2015 06:40:53 +0000 (09:40 +0300)
committerCole Robinson <crobinso@redhat.com>
Sun, 21 Jun 2015 20:06:47 +0000 (16:06 -0400)
This capability specifies that "virt" machine on ARM has PCI controller. Enabled when version is at least 2.3.0.

Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h

index cbcd67299d209be03e6b39fe706bcab164398d8c..e4549ef96c6a8854c9b1a46ad90b5dd106f9a569 100644 (file)
@@ -287,6 +287,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "aarch64-off",
 
               "vhost-user-multiqueue", /* 190 */
+              "arm-virt-pci",
     );
 
 
@@ -1336,6 +1337,10 @@ virQEMUCapsComputeCmdFlags(const char *help,
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY);
     }
 
+    if (version >= 2003000) {
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_ARM_VIRT_PCI);
+    }
+
     return 0;
 }
 
index 30aa50430146b6e8d6e54c85cac8e1af4c4d3229..f4180a8aa8f93d2626d931b1548fdc277be2fe49 100644 (file)
@@ -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;