From nobody Thu Nov 13 18:06:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581940035764314.6844334747067; Mon, 17 Feb 2020 03:47:15 -0800 (PST) Received: from localhost ([::1]:44112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3erq-0008MC-8Q for importer@patchew.org; Mon, 17 Feb 2020 06:47:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40598) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3eqL-0006TH-VM for qemu-devel@nongnu.org; Mon, 17 Feb 2020 06:45:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3eqK-0002OT-Vg for qemu-devel@nongnu.org; Mon, 17 Feb 2020 06:45:41 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:45282) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j3eqK-0002NS-Pm; Mon, 17 Feb 2020 06:45:40 -0500 Received: by mail-wr1-x441.google.com with SMTP id g3so19302341wrs.12; Mon, 17 Feb 2020 03:45:40 -0800 (PST) Received: from x1w.redhat.com (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id i2sm268149wmb.28.2020.02.17.03.45.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 03:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nvtVA24YsHTPrSYwj3qF+5DzrFJmWkSlCMlNJG9JnqE=; b=VQF9b72RHHe7Ve/RYts9HftY4hap3MiHLjyWjcgzehS0c+FM//w6Jjqqm8mj6okGhZ ZR5Bn4xmXPzDuPzxKlXGPkddOlJn5iwIMen2m44Uw+lgIBmiC2DD76VybtxlF8P1ULou 2y8F6trv96sbadbq9GdLlqW2uKrnSUhClFrtaYxkVySNjdVwigIpj97FLp4vBmMO2UTj jxXD4pBiUkPifDaDyQ3QEoMgSjii0iUhpJHOJasqqPESWe6gfursFxVOTmtWSesb1wRA jT+bi6pQBeeeolI0ysrZWZ/UOhm5qG1XPOjcPtf79ICO4yyPnoLmIFXa5Yk50ik2TNu+ C9dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nvtVA24YsHTPrSYwj3qF+5DzrFJmWkSlCMlNJG9JnqE=; b=VwNiq275GV5p7l1Bzbhv1va0E8A9kRG+fiRBfEJQSFubEV/7th2P/mdFHhzu9pB86h nsQA3dviZLXMAlOmPlnfI94j+IOH/n54qOFS2oFetnD5OeyhShBwwDQbpKPNOUmiiN++ Kgb63J41r0jLLHpxMkjWSyuYc3Ye7LCaDGl+ncUKtDzkqWTXi1xSIjohI6tsWejFOLRD Tv7GD+U0zx840t+W3V5I6PhBErd2yYrXDyaFkdTM5ZWeBOOaZ4hwVjXeBo32vq37fGKn m2BKSimn+z8pVt/WA12V+XypMqRYB7kBETRMeAx8XSVJGHchawpjfOd/SxA6MNua16Rg cEKQ== X-Gm-Message-State: APjAAAXwdQblR71unA/lgBnNXNrpbH9/n/XHNHEX1+OjME/9GVD/qvSU mg6jI96q+hYpmGkeV2dH4uvGWphnygs= X-Google-Smtp-Source: APXvYqys9gdI4WIvl1HTytt/s8/fdZZO0S+4nqbKCR6trw5eKJo+PWp9YLJv364WkSGZ01x6MS1LQw== X-Received: by 2002:adf:ec0d:: with SMTP id x13mr21591033wrn.400.1581939939548; Mon, 17 Feb 2020 03:45:39 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/13] hw/arm/raspi: Use more specific machine names Date: Mon, 17 Feb 2020 12:45:23 +0100 Message-Id: <20200217114533.17779-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200217114533.17779-1-f4bug@amsat.org> References: <20200217114533.17779-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Luc Michel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Now that we can instantiate different machines based on their board_rev register value, we can have various raspi2 and raspi3. In commit fc78a990ec103 we corrected the machine description. Correct the machine names too. For backward compatibility, add an alias to the previous generic name. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- hw/arm/raspi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 1a8c135dc6..d9e8acfe3b 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -327,6 +327,7 @@ static void raspi2b_machine_class_init(ObjectClass *oc,= void *data) MachineClass *mc =3D MACHINE_CLASS(oc); RaspiMachineClass *rmc =3D RASPI_MACHINE_CLASS(oc); =20 + mc->alias =3D "raspi2"; rmc->board_rev =3D 0xa21041; raspi_machine_class_common_init(mc, rmc->board_rev); }; @@ -337,6 +338,7 @@ static void raspi3b_machine_class_init(ObjectClass *oc,= void *data) MachineClass *mc =3D MACHINE_CLASS(oc); RaspiMachineClass *rmc =3D RASPI_MACHINE_CLASS(oc); =20 + mc->alias =3D "raspi3"; rmc->board_rev =3D 0xa02082; raspi_machine_class_common_init(mc, rmc->board_rev); }; @@ -344,12 +346,12 @@ static void raspi3b_machine_class_init(ObjectClass *o= c, void *data) =20 static const TypeInfo raspi_machine_types[] =3D { { - .name =3D MACHINE_TYPE_NAME("raspi2"), + .name =3D MACHINE_TYPE_NAME("raspi2b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, #ifdef TARGET_AARCH64 }, { - .name =3D MACHINE_TYPE_NAME("raspi3"), + .name =3D MACHINE_TYPE_NAME("raspi3b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, #endif --=20 2.21.1