ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up upcast from PCIDevice to I6300State 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2009-08-21 10:31:33 +02:00 committed by Anthony Liguori
parent 88b3be201a
commit 9d472d51ea
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/wdt_i6300esb.c
View File

@ -25,7 +25,6 @@
#include "qemu-timer.h" #include "qemu-timer.h"
#include "watchdog.h" #include "watchdog.h"
#include "hw.h" #include "hw.h"
#include "isa.h"
#include "pc.h" #include "pc.h"
#include "pci.h" #include "pci.h"
@ -71,7 +70,7 @@
/* Device state. */ /* Device state. */
struct I6300State { struct I6300State {
PCIDevice dev; /* PCI device state, must be first field. */ PCIDevice dev;
int reboot_enabled; /* "Reboot" on timer expiry. The real action int reboot_enabled; /* "Reboot" on timer expiry. The real action
* performed depends on the -watchdog-action * performed depends on the -watchdog-action
@ -199,7 +198,7 @@ static void i6300esb_timer_expired(void *vp)
static void i6300esb_config_write(PCIDevice *dev, uint32_t addr, static void i6300esb_config_write(PCIDevice *dev, uint32_t addr,
uint32_t data, int len) uint32_t data, int len)
{ {
I6300State *d = (I6300State *) dev; I6300State *d = container_of(dev, I6300State, dev);
int old; int old;
i6300esb_debug("addr = %x, data = %x, len = %d\n", addr, data, len); i6300esb_debug("addr = %x, data = %x, len = %d\n", addr, data, len);
@ -227,7 +226,7 @@ static void i6300esb_config_write(PCIDevice *dev, uint32_t addr,
static uint32_t i6300esb_config_read(PCIDevice *dev, uint32_t addr, int len) static uint32_t i6300esb_config_read(PCIDevice *dev, uint32_t addr, int len)
{ {
I6300State *d = (I6300State *) dev; I6300State *d = container_of(dev, I6300State, dev);
uint32_t data; uint32_t data;
i6300esb_debug ("addr = %x, len = %d\n", addr, len); i6300esb_debug ("addr = %x, len = %d\n", addr, len);
@ -361,7 +360,7 @@ static void i6300esb_map(PCIDevice *dev, int region_num,
i6300esb_mem_writew, i6300esb_mem_writew,
i6300esb_mem_writel, i6300esb_mem_writel,
}; };
I6300State *d = (I6300State *) dev; I6300State *d = container_of(dev, I6300State, dev);
int io_mem; int io_mem;
i6300esb_debug("addr = %x, size = %x, type = %d\n", addr, size, type); i6300esb_debug("addr = %x, size = %x, type = %d\n", addr, size, type);