From nobody Fri Jul 4 08:37:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1529008427167954.134086412617; Thu, 14 Jun 2018 13:33:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03CE319CF69; Thu, 14 Jun 2018 20:33:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C29A2008271; Thu, 14 Jun 2018 20:33:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DADF94A475; Thu, 14 Jun 2018 20:33:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5EKXC03008137 for ; Thu, 14 Jun 2018 16:33:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0A0E826DC8; Thu, 14 Jun 2018 20:33:12 +0000 (UTC) Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 55826906EE; Thu, 14 Jun 2018 20:33:10 +0000 (UTC) Received: from shell.v3.sk (shell.v3.sk [90.176.6.54]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 102F8308213A; Thu, 14 Jun 2018 20:33:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id 916D2AE661; Thu, 14 Jun 2018 22:33:07 +0200 (CEST) Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id yzrM3_iA-WuY; Thu, 14 Jun 2018 22:32:45 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id C113BAE664; Thu, 14 Jun 2018 22:32:44 +0200 (CEST) Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ON8290BNTf3w; Thu, 14 Jun 2018 22:32:42 +0200 (CEST) Received: from belphegor.brq.redhat.com (nat-pool-brq-t.redhat.com [213.175.37.10]) by zimbra.v3.sk (Postfix) with ESMTPSA id 17E52AE658; Thu, 14 Jun 2018 22:32:42 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.v3.sk From: Lubomir Rintel To: libvir-list@redhat.com Date: Thu, 14 Jun 2018 22:32:24 +0200 Message-Id: <20180614203233.3115735-3-lkundrak@v3.sk> In-Reply-To: <20180614203233.3115735-1-lkundrak@v3.sk> References: <20180614203233.3115735-1-lkundrak@v3.sk> X-Greylist: Sender passed SPF test, ACL 227 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 14 Jun 2018 20:33:09 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 14 Jun 2018 20:33:09 +0000 (UTC) for IP:'90.176.6.54' DOMAIN:'shell.v3.sk' HELO:'shell.v3.sk' FROM:'lkundrak@v3.sk' RCPT:'' X-RedHat-Spam-Score: -0.001 (SPF_PASS) 90.176.6.54 shell.v3.sk 90.176.6.54 shell.v3.sk X-Scanned-By: MIMEDefang 2.84 on 10.5.110.42 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Lubomir Rintel , Andrea Bolognani Subject: [libvirt] [PATCH v2 02/11] qemu: rename qemuDomainArmVirt() 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-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 14 Jun 2018 20:33:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It's ARM specific. Signed-off-by: Lubomir Rintel --- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_domain.c | 16 ++++++++-------- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_domain_address.c | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f335a0149c..e025f50068 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1748,10 +1748,10 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuC= aps, return false; } =20 - /* If 'virt' supports PCI, it supports multibus. + /* If ARM 'virt' supports PCI, it supports multibus. * No extra conditions here for simplicity. */ - if (qemuDomainIsVirt(def)) + if (qemuDomainIsARMVirt(def)) return true; =20 return false; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bb956a77f4..e873cc8a20 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2909,7 +2909,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, if (cont->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT= && !qemuDomainIsQ35(def) && - !qemuDomainIsVirt(def)) { + !qemuDomainIsARMVirt(def)) { =20 /* An appropriate default USB controller model should alre= ady * have been selected in qemuDomainDeviceDefPostParse(); if @@ -2947,7 +2947,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, =20 if (usbcontroller =3D=3D 0 && !qemuDomainIsQ35(def) && - !qemuDomainIsVirt(def) && + !qemuDomainIsARMVirt(def) && !ARCH_IS_S390(def->os.arch)) { /* We haven't added any USB controller yet, but we haven't been as= ked * not to add one either. Add a legacy USB controller, unless we're diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 17177c3547..dfaba677b1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3174,7 +3174,7 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, case VIR_ARCH_AARCH64: addDefaultUSB =3D false; addDefaultMemballoon =3D false; - if (qemuDomainIsVirt(def)) + if (qemuDomainIsARMVirt(def)) addPCIeRoot =3D virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX= ); break; =20 @@ -3355,7 +3355,7 @@ qemuDomainDefEnableDefaultFeatures(virDomainDefPtr de= f, * was not included in the domain XML, we need to choose a suitable * GIC version ourselves */ if ((def->features[VIR_DOMAIN_FEATURE_GIC] =3D=3D VIR_TRISTATE_SWITCH_= ABSENT && - qemuDomainIsVirt(def)) || + qemuDomainIsARMVirt(def)) || (def->features[VIR_DOMAIN_FEATURE_GIC] =3D=3D VIR_TRISTATE_SWITCH_= ON && def->gic_version =3D=3D VIR_GIC_VERSION_NONE)) { virGICVersion version; @@ -3807,7 +3807,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def, =20 case VIR_DOMAIN_FEATURE_GIC: if (def->features[i] =3D=3D VIR_TRISTATE_SWITCH_ON && - !qemuDomainIsVirt(def)) { + !qemuDomainIsARMVirt(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("The '%s' feature is not supported for " "architecture '%s' or machine type '%s'"), @@ -4200,7 +4200,7 @@ qemuDomainChrDefValidate(const virDomainChrDef *dev, isCompatible =3D false; } =20 - if (!qemuDomainIsVirt(def) && + if (!qemuDomainIsARMVirt(def) && (dev->targetType =3D=3D VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYST= EM || dev->targetModel =3D=3D VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL= 011)) { isCompatible =3D false; @@ -5572,7 +5572,7 @@ qemuDomainDefaultNetModel(const virDomainDef *def, if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; =20 - if (qemuDomainIsVirt(def)) + if (qemuDomainIsARMVirt(def)) return "virtio"; =20 /* Incomplete. vexpress (and a few others) use this, but not all @@ -5872,7 +5872,7 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, chr->targetType =3D VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA; } else if (qemuDomainIsPSeries(def)) { chr->targetType =3D VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VI= O; - } else if (qemuDomainIsVirt(def)) { + } else if (qemuDomainIsARMVirt(def)) { chr->targetType =3D VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM; } else if (ARCH_IS_S390(def->os.arch)) { chr->targetType =3D VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP; @@ -6066,7 +6066,7 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPt= r video, if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { if (ARCH_IS_PPC64(def->os.arch)) video->type =3D VIR_DOMAIN_VIDEO_TYPE_VGA; - else if (qemuDomainIsVirt(def) || ARCH_IS_S390(def->os.arch)) + else if (qemuDomainIsARMVirt(def) || ARCH_IS_S390(def->os.arch)) video->type =3D VIR_DOMAIN_VIDEO_TYPE_VIRTIO; else video->type =3D VIR_DOMAIN_VIDEO_TYPE_CIRRUS; @@ -9022,7 +9022,7 @@ qemuDomainMachineIsS390CCW(const char *machine) =20 =20 bool -qemuDomainIsVirt(const virDomainDef *def) +qemuDomainIsARMVirt(const virDomainDef *def) { return qemuDomainMachineIsARMVirt(def->os.machine, def->os.arch); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index c016d543a2..3d783b337d 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -771,7 +771,7 @@ bool qemuDomainHasPCIRoot(const virDomainDef *def); bool qemuDomainHasPCIeRoot(const virDomainDef *def); bool qemuDomainNeedsFDC(const virDomainDef *def); bool qemuDomainIsS390CCW(const virDomainDef *def); -bool qemuDomainIsVirt(const virDomainDef *def); +bool qemuDomainIsARMVirt(const virDomainDef *def); bool qemuDomainIsPSeries(const virDomainDef *def); bool qemuDomainHasBuiltinIDE(const virDomainDef *def); =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index e9f460d77a..01cfdbeadf 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -485,7 +485,7 @@ qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr = def, return; =20 if (!(STRPREFIX(def->os.machine, "vexpress-") || - qemuDomainIsVirt(def))) + qemuDomainIsARMVirt(def))) return; =20 /* We use virtio-mmio by default on mach-virt guests only if they alre= ady @@ -2180,7 +2180,7 @@ qemuDomainSupportsPCI(virDomainDefPtr def, if (STREQ(def->os.machine, "versatilepb")) return true; =20 - if (qemuDomainIsVirt(def) && + if (qemuDomainIsARMVirt(def) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX)) return true; =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list