qemu: Use ARCH_IS_X86() more

In a few cases, we checked for VIR_ARCH_X86_64 and
VIR_ARCH_I686 separately: change all those to use the
ARCH_IS_X86() macro instead.

src/qemu/qemu_capabilities.c

@@ -782,8 +782,7 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid)
     virQEMUCapsParseCPUModels parse;
     virCommandPtr cmd;
 
-    if (qemuCaps->arch == VIR_ARCH_I686 ||
-        qemuCaps->arch == VIR_ARCH_X86_64) {
+    if (ARCH_IS_X86(qemuCaps->arch)) {
         parse = virQEMUCapsParseX86Models;
     } else if (ARCH_IS_PPC64(qemuCaps->arch)) {
         parse = virQEMUCapsParsePPCModels;
@@ -1039,8 +1038,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
 
     }
 
-    if (((guestarch == VIR_ARCH_I686) ||
-         (guestarch == VIR_ARCH_X86_64)) &&
+    if (ARCH_IS_X86(guestarch) &&
         (virCapabilitiesAddGuestFeature(guest, "acpi", true, true) == NULL ||
          virCapabilitiesAddGuestFeature(guest, "apic", true, false) == NULL))
         goto cleanup;
@@ -3923,8 +3921,7 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid, const c
 
     /* -no-acpi is not supported on non-x86
      * even if qemu reports it in -help */
-    if (qemuCaps->arch != VIR_ARCH_X86_64 &&
-        qemuCaps->arch != VIR_ARCH_I686)
+    if (!ARCH_IS_X86(qemuCaps->arch))
         virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI);
 
     /* virQEMUCapsExtractDeviceStr will only set additional caps if qemu
@@ -4023,8 +4020,7 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps,
     }
 
     /* ACPI/HPET/KVM PIT are x86 specific */
-    if (qemuCaps->arch == VIR_ARCH_X86_64 ||
-        qemuCaps->arch == VIR_ARCH_I686) {
+    if (ARCH_IS_X86(qemuCaps->arch)) {
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT);

src/qemu/qemu_parse_command.c

@@ -1441,8 +1441,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
             if (*feature == '\0')
                 goto syntax;
 
-            if (dom->os.arch != VIR_ARCH_X86_64 &&
-                dom->os.arch != VIR_ARCH_I686) {
+            if (!ARCH_IS_X86(dom->os.arch)) {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("%s platform doesn't support CPU features'"),
                                virArchToString(dom->os.arch));
@@ -1863,8 +1862,7 @@ qemuParseCommandLine(virCapsPtr caps,
     else
         def->os.arch = VIR_ARCH_I686;
 
-    if ((def->os.arch == VIR_ARCH_I686) ||
-        (def->os.arch == VIR_ARCH_X86_64))
+    if (ARCH_IS_X86(def->os.arch))
         def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ON;
 
 #define WANT_VALUE()                                                   \