From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 28 Sep 2012 15:48:58 +0000 (+0100)
Subject: Fix QEMU test with 1.2.0 help output
X-Git-Tag: v1.0.0-rc1~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72574808d6ab06d7093f3695c0ba6e14616adea5;p=thirdparty%2Flibvirt.git

Fix QEMU test with 1.2.0 help output

The help output for QEMU 1.2.0 changed 'pci-assign' to 'kvm-pci-assign'.
Since the new capabilities code does exact device name matching
instead of substring matching, this caused the capabilities to go
missing.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f0442ee0a5..cac491799e 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1321,6 +1321,8 @@ static struct qemuCapsObjectTypeProps qemuCapsObjectProps[] = {
       ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioNet) },
     { "pci-assign", qemuCapsObjectPropsPciAssign,
       ARRAY_CARDINALITY(qemuCapsObjectPropsPciAssign) },
+    { "kvm-pci-assign", qemuCapsObjectPropsPciAssign,
+      ARRAY_CARDINALITY(qemuCapsObjectPropsPciAssign) },
     { "scsi-disk", qemuCapsObjectPropsScsiDisk,
       ARRAY_CARDINALITY(qemuCapsObjectPropsScsiDisk) },
     { "ide-drive", qemuCapsObjectPropsIDEDrive,