Re: [Qemu-devel] [PATCH 02/19] uninorth: remove second set of uninorth token registers

[David Gibson]

On Tue, Mar 06, 2018 at 08:30:46PM +, Mark Cave-Ayland wrote:
> Commit 593c181160: "PPC: Newworld: Add second uninorth control register set"
> added a second set of uninorth registers at 0xf300.
> 
> Testing MacOS 9.2 to MacOS X 10.4 reveals no accesses to this address and I
> can't find any reference to it in Apple's Core99.cpp source so I'm assuming
> that this was the result of another bug that has now been fixed.
> 
> Signed-off-by: Mark Cave-Ayland 

Applied, thanks.

> ---
>  hw/ppc/mac_newworld.c | 4 
>  1 file changed, 4 deletions(-)
> 
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index a749e2565d..1eba79d54b 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -148,7 +148,6 @@ static void ppc_core99_init(MachineState *machine)
>  qemu_irq *pic, **openpic_irqs;
>  MemoryRegion *isa = g_new(MemoryRegion, 1);
>  MemoryRegion *unin_memory = g_new(MemoryRegion, 1);
> -MemoryRegion *unin2_memory = g_new(MemoryRegion, 1);
>  int linux_boot, i, j, k;
>  MemoryRegion *ram = g_new(MemoryRegion, 1), *bios = g_new(MemoryRegion, 
> 1);
>  hwaddr kernel_base, initrd_base, cmdline_base = 0;
> @@ -283,9 +282,6 @@ static void ppc_core99_init(MachineState *machine)
>  memory_region_init_io(unin_memory, NULL, _ops, token, "unin", 
> 0x1000);
>  memory_region_add_subregion(get_system_memory(), 0xf800, 
> unin_memory);
>  
> -memory_region_init_io(unin2_memory, NULL, _ops, token, "unin", 
> 0x1000);
> -memory_region_add_subregion(get_system_memory(), 0xf300, 
> unin2_memory);
> -
>  openpic_irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *));
>  openpic_irqs[0] =
>  g_malloc0(smp_cpus * sizeof(qemu_irq) * OPENPIC_OUTPUT_NB);

-- 
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


signature.asc
Description: PGP signature

[Qemu-devel] [PATCH 02/19] uninorth: remove second set of uninorth token registers

[Mark Cave-Ayland]

Commit 593c181160: "PPC: Newworld: Add second uninorth control register set"
added a second set of uninorth registers at 0xf300.

Testing MacOS 9.2 to MacOS X 10.4 reveals no accesses to this address and I
can't find any reference to it in Apple's Core99.cpp source so I'm assuming
that this was the result of another bug that has now been fixed.

Signed-off-by: Mark Cave-Ayland 
---
 hw/ppc/mac_newworld.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index a749e2565d..1eba79d54b 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -148,7 +148,6 @@ static void ppc_core99_init(MachineState *machine)
 qemu_irq *pic, **openpic_irqs;
 MemoryRegion *isa = g_new(MemoryRegion, 1);
 MemoryRegion *unin_memory = g_new(MemoryRegion, 1);
-MemoryRegion *unin2_memory = g_new(MemoryRegion, 1);
 int linux_boot, i, j, k;
 MemoryRegion *ram = g_new(MemoryRegion, 1), *bios = g_new(MemoryRegion, 1);
 hwaddr kernel_base, initrd_base, cmdline_base = 0;
@@ -283,9 +282,6 @@ static void ppc_core99_init(MachineState *machine)
 memory_region_init_io(unin_memory, NULL, _ops, token, "unin", 0x1000);
 memory_region_add_subregion(get_system_memory(), 0xf800, unin_memory);
 
-memory_region_init_io(unin2_memory, NULL, _ops, token, "unin", 
0x1000);
-memory_region_add_subregion(get_system_memory(), 0xf300, unin2_memory);
-
 openpic_irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *));
 openpic_irqs[0] =
 g_malloc0(smp_cpus * sizeof(qemu_irq) * OPENPIC_OUTPUT_NB);
-- 
2.11.0