From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 29 Jun 2015 07:44:35 +0000 (+0200)
Subject: Revert "Introduce QEMU_CAPS_ARM_VIRT_PCI"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4e5d03957a212adb9c924208fdb150de18d73692;p=libvirt.git

Revert "Introduce QEMU_CAPS_ARM_VIRT_PCI"

The capability was not used up to the feature freeze.

This reverts commit 7f3515b4bb677d0ead1887547efc844e4761268a.
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e7002a34cf..27686c38a4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -287,7 +287,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "aarch64-off",
 
               "vhost-user-multiqueue", /* 190 */
-              "arm-virt-pci",
     );
 
 
@@ -1337,9 +1336,6 @@ 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 f4180a8aa8..30aa504301 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -230,7 +230,6 @@ 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;