From: Pavel Fedin <p.fedin@samsung.com>
Date: Thu, 11 Jun 2015 06:40:53 +0000 (+0300)
Subject: Introduce QEMU_CAPS_ARM_VIRT_PCI
X-Git-Tag: v1.2.17-rc1~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f3515b4bb677d0ead1887547efc844e4761268a;p=thirdparty%2Flibvirt.git

Introduce QEMU_CAPS_ARM_VIRT_PCI

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>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index cbcd67299d..e4549ef96c 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",
     );
 
 
@@ -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;
 }
 
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 30aa504301..f4180a8aa8 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;