Re: [Qemu-devel] [PATCH] PPC: Fix via-cuda memory registration

[Andreas Färber]

Am 08.09.2011 um 18:54 schrieb Alexander Graf:

> Commit 23c5e4ca (convert to memory API) broke the VIA Cuda emulation  
> layer
> by not registering the IO structs.
>
> This patch registers them properly and thus makes -M g3beige and -M  
> mac99
> work again.
>
> Signed-off-by: Alexander Graf <address@hidden>

Tested-by: Andreas Färber <address@hidden>

Fixes ppc boot on openSUSE x64 at least.

Thanks,
Andreas

> ---
>
> PS: Please test your patches. This one could have been found with an  
> invocation
>    as simple as "qemu-system-ppc". We boot into the OpenBIOS prompt  
> by default,
>    so you wouldn't even have required a guest image or kernel.
> ---
> hw/cuda.c |   28 ++++++++++++++++------------
> 1 files changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/hw/cuda.c b/hw/cuda.c
> index 6f05975..4077436 100644
> --- a/hw/cuda.c
> +++ b/hw/cuda.c
> @@ -634,16 +634,20 @@ static uint32_t cuda_readl (void *opaque,  
> target_phys_addr_t addr)
>     return 0;
> }
>
> -static CPUWriteMemoryFunc * const cuda_write[] = {
> -    &cuda_writeb,
> -    &cuda_writew,
> -    &cuda_writel,
> -};
> -
> -static CPUReadMemoryFunc * const cuda_read[] = {
> -    &cuda_readb,
> -    &cuda_readw,
> -    &cuda_readl,
> +static MemoryRegionOps cuda_ops = {
> +    .old_mmio = {
> +        .write = {
> +            cuda_writeb,
> +            cuda_writew,
> +            cuda_writel,
> +        },
> +        .read = {
> +            cuda_readb,
> +            cuda_readw,
> +            cuda_readl,
> +        },
> +    },
> +    .endianness = DEVICE_NATIVE_ENDIAN,
> };
>
> static bool cuda_timer_exist(void *opaque, int version_id)
> @@ -740,8 +744,8 @@ void cuda_init (MemoryRegion **cuda_mem,  
> qemu_irq irq)
>     s->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET;
>
>     s->adb_poll_timer = qemu_new_timer_ns(vm_clock, cuda_adb_poll, s);
> -    cpu_register_io_memory(cuda_read, cuda_write, s,
> -                                             DEVICE_NATIVE_ENDIAN);
> +    memory_region_init_io(&s->mem, &cuda_ops, s, "cuda", 0x2000);
> +
>     *cuda_mem = &s->mem;
>     vmstate_register(NULL, -1, &vmstate_cuda, s);
>     qemu_register_reset(cuda_reset, s);
> --
> 1.6.0.2