From nobody Tue Feb 10 20:47:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625756126; cv=none; d=zohomail.com; s=zohoarc; b=nvZtUGtzT86vH4BzcNa5cWcNgBn8//LtPNEnXAdJgO38A9D9GZEaEKxaJfUwg++txrjrDvmsqJ+TtBOKby+ot0Ql7946BDJVeawuftEm1v0FT5BPA0KmXZ2bhpKwo+AL1BPXRLFtFjtM4sV6Hu0Q+2Bac8XrOOj5lnWARcIW7W8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625756126; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=scw2wo0mPwJC6QGG0i72m5GJBT0VX1Nv3M7vQANUqmY=; b=OjIdYlpTgpakLzPEjdg74YWOniE9MStytX+C6wPO5xO2g10LZcu5mmIgdE+7B07r4xGvIWsrJwkpl1JceaUnvO8Fgq0zXr5nXMPF/w2ECV7IX96XiF5WZGdTxex1TpAwUC6nH80haGRyMPbqmTZJZlfTzltaEoLYfhGvPJnTAPw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1625756126712786.9333645547041; Thu, 8 Jul 2021 07:55:26 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id k4so1605516wrc.8 for ; Thu, 08 Jul 2021 07:55:26 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id m5sm9074658wmq.2.2021.07.08.07.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 07:55:24 -0700 (PDT) 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=scw2wo0mPwJC6QGG0i72m5GJBT0VX1Nv3M7vQANUqmY=; b=ocBscwA6tvIiy91K/dWyI7vvH5XYwRAEmt+BZ24F3bDuM7GjZsT7/pUtZF3UirMn/x IpbUW3sjFpAzoehYVzfILSydD7IlQakGrmMpBATwXqBXPUwSwC6WLJfZHRrXvc7XEGzl p/o7bAoBJI6Jxb4zeqgD4yjf+UEmTWpe0hgfZWT6N0tFnsZn/dhQDddQIXRvY58ZClVI Mk+86dI2VyBrXxUw4o+363I8cPb3IeMCRmA5VckQ8LURgg0rKwv2rDzoCyYfKEZQyA4J K908JI4Yyb+VTRYC/Xt3R7JxZlKYAJ7+LIXuKhH2+YNM2pqOXxOlv3KuF/FYzrXQSi40 kRbg== 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=scw2wo0mPwJC6QGG0i72m5GJBT0VX1Nv3M7vQANUqmY=; b=Y+hHHm+z/OcKUq7fmhiUo7JAwv6JnBuFlc7L96ua2tVw6ipo2+GE8CKsfzBnCXD6Yo 0ojBvPg6SrJZdk873b4x+mauiDHmfQ49tzpsaIc1+QrDBRX8yhIw67/9By0LErPurE3C 9CAxT28ws6IhY5RUdrMz7upVjavRx54N9TwEye6KWHSk7VAzM+cPqq9peOAcld5DReWw C7e/5H44GqMXRDTblMESolsqH3a3pwDjq4oYClI9bs44JOF9wEbajp4T0MTP0H5UnfdO ovD1P5dQpicz9JfYJjgY6mGB9G4UCFC0YkcqGBdsLO59TI3AegZt/dxXDqhDrd6CC4OY 8H5w== X-Gm-Message-State: AOAM5320I7iBYiZtCcC59UblUQ5sRMJl8bYteTOxErWZHbZhZPpb6r7A A2xXPfYRDHTmR4OAmR1+J4U= X-Google-Smtp-Source: ABdhPJwoA07cVfDEQ1ObnxJ5xHrnSbPP9mZSzmvBC2fPSAOkbsvihj9AQsr1b/KEFOQU8Aexv0SS3w== X-Received: by 2002:adf:e488:: with SMTP id i8mr35235594wrm.285.1625756124971; Thu, 08 Jul 2021 07:55:24 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Paolo Bonzini , Wainer dos Santos Moschetta , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Date: Thu, 8 Jul 2021 16:55:14 +0200 Message-Id: <20210708145514.1751773-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210708145514.1751773-1-f4bug@amsat.org> References: <20210708145514.1751773-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625756128967100001 Remove the raspi2/raspi3 machine aliases, deprecated since commit 155e1c82ed0. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/system/deprecated.rst | 7 ------- docs/system/removed-features.rst | 7 +++++++ hw/arm/raspi.c | 2 -- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 70e08baff62..516a926d76a 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -207,13 +207,6 @@ this CPU is also deprecated. System emulator machines ------------------------ =20 -Raspberry Pi ``raspi2`` and ``raspi3`` machines (since 5.2) -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -The Raspberry Pi machines come in various models (A, A+, B, B+). To be able -to distinguish which model QEMU is implementing, the ``raspi2`` and ``rasp= i3`` -machines have been renamed ``raspi2b`` and ``raspi3b``. - Aspeed ``swift-bmc`` machine (since 6.1) '''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 2b21bd39ab9..d6fe2899933 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -349,6 +349,13 @@ This machine has been renamed ``fuloong2e``. These machine types were very old and likely could not be used for live migration from old QEMU versions anymore. Use a newer machine type instead. =20 +Raspberry Pi ``raspi2`` and ``raspi3`` machines (removed in 6.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +The Raspberry Pi machines come in various models (A, A+, B, B+). To be able +to distinguish which model QEMU is implementing, the ``raspi2`` and ``rasp= i3`` +machines have been renamed ``raspi2b`` and ``raspi3b``. + =20 linux-user mode CPUs -------------------- diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index b30a17871f7..533bfb8cbce 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -340,7 +340,6 @@ 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); }; @@ -360,7 +359,6 @@ 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); }; --=20 2.31.1