From: David Gibson <david@gibson.dropbear.id.au>
To: Thomas Huth <thuth@redhat.com>
Cc: qemu-ppc@nongnu.org, Alexander Graf <agraf@suse.de>,
qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] target/ppc/cpu-models: Fix/remove bad CPU aliases
Date: Tue, 31 Jan 2017 13:46:55 +1100 [thread overview]
Message-ID: <20170131024655.GH14879@umbus.fritz.box> (raw)
In-Reply-To: <1485258485-22844-1-git-send-email-thuth@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 2312 bytes --]
On Tue, Jan 24, 2017 at 12:48:05PM +0100, Thomas Huth wrote:
> There is no CPU model called "7447_v1.2" in our list, so the
> "7447" alias should point to "7447_v1.1" instead. Let's also
> remove the "codename" aliases that point to non-implemented
> CPU models - they are really of no use here.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Merged to ppc-for-2.9, thanks.
> ---
> target/ppc/cpu-models.c | 22 ++--------------------
> 1 file changed, 2 insertions(+), 20 deletions(-)
>
> diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
> index 506dee1..4d3e635 100644
> --- a/target/ppc/cpu-models.c
> +++ b/target/ppc/cpu-models.c
> @@ -1375,19 +1375,15 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
> { "7445", "7445_v3.2" },
> { "7455", "7455_v3.2" },
> { "Apollo6", "7455" },
> - { "7447", "7447_v1.2" },
> + { "7447", "7447_v1.1" },
> { "7457", "7457_v1.2" },
> { "Apollo7", "7457" },
> { "7447A", "7447A_v1.2" },
> { "7457A", "7457A_v1.2" },
> { "Apollo7PM", "7457A_v1.0" },
> #if defined(TARGET_PPC64)
> - { "Trident", "620" },
> { "POWER3", "630" },
> - { "Boxer", "POWER3" },
> - { "Dino", "POWER3" },
> { "POWER3+", "631" },
> - { "POWER5gr", "POWER5" },
> { "POWER5+", "POWER5+_v2.1" },
> { "POWER5gs", "POWER5+_v2.1" },
> { "POWER7", "POWER7_v2.3" },
> @@ -1399,21 +1395,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
> { "970", "970_v2.2" },
> { "970fx", "970fx_v3.1" },
> { "970mp", "970mp_v1.1" },
> - { "Apache", "RS64" },
> - { "A35", "RS64" },
> - { "NorthStar", "RS64-II" },
> - { "A50", "RS64-II" },
> - { "Pulsar", "RS64-III" },
> - { "IceStar", "RS64-IV" },
> - { "IStar", "RS64-IV" },
> - { "SStar", "RS64-IV" },
> -#endif
> - { "RIOS", "POWER" },
> - { "RSC", "POWER" },
> - { "RSC3308", "POWER" },
> - { "RSC4608", "POWER" },
> - { "RSC2", "POWER2" },
> - { "P2SC", "POWER2" },
> +#endif
>
> /* Generic PowerPCs */
> #if defined(TARGET_PPC64)
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2017-01-31 3:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 11:48 [Qemu-devel] [PATCH] target/ppc/cpu-models: Fix/remove bad CPU aliases Thomas Huth
2017-01-31 2:46 ` David Gibson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170131024655.GH14879@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=agraf@suse.de \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).