Patchwork [for-1.4] target-ppc: Fix "G2leGP3" PVR

login
register
mail settings
Submitter Andreas Färber
Date Feb. 11, 2013, 8:54 p.m.
Message ID <1360616049-9622-1-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/219683/
State New
Headers show

Comments

Andreas Färber - Feb. 11, 2013, 8:54 p.m.
Unlike derived PVR constants mapped to CPU_POWERPC_G2LEgp3, the
"G2leGP3" model definition itself used the CPU_POWERPC_G2LEgp1 PVR.

Fixing this will allow to alias CPU_POWERPC_G2LEgp3-using types to
"G2leGP3".

Cc: qemu-stable@nongnu.org
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-ppc/translate_init.c |    2 +-
 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
Alexander Graf - Feb. 12, 2013, 10:13 p.m.
On 11.02.2013, at 21:54, Andreas Färber wrote:

> Unlike derived PVR constants mapped to CPU_POWERPC_G2LEgp3, the
> "G2leGP3" model definition itself used the CPU_POWERPC_G2LEgp1 PVR.
> 
> Fixing this will allow to alias CPU_POWERPC_G2LEgp3-using types to
> "G2leGP3".
> 
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Andreas Färber <afaerber@suse.de>

Thanks, applied to ppc-next. This is not 1.4 material.


Alex

> ---
> target-ppc/translate_init.c |    2 +-
> 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
> 
> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
> index 4a1e5a6..a05bb7b 100644
> --- a/target-ppc/translate_init.c
> +++ b/target-ppc/translate_init.c
> @@ -8243,7 +8243,7 @@ static const ppc_def_t ppc_defs[] = {
>     /* PowerPC G2LE GP1 core                                                 */
>     POWERPC_DEF("G2leGP1",       CPU_POWERPC_G2LEgp1,                G2LE),
>     /* PowerPC G2LE GP3 core                                                 */
> -    POWERPC_DEF("G2leGP3",       CPU_POWERPC_G2LEgp1,                G2LE),
> +    POWERPC_DEF("G2leGP3",       CPU_POWERPC_G2LEgp3,                G2LE),
>     /* PowerPC MPC603 microcontrollers                                       */
>     /* MPC8240                                                               */
>     POWERPC_DEF("MPC8240",       CPU_POWERPC_MPC8240,                603E),
> -- 
> 1.7.10.4
>

Patch

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 4a1e5a6..a05bb7b 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -8243,7 +8243,7 @@  static const ppc_def_t ppc_defs[] = {
     /* PowerPC G2LE GP1 core                                                 */
     POWERPC_DEF("G2leGP1",       CPU_POWERPC_G2LEgp1,                G2LE),
     /* PowerPC G2LE GP3 core                                                 */
-    POWERPC_DEF("G2leGP3",       CPU_POWERPC_G2LEgp1,                G2LE),
+    POWERPC_DEF("G2leGP3",       CPU_POWERPC_G2LEgp3,                G2LE),
     /* PowerPC MPC603 microcontrollers                                       */
     /* MPC8240                                                               */
     POWERPC_DEF("MPC8240",       CPU_POWERPC_MPC8240,                603E),