[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] ib700: Introduce IB700State
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 4/6] ib700: Introduce IB700State |
Date: |
Thu, 15 Oct 2009 01:40:00 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/wdt_ib700.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/hw/wdt_ib700.c b/hw/wdt_ib700.c
index 0ee3a5c..e598df5 100644
--- a/hw/wdt_ib700.c
+++ b/hw/wdt_ib700.c
@@ -35,6 +35,10 @@
#define ib700_debug(fs,...)
#endif
+typedef struct IB700state {
+ ISADevice dev;
+} IB700State;
+
/* This is the timer. We use a global here because the watchdog
* code ensures there is only one watchdog (it is located at a fixed,
* unchangable IO port, so there could only ever be one anyway).
@@ -90,10 +94,12 @@ static int ib700_load(QEMUFile *f, void *vp, int version)
static int wdt_ib700_init(ISADevice *dev)
{
- timer = qemu_new_timer(vm_clock, ib700_timer_expired, NULL);
- register_savevm("ib700_wdt", -1, 0, ib700_save, ib700_load, NULL);
- register_ioport_write(0x441, 2, 1, ib700_write_disable_reg, NULL);
- register_ioport_write(0x443, 2, 1, ib700_write_enable_reg, NULL);
+ IB700State *s = DO_UPCAST(IB700State, dev, dev);
+
+ timer = qemu_new_timer(vm_clock, ib700_timer_expired, s);
+ register_savevm("ib700_wdt", -1, 0, ib700_save, ib700_load, s);
+ register_ioport_write(0x441, 2, 1, ib700_write_disable_reg, s);
+ register_ioport_write(0x443, 2, 1, ib700_write_enable_reg, s);
return 0;
}
@@ -105,7 +111,7 @@ static WatchdogTimerModel model = {
static ISADeviceInfo wdt_ib700_info = {
.qdev.name = "ib700",
- .qdev.size = sizeof(ISADevice),
+ .qdev.size = sizeof(IB700State),
.init = wdt_ib700_init,
};
--
1.6.2.5
- [Qemu-devel] [PATCH 0/6] Port of watchdogs to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 1/6] wdt_i6300esb: port to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 3/6] wdt_i6300esb: move PCI_DEVICE_IDE_INTEL_ESB_9 to pci_ids.h, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 2/6] wdt_i6300esb: remove useless casts from void *, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 4/6] ib700: Introduce IB700State,
Juan Quintela <=
- [Qemu-devel] [PATCH 5/6] ib700: move timer to IB700State, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 6/6] ib700: port to vmstate, Juan Quintela, 2009/10/14