Patchwork ioapic: Convert to memory API

login
register
mail settings
Submitter Jan Kiszka
Date Oct. 16, 2011, 5:21 p.m.
Message ID <4E9B12A4.30100@web.de>
Download mbox | patch
Permalink /patch/120049/
State New
Headers show

Comments

Jan Kiszka - Oct. 16, 2011, 5:21 p.m.
From: Jan Kiszka <jan.kiszka@siemens.com>

Dispatching byte and word accesses like dwords looks strange, but let's
just convert mechanically.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 hw/ioapic.c |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)
Avi Kivity - Oct. 17, 2011, 10:35 a.m.
On 10/16/2011 07:21 PM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Dispatching byte and word accesses like dwords looks strange, but let's
> just convert mechanically.
>
>  
> -static CPUReadMemoryFunc * const ioapic_mem_read[3] = {
> -    ioapic_mem_readl,
> -    ioapic_mem_readl,
> -    ioapic_mem_readl,
> -};
> -
> -static CPUWriteMemoryFunc * const ioapic_mem_write[3] = {
> -    ioapic_mem_writel,
> -    ioapic_mem_writel,
> -    ioapic_mem_writel,
> +static const MemoryRegionOps ioapic_io_ops = {
> +    .old_mmio = {
> +        .read = { ioapic_mem_readl, ioapic_mem_readl, ioapic_mem_readl, },
> +        .write = { ioapic_mem_writel, ioapic_mem_writel, ioapic_mem_writel, },
> +    },
> +    .endianness = DEVICE_NATIVE_ENDIAN,
>  };

Why use old_mmio?  Use the ordinary .read and .write, and ignore the
size parameter.

Patch

diff --git a/hw/ioapic.c b/hw/ioapic.c
index 61991d7..5786b86 100644
--- a/hw/ioapic.c
+++ b/hw/ioapic.c
@@ -86,6 +86,7 @@  typedef struct IOAPICState IOAPICState;
 
 struct IOAPICState {
     SysBusDevice busdev;
+    MemoryRegion io_memory;
     uint8_t id;
     uint8_t ioregsel;
     uint32_t irr;
@@ -309,32 +310,25 @@  static void ioapic_reset(DeviceState *d)
     }
 }
 
-static CPUReadMemoryFunc * const ioapic_mem_read[3] = {
-    ioapic_mem_readl,
-    ioapic_mem_readl,
-    ioapic_mem_readl,
-};
-
-static CPUWriteMemoryFunc * const ioapic_mem_write[3] = {
-    ioapic_mem_writel,
-    ioapic_mem_writel,
-    ioapic_mem_writel,
+static const MemoryRegionOps ioapic_io_ops = {
+    .old_mmio = {
+        .read = { ioapic_mem_readl, ioapic_mem_readl, ioapic_mem_readl, },
+        .write = { ioapic_mem_writel, ioapic_mem_writel, ioapic_mem_writel, },
+    },
+    .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
 static int ioapic_init1(SysBusDevice *dev)
 {
     IOAPICState *s = FROM_SYSBUS(IOAPICState, dev);
-    int io_memory;
     static int ioapic_no;
 
     if (ioapic_no >= MAX_IOAPICS) {
         return -1;
     }
 
-    io_memory = cpu_register_io_memory(ioapic_mem_read,
-                                       ioapic_mem_write, s,
-                                       DEVICE_NATIVE_ENDIAN);
-    sysbus_init_mmio(dev, 0x1000, io_memory);
+    memory_region_init_io(&s->io_memory, &ioapic_io_ops, s, "ioapic", 0x1000);
+    sysbus_init_mmio_region(dev, &s->io_memory);
 
     qdev_init_gpio_in(&dev->qdev, ioapic_set_irq, IOAPIC_NUM_PINS);