From: Laine Stump <laine@laine.org>
Date: Wed, 29 Apr 2015 16:23:02 +0000 (-0400)
Subject: qemu: use qemuDomainMachineIsI440FX() in appropriate place
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=da558e72c4999d21d279ff2ab15f0b2446436c46;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

qemu: use qemuDomainMachineIsI440FX() in appropriate place

This patch makes qemuValideDevicePCISlotsChipsets() more consistent in
appearance by replacing several clauses of an if with the equivalent
call to qemuDomainMachineIsI440FX. The if was checking exactly the
same items, just in a slightly different order.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index fe4622ef7..d178f69e0 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2110,11 +2110,7 @@ qemuValidateDevicePCISlotsChipsets(virDomainDefPtr def,
                                    virQEMUCapsPtr qemuCaps,
                                    virDomainPCIAddressSetPtr addrs)
 {
-    if ((STRPREFIX(def->os.machine, "pc-0.") ||
-        STRPREFIX(def->os.machine, "pc-1.") ||
-        STRPREFIX(def->os.machine, "pc-i440") ||
-        STREQ(def->os.machine, "pc") ||
-        STRPREFIX(def->os.machine, "rhel")) &&
+    if (qemuDomainMachineIsI440FX(def) &&
         qemuValidateDevicePCISlotsPIIX3(def, qemuCaps, addrs) < 0) {
         return -1;
     }