[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/25] PPC: Fix via-cuda memory registration
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 02/25] PPC: Fix via-cuda memory registration |
Date: |
Thu, 6 Oct 2011 12:23:12 +0200 |
From: Alexander Graf <address@hidden>
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>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/cuda.c | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/hw/cuda.c b/hw/cuda.c
index 5c92d81..736de7f 100644
--- a/hw/cuda.c
+++ b/hw/cuda.c
@@ -633,16 +633,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)
@@ -739,8 +743,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.7.6.3
- [Qemu-devel] [PATCH 00/25] Memory API converions, batch 11, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 01/25] hw/lan9118.c: Convert to MemoryRegion, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 02/25] PPC: Fix via-cuda memory registration,
Avi Kivity <=
- [Qemu-devel] [PATCH 03/25] palm: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 07/25] hw/arm11mpcore: Clean up to avoid using sysbus_mmio_init_cb2, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 05/25] petalogix_s2adsp1800: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 14/25] fdc: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 09/25] ppc_newworld: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 10/25] isa: Tidy support code for isabus_get_fw_dev_path, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 13/25] isa: Add isa_register_portio_list(), Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 08/25] hw/versatile_pci: Expose multiple sysbus mmio regions, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 04/25] petalogix_ml605: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 12/25] memory: Fix old portio word accesses, Avi Kivity, 2011/10/06