From nobody Thu Apr 25 15:57:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620039471; cv=none; d=zohomail.com; s=zohoarc; b=gtoKNFeH17T42oH1P5nXNiXNZKYqa1dSSygeHXN5A1OEDkLiskU75uMr/3nAdOQyqOBZwt+GJbPpW/+qnUIkbX89MBh93LjsYg4B4rVHRu/S7qIqgzH4wKl3klMaXZ56B+CEl/+vVZzOC6nIsD30MAcr3fTK2of8OZycrFgGCy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620039471; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=OCTLX3eF033BPqeFFzMGdbkKu+ZUIhKDq+RmE3hqCtA=; b=AyU8+/Bw7twLb2erh6PrhgBn+CyWXWv96iJoxQIMhEcgJQs4oF50LQSk4MsANLEKTW6N0ZMUQTK8OL1G5e+dKvyKPdVp8DSdlNJuuavusIdJCfHRhDuwUh3S/KMj73OyFmS/lqC/gt15PgQAzRO9DfhPziuuavo6b3WIqRfw8Vk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1620039471207879.4012610798978; Mon, 3 May 2021 03:57:51 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id s5-20020a7bc0c50000b0290147d0c21c51so3262400wmh.4 for ; Mon, 03 May 2021 03:57:50 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id r13sm13053302wrn.2.2021.05.03.03.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 03:57:49 -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:mime-version :content-transfer-encoding; bh=OCTLX3eF033BPqeFFzMGdbkKu+ZUIhKDq+RmE3hqCtA=; b=jyk39Jp5pJ+EG+JG5U0bT+P2lDvseVKi08b97dtGgVuyGUr64yNPx5JvTxfuykv4em /H/VxhFqDaSt11gfHYtDQOnA6ePw6SYwbtqeoFM0mdjLI7KaqXUujPrn12T0x4/bmDeV V8V2n3vc17IhglNuwJqimeRWO6BpEbbeowA5uVQNtA3wRWMQajVE+qkH3RUd6l2U8c+v REDZeCcAEoItyNmaGLnCK5JJM9m7JUtxwlZXFH0em2qSJHmcE//YPfMx2NkK0lb9N0J+ hVsK48ps2BLoxT/QZgmkZuh2bvnxOFJCif9q8n172O1knt5pu+58dgwInzEfHsh+TAVM nxCQ== 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 :mime-version:content-transfer-encoding; bh=OCTLX3eF033BPqeFFzMGdbkKu+ZUIhKDq+RmE3hqCtA=; b=P+PycO8bNusePLc4x5hSjQXRF3QRTNnQeGqsnwT/3kHPYhUG9rrbwuakyn8mu0VBjI Fg+eOH8tk07kdQoTkiJ6pw7T9ufT5QaEClP6VzQ6gxvEpCY9BGF7PDzykU1BKgYjoqNx 9mbozyoU45ZV/iKl3+F0BOsytZ5JcWmZAS/RIjb7fOb5ZqTIG4ShDGa3gQuPjfEMX+Eh wCDhoTLKySlU4964mhhU7jwVQ4GO2HBE7Le3yi1yZ/d8bc41tRsmdPNbCPVjDWwAt1+3 QFxIM9LSfloC/c5EI4YbnWBObLtuMuCPxy04srRgV+MVIWrgaSTWKCxtrllmd2qapry+ GMag== X-Gm-Message-State: AOAM530ExOQeSQbp/A6sv9yQXGL8o4vaU0NiD3Rvyz2B4FteN2DDSFUJ O+Uoq3w6vecbHHoQ/M2R33s= X-Google-Smtp-Source: ABdhPJwqXAX/GKKF8RdfLo38qHC4qanqMleaKagu1Jf0tys0g7gbn0sqCnC/KUQ3a46rp9BTX/zQ1g== X-Received: by 2002:a1c:3b44:: with SMTP id i65mr32294725wma.31.1620039469514; Mon, 03 May 2021 03:57:49 -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: Andrew Baumann , Peter Maydell , libvir-list@redhat.com, qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Date: Mon, 3 May 2021 12:57:47 +0200 Message-Id: <20210503105747.703149-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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 80cae862528..7895bd4d849 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -238,13 +238,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``. - Device options -------------- =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 29e90601a51..8a8b8ca627b 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -312,6 +312,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 990509d3852..20bba0316f1 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -342,7 +342,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); }; @@ -362,7 +361,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.26.3