[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 26/38] i6300esb: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 26/38] i6300esb: convert to memory API |
Date: |
Wed, 3 Aug 2011 14:55:56 +0300 |
Also add missing destructor.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/wdt_i6300esb.c | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c
index 53786ce..abc2e17 100644
--- a/hw/wdt_i6300esb.c
+++ b/hw/wdt_i6300esb.c
@@ -66,6 +66,7 @@
/* Device state. */
struct I6300State {
PCIDevice dev;
+ MemoryRegion io_mem;
int reboot_enabled; /* "Reboot" on timer expiry. The real action
* performed depends on the -watchdog-action
@@ -355,6 +356,22 @@ static void i6300esb_mem_writel(void *vp,
target_phys_addr_t addr, uint32_t val)
}
}
+static const MemoryRegionOps i6300esb_ops = {
+ .old_mmio = {
+ .read = {
+ i6300esb_mem_readb,
+ i6300esb_mem_readw,
+ i6300esb_mem_readl,
+ },
+ .write = {
+ i6300esb_mem_writeb,
+ i6300esb_mem_writew,
+ i6300esb_mem_writel,
+ },
+ },
+ .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
static const VMStateDescription vmstate_i6300esb = {
.name = "i6300esb_wdt",
.version_id = sizeof(I6300State),
@@ -381,31 +398,28 @@ static const VMStateDescription vmstate_i6300esb = {
static int i6300esb_init(PCIDevice *dev)
{
I6300State *d = DO_UPCAST(I6300State, dev, dev);
- int io_mem;
- static CPUReadMemoryFunc * const mem_read[3] = {
- i6300esb_mem_readb,
- i6300esb_mem_readw,
- i6300esb_mem_readl,
- };
- static CPUWriteMemoryFunc * const mem_write[3] = {
- i6300esb_mem_writeb,
- i6300esb_mem_writew,
- i6300esb_mem_writel,
- };
i6300esb_debug("I6300State = %p\n", d);
d->timer = qemu_new_timer_ns(vm_clock, i6300esb_timer_expired, d);
d->previous_reboot_flag = 0;
- io_mem = cpu_register_io_memory(mem_read, mem_write, d,
- DEVICE_NATIVE_ENDIAN);
- pci_register_bar_simple(&d->dev, 0, 0x10, 0, io_mem);
+ memory_region_init_io(&d->io_mem, &i6300esb_ops, d, "i6300esb", 0x10);
+ pci_register_bar_region(&d->dev, 0, 0, &d->io_mem);
/* qemu_register_coalesced_mmio (addr, 0x10); ? */
return 0;
}
+static int i6300esb_exit(PCIDevice *dev)
+{
+ I6300State *d = DO_UPCAST(I6300State, dev, dev);
+
+ memory_region_destroy(&d->io_mem);
+
+ return 0;
+}
+
static WatchdogTimerModel model = {
.wdt_name = "i6300esb",
.wdt_description = "Intel 6300ESB",
@@ -419,6 +433,7 @@ static PCIDeviceInfo i6300esb_info = {
.config_read = i6300esb_config_read,
.config_write = i6300esb_config_write,
.init = i6300esb_init,
+ .exit = i6300esb_exit,
.vendor_id = PCI_VENDOR_ID_INTEL,
.device_id = PCI_DEVICE_ID_INTEL_ESB_9,
.class_id = PCI_CLASS_SYSTEM_OTHER,
--
1.7.5.3
- [Qemu-devel] [PATCH v2 08/38] cirrus: simplify linear framebuffer access functions, (continued)
- [Qemu-devel] [PATCH v2 08/38] cirrus: simplify linear framebuffer access functions, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 14/38] e1000: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 30/38] uhci: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 34/38] pci: convert pci rom to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 38/38] pci: remove support for pre memory API BARs, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 25/38] pcnet: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 19/38] virtio-pci: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 06/38] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 12/38] rtl8139: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 11/38] pci: allow I/O BARs to be registered with pci_register_bar_region(), Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 26/38] i6300esb: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH v2 21/38] intel-hda: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 17/38] ide: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 37/38] pci: rename pci_register_bar_region() to pci_register_bar(), Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 16/38] es1370: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 32/38] msix: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 24/38] ne2000: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 35/38] pci: remove pci_register_bar(), Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 27/38] isa-mmio: concert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 23/38] ppc: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 28/38] sun4u: convert to memory API, Avi Kivity, 2011/08/03