From nobody Tue Feb 10 08:03:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1630044525468806.8989294175801; Thu, 26 Aug 2021 23:08:45 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-548-VHTcmAFVNUSH0__Fj89hoA-1; Fri, 27 Aug 2021 02:08:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD0C58799E0; Fri, 27 Aug 2021 06:08:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E947C5C1D5; Fri, 27 Aug 2021 06:08:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9A55B4BB7B; Fri, 27 Aug 2021 06:08:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17R68V7W016692 for ; Fri, 27 Aug 2021 02:08:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 64D051014600; Fri, 27 Aug 2021 06:08:31 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 60DF6101026A for ; Fri, 27 Aug 2021 06:08:31 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4996588647B for ; Fri, 27 Aug 2021 06:08:31 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-492-0D6k6nvkNo2chjSKq5HGnA-1; Fri, 27 Aug 2021 02:08:28 -0400 Received: by mail-wm1-f54.google.com with SMTP id u15so3148340wmj.1; Thu, 26 Aug 2021 23:08:28 -0700 (PDT) Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id t7sm5749610wrq.90.2021.08.26.23.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 23:08:27 -0700 (PDT) X-MC-Unique: VHTcmAFVNUSH0__Fj89hoA-1 X-MC-Unique: 0D6k6nvkNo2chjSKq5HGnA-1 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=WSbYTFwwkvbP0T9ubAhocGN3uSanum6AaagZStt6WoY=; b=mKKXyh0C1pcCn9kmXkYzG0jwe02uUHIz7KmdWXIwQ5rUkQ/mZpkdAatlyPSq5TCxa3 becmz7Lhzv4IpzuJmfhpYPP0i8EnKteG3tPct4gYS5NFG74tkc+3VQozuQSQy+6deXGS 9JM0FJoqD5qAcVxB4Vxx1pj3Ehq+qlkJzlLNolwQ3Jy0CWTxxfKVVjL+l2F7SAQdWutE grsQ8g4wZ71lpzPTHibfZ2yLO0GL9LluBDp9hw/gmkMs85J+BPLoR1nN7wiwLq0VWpGh 1Gj+beeA5aEn2JadXiaKwUSgJFUPQI2PiICOMDLPK9hLZxR64Nlj9zego9h/SGF55D3d LYOA== X-Gm-Message-State: AOAM531o9NqBz2raEGPqW/Q00LwCQiwCjxHfUQCpm6f0elXcJsSKpIWp Aole0/DjBm5lga2CD11hZZg= X-Google-Smtp-Source: ABdhPJxoe+BOsDm8LytXjGkRPCTdcKlvhE2/vJIdvZulRukiFTYx/Q+c/9jNJif9toUKhXz4xz3S4Q== X-Received: by 2002:a1c:4e16:: with SMTP id g22mr7009875wmh.55.1630044507581; Thu, 26 Aug 2021 23:08:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 2/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Date: Fri, 27 Aug 2021 08:08:15 +0200 Message-Id: <20210827060815.2384760-3-f4bug@amsat.org> In-Reply-To: <20210827060815.2384760-1-f4bug@amsat.org> References: <20210827060815.2384760-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Peter Maydell , Thomas Huth , libvir-list@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , qemu-arm@nongnu.org X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1630044525980100001 Remove the raspi2/raspi3 machine aliases, deprecated since commit 155e1c82ed0. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/about/deprecated.rst | 7 ------- docs/about/removed-features.rst | 7 +++++++ hw/arm/raspi.c | 2 -- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 8d4fd384a59..1e1a5e96ad4 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/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/about/removed-features.rst b/docs/about/removed-features.= rst index 08f9e625ce6..9d0d90c90d9 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -574,6 +574,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.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``. + =20 linux-user mode CPUs -------------------- diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 0ada91c05e9..146d35382bf 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