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

xen_platform: Do not use old_portio-style callbacks 

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Hervé Poussineau 2013-01-04 22:29:40 +01:00 committed by Andreas Färber
parent ecd584b836
commit 7a652efa1b
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/xen_platform.c
View File

@ -279,7 +279,8 @@ static void platform_fixed_ioport_init(PCIXenPlatformState* s)
/* Xen Platform PCI Device */ /* Xen Platform PCI Device */
static uint32_t xen_platform_ioport_readb(void *opaque, uint32_t addr) static uint64_t xen_platform_ioport_readb(void *opaque, hwaddr addr,
unsigned int size)
{ {
if (addr == 0) { if (addr == 0) {
return platform_fixed_ioport_readb(opaque, 0); return platform_fixed_ioport_readb(opaque, 0);
@ -288,30 +289,28 @@ static uint32_t xen_platform_ioport_readb(void *opaque, uint32_t addr)
} }
} }
static void xen_platform_ioport_writeb(void *opaque, uint32_t addr, uint32_t val) static void xen_platform_ioport_writeb(void *opaque, hwaddr addr,
uint64_t val, unsigned int size)
{ {
PCIXenPlatformState *s = opaque; PCIXenPlatformState *s = opaque;
switch (addr) { switch (addr) {
case 0: /* Platform flags */ case 0: /* Platform flags */
platform_fixed_ioport_writeb(opaque, 0, val); platform_fixed_ioport_writeb(opaque, 0, (uint32_t)val);
break; break;
case 8: case 8:
log_writeb(s, val); log_writeb(s, (uint32_t)val);
break; break;
default: default:
break; break;
} }
} }
static MemoryRegionPortio xen_pci_portio[] = {
{ 0, 0x100, 1, .read = xen_platform_ioport_readb, },
{ 0, 0x100, 1, .write = xen_platform_ioport_writeb, },
PORTIO_END_OF_LIST()
};
static const MemoryRegionOps xen_pci_io_ops = { static const MemoryRegionOps xen_pci_io_ops = {
.old_portio = xen_pci_portio, .read = xen_platform_ioport_readb,
.write = xen_platform_ioport_writeb,
.impl.min_access_size = 1,
.impl.max_access_size = 1,
}; };
static void platform_ioport_bar_setup(PCIXenPlatformState *d) static void platform_ioport_bar_setup(PCIXenPlatformState *d)