From nobody Mon Feb 9 10:30:42 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1709053570708135.0289515953184; Tue, 27 Feb 2024 09:06:10 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9F2631B43; Tue, 27 Feb 2024 12:06:09 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 23CFE1E3D; Tue, 27 Feb 2024 11:38:52 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0DDD21A52; Tue, 27 Feb 2024 11:38:13 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9339419A7 for ; Tue, 27 Feb 2024 11:36:40 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-167-xgslEKcIPZmOp8Q-zwNpZQ-1; Tue, 27 Feb 2024 11:36:38 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9F3A32812FE2 for ; Tue, 27 Feb 2024 16:36:38 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 145D21C060B1 for ; Tue, 27 Feb 2024 16:36:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: xgslEKcIPZmOp8Q-zwNpZQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 09/25] qemuDomainDefAddDefaultDevices: Handle defaults for all ARM arches together Date: Tue, 27 Feb 2024 17:36:11 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 7EYBU4R7A4JA6YSF3DSXHCJ3RHEMXCFK X-Message-ID-Hash: 7EYBU4R7A4JA6YSF3DSXHCJ3RHEMXCFK X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1709053571838100001 Most machine types are avaliable in all arches by qemu. This is also true for the 'versatilepb' machine type example in the tests. Move all the ARM architectures together so that they are handled in sync. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 8 ++++---- ...ch64-versatilepb-minimal.aarch64-latest.abi-update.xml | 1 + .../aarch64-versatilepb-minimal.aarch64-latest.xml | 1 + ...rmv7l-versatilepb-minimal.armv7l-latest.abi-update.xml | 1 + .../armv7l-versatilepb-minimal.armv7l-latest.xml | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index aa58af8c22..eef4f8f937 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4198,14 +4198,15 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *drive= r, break; case VIR_ARCH_ARMV6L: + case VIR_ARCH_ARMV7L: + case VIR_ARCH_ARMV7B: + case VIR_ARCH_AARCH64: if (STREQ(def->os.machine, "versatilepb")) addPCIRoot =3D true; - break; - case VIR_ARCH_ARMV7L: - case VIR_ARCH_AARCH64: if (qemuDomainIsARMVirt(def)) addPCIeRoot =3D true; + break; case VIR_ARCH_PPC64: @@ -4262,7 +4263,6 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, addPCIRoot =3D true; break; - case VIR_ARCH_ARMV7B: case VIR_ARCH_CRIS: case VIR_ARCH_ITANIUM: case VIR_ARCH_LM32: diff --git a/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-late= st.abi-update.xml b/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch= 64-latest.abi-update.xml index 0c89217409..2b5feaa665 100644 --- a/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.abi-= update.xml +++ b/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.abi-= update.xml @@ -15,6 +15,7 @@ destroy /usr/bin/qemu-system-aarch64 + diff --git a/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-late= st.xml b/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.x= ml index 0c89217409..2b5feaa665 100644 --- a/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.xml @@ -15,6 +15,7 @@ destroy /usr/bin/qemu-system-aarch64 + diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest= .abi-update.xml b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-l= atest.abi-update.xml index b2a8d254d6..2c15244cc4 100644 --- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-up= date.xml +++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-up= date.xml @@ -17,6 +17,7 @@ destroy /usr/bin/qemu-system-armv7l + diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest= .xml b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml index b2a8d254d6..2c15244cc4 100644 --- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml +++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml @@ -17,6 +17,7 @@ destroy /usr/bin/qemu-system-armv7l + --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org