From nobody Mon Feb 9 06:50:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1643726629500746.9008514393287; Tue, 1 Feb 2022 06:43:49 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-583-zmfVxeFdMRu9coW4t7E-tQ-1; Tue, 01 Feb 2022 09:43:45 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2C5491091DA1; Tue, 1 Feb 2022 14:43:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 084542B598; Tue, 1 Feb 2022 14:43:40 +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 C5F311809CB9; Tue, 1 Feb 2022 14:43:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 211EY0OB015838 for ; Tue, 1 Feb 2022 09:34:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id B7F625E485; Tue, 1 Feb 2022 14:34:00 +0000 (UTC) Received: from bzdocha.local (unknown [10.43.2.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 199385E482; Tue, 1 Feb 2022 14:33:59 +0000 (UTC) X-MC-Unique: zmfVxeFdMRu9coW4t7E-tQ-1 From: Lubomir Rintel To: libvir-list@redhat.com Subject: [PATCH 1/3] util: add ARCH_IS_MIPS helper macro Date: Tue, 1 Feb 2022 15:33:53 +0100 Message-Id: <20220201143355.2492270-2-lkundrak@v3.sk> In-Reply-To: <20220201143355.2492270-1-lkundrak@v3.sk> References: <20220201143355.2492270-1-lkundrak@v3.sk> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Tue, 01 Feb 2022 09:43:31 -0500 Cc: Lubomir Rintel 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1643726632068100001 Content-Type: text/plain; charset="utf-8" Identifies all of various MIPS sub-architectures: 32-bit or 64-bit, little-endian or big-endian. Signed-off-by: Lubomir Rintel Reviewed-by: Michal Privoznik --- src/util/virarch.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util/virarch.h b/src/util/virarch.h index 528f84f8a5..81b1b27a57 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -95,6 +95,11 @@ typedef enum { #define ARCH_IS_S390(arch) ((arch) =3D=3D VIR_ARCH_S390 ||\ (arch) =3D=3D VIR_ARCH_S390X) =20 +#define ARCH_IS_MIPS(arch) ((arch) =3D=3D VIR_ARCH_MIPS ||\ + (arch) =3D=3D VIR_ARCH_MIPSEL ||\ + (arch) =3D=3D VIR_ARCH_MIPS64 ||\ + (arch) =3D=3D VIR_ARCH_MIPS64EL) + #define ARCH_IS_MIPS64(arch) ((arch) =3D=3D VIR_ARCH_MIPS64 ||\ (arch) =3D=3D VIR_ARCH_MIPS64EL) =20 --=20 2.34.1 From nobody Mon Feb 9 06:50:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1643726621138190.66698736668673; Tue, 1 Feb 2022 06:43:41 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-204-9Xz69wfJPjaSbRM9R3WR6g-1; Tue, 01 Feb 2022 09:43:38 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A142E1018721; Tue, 1 Feb 2022 14:43:33 +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 698A5752DB; Tue, 1 Feb 2022 14:43:33 +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 BB2F04CA93; Tue, 1 Feb 2022 14:43:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 211EY1nE015846 for ; Tue, 1 Feb 2022 09:34:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id B23B85E482; Tue, 1 Feb 2022 14:34:01 +0000 (UTC) Received: from bzdocha.local (unknown [10.43.2.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1232F5E485; Tue, 1 Feb 2022 14:34:00 +0000 (UTC) X-MC-Unique: 9Xz69wfJPjaSbRM9R3WR6g-1 From: Lubomir Rintel To: libvir-list@redhat.com Subject: [PATCH 2/3] qemu: add qemuDomainIsMipsMalta() Date: Tue, 1 Feb 2022 15:33:54 +0100 Message-Id: <20220201143355.2492270-3-lkundrak@v3.sk> In-Reply-To: <20220201143355.2492270-1-lkundrak@v3.sk> References: <20220201143355.2492270-1-lkundrak@v3.sk> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Tue, 01 Feb 2022 09:43:31 -0500 Cc: Lubomir Rintel 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1643726624167100001 Content-Type: text/plain; charset="utf-8" This identifies various MIPS Malta machines, be it 32-bit or 64-bit, little-endian or big-endian. Signed-off-by: Lubomir Rintel Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 21 +++++++++++++++++++++ src/qemu/qemu_domain.h | 1 + 2 files changed, 22 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6b915d7535..0bae9b9202 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8647,6 +8647,20 @@ qemuDomainMachineIsPSeries(const char *machine, } =20 =20 +static bool +qemuDomainMachineIsMipsMalta(const char *machine, + const virArch arch) +{ + if (!ARCH_IS_MIPS(arch)) + return false; + + if (STREQ(machine, "malta")) + return true; + + return false; +} + + /* You should normally avoid this function and use * qemuDomainHasBuiltinIDE() instead. */ bool @@ -8719,6 +8733,13 @@ qemuDomainIsPSeries(const virDomainDef *def) } =20 =20 +bool +qemuDomainIsMipsMalta(const virDomainDef *def) +{ + return qemuDomainMachineIsMipsMalta(def->os.machine, def->os.arch); +} + + bool qemuDomainHasPCIRoot(const virDomainDef *def) { diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index e5046367e3..78474b3f73 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -770,6 +770,7 @@ bool qemuDomainIsS390CCW(const virDomainDef *def); bool qemuDomainIsARMVirt(const virDomainDef *def); bool qemuDomainIsRISCVVirt(const virDomainDef *def); bool qemuDomainIsPSeries(const virDomainDef *def); +bool qemuDomainIsMipsMalta(const virDomainDef *def); bool qemuDomainHasPCIRoot(const virDomainDef *def); bool qemuDomainHasPCIeRoot(const virDomainDef *def); bool qemuDomainHasBuiltinIDE(const virDomainDef *def); --=20 2.34.1 From nobody Mon Feb 9 06:50:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 16437266312391020.6482964521517; Tue, 1 Feb 2022 06:43:51 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-581-LU0BIKxoP0WkkHUdwlVQvw-1; Tue, 01 Feb 2022 09:43:48 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CF323185303E; Tue, 1 Feb 2022 14:43:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A218D70D33; Tue, 1 Feb 2022 14:43:42 +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 6DF911809CBF; Tue, 1 Feb 2022 14:43:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 211EY2UJ015851 for ; Tue, 1 Feb 2022 09:34:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id AB6D15E485; Tue, 1 Feb 2022 14:34:02 +0000 (UTC) Received: from bzdocha.local (unknown [10.43.2.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0BB515E4A4; Tue, 1 Feb 2022 14:34:01 +0000 (UTC) X-MC-Unique: LU0BIKxoP0WkkHUdwlVQvw-1 From: Lubomir Rintel To: libvir-list@redhat.com Subject: [PATCH 3/3] qemu: add PCI root to MIPS Malta machine Date: Tue, 1 Feb 2022 15:33:55 +0100 Message-Id: <20220201143355.2492270-4-lkundrak@v3.sk> In-Reply-To: <20220201143355.2492270-1-lkundrak@v3.sk> References: <20220201143355.2492270-1-lkundrak@v3.sk> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Tue, 01 Feb 2022 09:43:31 -0500 Cc: Lubomir Rintel 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1643726632759100003 Content-Type: text/plain; charset="utf-8" MIPS Malta (and no other supported MIPS machine) has a PCI bus. Signed-off-by: Lubomir Rintel Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0bae9b9202..b7aad65048 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3703,6 +3703,14 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, addPCIRoot =3D true; break; =20 + case VIR_ARCH_MIPS: + case VIR_ARCH_MIPSEL: + case VIR_ARCH_MIPS64: + case VIR_ARCH_MIPS64EL: + if (qemuDomainIsMipsMalta(def)) + addPCIRoot =3D true; + break; + case VIR_ARCH_ARMV7B: case VIR_ARCH_CRIS: case VIR_ARCH_ITANIUM: @@ -3710,10 +3718,6 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, case VIR_ARCH_M68K: case VIR_ARCH_MICROBLAZE: case VIR_ARCH_MICROBLAZEEL: - case VIR_ARCH_MIPS: - case VIR_ARCH_MIPSEL: - case VIR_ARCH_MIPS64: - case VIR_ARCH_MIPS64EL: case VIR_ARCH_OR32: case VIR_ARCH_PARISC: case VIR_ARCH_PARISC64: --=20 2.34.1