From nobody Thu May 2 04:57:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.37 as permitted sender) client-ip=209.132.183.37; envelope-from=libvir-list-bounces@redhat.com; helo=mx5-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.37 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx5-phx2.redhat.com (mx5-phx2.redhat.com [209.132.183.37]) by mx.zohomail.com with SMTPS id 1488474424145855.3897385741938; Thu, 2 Mar 2017 09:07:04 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx5-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v22H3rVF011619; Thu, 2 Mar 2017 12:03:53 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v22H31ca028410 for ; Thu, 2 Mar 2017 12:03:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id A631D15A81; Thu, 2 Mar 2017 17:03:01 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.34.129.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2D16D15A80 for ; Thu, 2 Mar 2017 17:03:00 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 2 Mar 2017 18:02:55 +0100 Message-Id: <1488474176-14427-2-git-send-email-abologna@redhat.com> In-Reply-To: <1488474176-14427-1-git-send-email-abologna@redhat.com> References: <1488474176-14427-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] qemu: Don't omit parentheses X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The ARCH_IS_*() macro are defined in a way that allows them to be used if a parentheses-less if statement, but we don't really want that to happen --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6f60a00..ceda769 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -785,7 +785,7 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_= t runUid, gid_t runGid) if (qemuCaps->arch =3D=3D VIR_ARCH_I686 || qemuCaps->arch =3D=3D VIR_ARCH_X86_64) { parse =3D virQEMUCapsParseX86Models; - } else if ARCH_IS_PPC64(qemuCaps->arch) { + } else if (ARCH_IS_PPC64(qemuCaps->arch)) { parse =3D virQEMUCapsParsePPCModels; } else { VIR_DEBUG("don't know how to parse %s CPU models", --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 04:57:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.39 as permitted sender) client-ip=209.132.183.39; envelope-from=libvir-list-bounces@redhat.com; helo=mx6-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.39 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) by mx.zohomail.com with SMTPS id 1488474421208920.536289369888; Thu, 2 Mar 2017 09:07:01 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v22H3gop020079; Thu, 2 Mar 2017 12:03:42 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v22H32fQ028421 for ; Thu, 2 Mar 2017 12:03:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id EE7FB15A85; Thu, 2 Mar 2017 17:03:02 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.34.129.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 73A6D15A84 for ; Thu, 2 Mar 2017 17:03:01 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 2 Mar 2017 18:02:56 +0100 Message-Id: <1488474176-14427-3-git-send-email-abologna@redhat.com> In-Reply-To: <1488474176-14427-1-git-send-email-abologna@redhat.com> References: <1488474176-14427-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] qemu: Use ARCH_IS_X86() more X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 | 15 +++++---------- src/qemu/qemu_parse_command.c | 6 ++---- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ceda769..d9b294f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -782,8 +782,7 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_= t runUid, gid_t runGid) virQEMUCapsParseCPUModels parse; virCommandPtr cmd; =20 - if (qemuCaps->arch =3D=3D VIR_ARCH_I686 || - qemuCaps->arch =3D=3D VIR_ARCH_X86_64) { + if (ARCH_IS_X86(qemuCaps->arch)) { parse =3D virQEMUCapsParseX86Models; } else if (ARCH_IS_PPC64(qemuCaps->arch)) { parse =3D virQEMUCapsParsePPCModels; @@ -1039,8 +1038,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, =20 } =20 - if (((guestarch =3D=3D VIR_ARCH_I686) || - (guestarch =3D=3D VIR_ARCH_X86_64)) && + if (ARCH_IS_X86(guestarch) && (virCapabilitiesAddGuestFeature(guest, "acpi", true, true) =3D=3D = NULL || virCapabilitiesAddGuestFeature(guest, "apic", true, false) =3D=3D= NULL)) goto cleanup; @@ -3920,14 +3918,12 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t = runUid, gid_t runGid, const c * helper virQEMUCapsHasPCIMultiBus() which keys off the machine * stored in virDomainDef and QEMU version number */ - if (qemuCaps->arch =3D=3D VIR_ARCH_X86_64 || - qemuCaps->arch =3D=3D VIR_ARCH_I686) + if (ARCH_IS_X86(qemuCaps->arch)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); =20 /* -no-acpi is not supported on non-x86 * even if qemu reports it in -help */ - if (qemuCaps->arch !=3D VIR_ARCH_X86_64 && - qemuCaps->arch !=3D VIR_ARCH_I686) + if (!ARCH_IS_X86(qemuCaps->arch)) virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI); =20 /* virQEMUCapsExtractDeviceStr will only set additional caps if qemu @@ -4034,8 +4030,7 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, * * ACPI/HPET/KVM PIT are also x86 specific */ - if (qemuCaps->arch =3D=3D VIR_ARCH_X86_64 || - qemuCaps->arch =3D=3D VIR_ARCH_I686) { + if (ARCH_IS_X86(qemuCaps->arch)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET); diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index a215027..89c7659 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1441,8 +1441,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, if (*feature =3D=3D '\0') goto syntax; =20 - if (dom->os.arch !=3D VIR_ARCH_X86_64 && - dom->os.arch !=3D 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 =3D VIR_ARCH_I686; =20 - if ((def->os.arch =3D=3D VIR_ARCH_I686) || - (def->os.arch =3D=3D VIR_ARCH_X86_64)) + if (ARCH_IS_X86(def->os.arch)) def->features[VIR_DOMAIN_FEATURE_ACPI] =3D VIR_TRISTATE_SWITCH_ON; =20 #define WANT_VALUE() \ --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list