From nobody Mon May 5 05:35:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: <devel-bounces@lists.libvirt.org> Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1738401397539943.6031118686301; Sat, 1 Feb 2025 01:16:37 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id D148F1A88; Sat, 1 Feb 2025 04:16:36 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D62C11A48; Sat, 1 Feb 2025 04:15:55 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 66DE71A93; Sat, 1 Feb 2025 04:15:52 -0500 (EST) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 A5E371A92 for <devel@lists.libvirt.org>; Sat, 1 Feb 2025 04:15:43 -0500 (EST) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-385ddcfc97bso2157129f8f.1 for <devel@lists.libvirt.org>; Sat, 01 Feb 2025 01:15:43 -0800 (PST) Received: from localhost.localdomain (232.170.88.92.rev.sfr.net. [92.88.170.232]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc13151sm115999295e9.1.2025.02.01.01.15.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 01 Feb 2025 01:15:42 -0800 (PST) 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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738401342; x=1739006142; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8SVQMLAYnWYkem+1LN8L06NityQ8o7wifm7JnMwf0uI=; b=Y3CF3HRTAFsWYmy10IhpnavLHv9w4/F6vNYOr4bcnZ5cyiVSmeMwXekCiL3SisA/Zs 7mlnCy8pNFJLRfjj/iZrLavDYs9T5d5speo86welt8JVh3isrZvRaiEjmArnD9qecWh0 KFGDz3u16rTTZadRAbKdhnExKd6X8gQYIUC2CPiqrTlpBpy8zyyzekA2HExg1E18kQn/ KLBpc8sXyVqdVq+ztWS/O4KGu8wTc+jDAo3IW6u3XLTdTrTvd4W4eRNvnmH/TdXvHN+w knKUGUkBBE6GNipycVgVgE8JP5Ww0I0ZUux6kUv2BPkUcW5qclxjECrH/7pZ9vzTLDUp mY5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738401342; x=1739006142; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8SVQMLAYnWYkem+1LN8L06NityQ8o7wifm7JnMwf0uI=; b=OTod5P3afUP+iSZY40cIo1UeOaR3JI75J9ck9apRbj+7+iWlA6p1CHyw5hRmcxxCKh 9lI8kVsnOgalMvJR+RX5JloudaSeOh8kXWD8S2ylWcVqUVeSxeAxdUb3ccZnlvX34t6n 6I+dhdwyLnrlKr1RfEwTW1kJKaNtjfVjxoB/29eIenKMpmT2O4OLhReu9y+c7kp333dm slffwINigWNEViqe3bB1WT7fHe3kHbJbOqjSA1Pmva5UPQe14Wf3s5TvqRoQph4Gwqdy k5WbQu84bNHXPbuK18pOJ7YwDU4+oamvIoi3IHStL8+RGg8ZHdJbwSuScM7ZI61FalBv f6yQ== X-Forwarded-Encrypted: i=1; AJvYcCWxYebCwPQygjMdTylbFPNatmV+mNiQfpujYU5ynXMMQf0CZukt55xnEtrKR/77+bsK/e4sLQ==@lists.libvirt.org X-Gm-Message-State: AOJu0YyRCqhXt9CNsqUddzlwZWs+iOVWcjIkqip0CyeAXzNKXsHKrUKZ iO96QrHvmFlQeS79di/5bLjTLVQhrh+Fqar9o9AnjILGL51a2m65dN5B2jYg5mE= X-Gm-Gg: ASbGnctHljTZQrFrnsuIUCBqUQG5mbcucPg4/Q4Q3unHM3JrN+6/jF0ZkHTNGHAgvjN T2HK3xkMTMVRsASCfgP0mCy/teaSE4n0SFpPVgYMETZHgGUuNmCCqTFio2K84p7ldpPcEa7OW5T duJvuV4S+byO30NNaTSZdK5K1wDjhgIn2flisTZRYkdxIVxvZzMHyXcjBXUQdgdFlVJdmFZpBak pe2xAfXtuJ+sZRCGtRS9zVttgBtQSIhPS6AA9OpcJt+wVgv1poyPRweIrJvBhJRd0ZPjdRowp3g qJ+OYVH2UIbbj9n0ixIkss0YDYHV2vHnGN4UUmmeq1knTB4tOSEcxdq2SVxXIGJKcA== X-Google-Smtp-Source: AGHT+IHRXnkkbk0ZZQ6tl39QprkH5MxX2Z/uA6l3tQp41XDzBDESwm20wCvmraMaIqfRDq30jGNxmw== X-Received: by 2002:a5d:5583:0:b0:386:37f5:99e7 with SMTP id ffacd0b85a97d-38c5196fd12mr9884961f8f.33.1738401342505; Sat, 01 Feb 2025 01:15:42 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org> To: qemu-devel@nongnu.org Subject: [PATCH 2/7] hw/arm/raspi4b: Introduce abstract raspi4-base machine type Date: Sat, 1 Feb 2025 10:15:23 +0100 Message-ID: <20250201091528.1177-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250201091528.1177-1-philmd@linaro.org> References: <20250201091528.1177-1-philmd@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2TFLZMRCCSLMVUNT5MCHICVDHCB5ADJY X-Message-ID-Hash: 2TFLZMRCCSLMVUNT5MCHICVDHCB5ADJY X-MailFrom: philmd@linaro.org X-Mailman-Rule-Hits: nonmember-moderation 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 CC: Jared Mauch <jared+home@puck.nether.net>, Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org, devel@lists.libvirt.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org> X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools <devel.lists.libvirt.org> Archived-At: <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/2TFLZMRCCSLMVUNT5MCHICVDHCB5ADJY/> List-Archive: <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/> List-Help: <mailto:devel-request@lists.libvirt.org?subject=help> List-Post: <mailto:devel@lists.libvirt.org> List-Subscribe: <mailto:devel-join@lists.libvirt.org> List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org> X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1738401398316019000 Content-Type: text/plain; charset="utf-8" In preparation of adding more machines based on the raspi4, introduce TYPE_RASPI4_MACHINE. Remove TYPE_RASPI4B_MACHINE definitions, declaring the machine name in place via the MACHINE_TYPE_NAME("raspi4b") macro. Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org> --- hw/arm/raspi4b.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 5c78d26f957..548059f6d69 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -23,8 +23,8 @@ #include "hw/arm/bcm2838.h" #include <libfdt.h> =20 -#define TYPE_RASPI4B_MACHINE MACHINE_TYPE_NAME("raspi4b") -OBJECT_DECLARE_SIMPLE_TYPE(Raspi4bMachineState, RASPI4B_MACHINE) +#define TYPE_RASPI4_MACHINE MACHINE_TYPE_NAME("raspi4-base") +OBJECT_DECLARE_SIMPLE_TYPE(Raspi4bMachineState, RASPI4_MACHINE) =20 struct Raspi4bMachineState { RaspiBaseMachineState parent_obj; @@ -93,7 +93,7 @@ static void raspi4_modify_dtb(const struct arm_boot_info = *info, void *fdt) =20 static void raspi4b_machine_init(MachineState *machine) { - Raspi4bMachineState *s =3D RASPI4B_MACHINE(machine); + Raspi4bMachineState *s =3D RASPI4_MACHINE(machine); RaspiBaseMachineState *s_base =3D RASPI_BASE_MACHINE(machine); RaspiBaseMachineClass *mc =3D RASPI_BASE_MACHINE_GET_CLASS(machine); BCM2838State *soc =3D &s->soc; @@ -123,11 +123,15 @@ static void raspi4b_machine_class_init(ObjectClass *o= c, void *data) =20 static const TypeInfo raspi4_machine_types[] =3D { { - .name =3D TYPE_RASPI4B_MACHINE, + .name =3D MACHINE_TYPE_NAME("raspi4b"), + .parent =3D TYPE_RASPI4_MACHINE, + .class_init =3D raspi4b_machine_class_init, + }, { + .name =3D TYPE_RASPI4_MACHINE, .parent =3D TYPE_RASPI_BASE_MACHINE, .instance_size =3D sizeof(Raspi4bMachineState), - .class_init =3D raspi4b_machine_class_init, - }, + .abstract =3D true, + } }; =20 DEFINE_TYPES(raspi4_machine_types) --=20 2.47.1