aboutsummaryrefslogtreecommitdiff
path: root/xen-hvm.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-03-16 10:20:34 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2016-05-19 16:42:30 +0200
commit89a80e7400f7225d9401b35ef32454b4ab29dc67 (patch)
tree1ab07269c819c8eb7d128ec27bbbf9d5e61825d7 /xen-hvm.c
parent63c915526d6a54a95919ebece83fa9ca631b2508 (diff)
hw: remove pio_addr_t
pio_addr_t is almost unused, because these days I/O ports are simply accessed through the address space. cpu_{in,out}[bwl] themselves are almost unused; monitor.c and xen-hvm.c could use address_space_read/write directly, since they have an integer size at hand. This leaves qtest as the only user of those functions. On the other hand even portio_* functions use this type; the only interesting use of pio_addr_t thus is include/hw/sysbus.h. I guess I could move it there, but I don't see much benefit in that either. Using uint32_t is enough and avoids the need to include ioport.h everywhere. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'xen-hvm.c')
-rw-r--r--xen-hvm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xen-hvm.c b/xen-hvm.c
index 4236f78ad8..c14e778a8e 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -726,7 +726,7 @@ static ioreq_t *cpu_get_ioreq(XenIOState *state)
return NULL;
}
-static uint32_t do_inp(pio_addr_t addr, unsigned long size)
+static uint32_t do_inp(uint32_t addr, unsigned long size)
{
switch (size) {
case 1:
@@ -736,11 +736,11 @@ static uint32_t do_inp(pio_addr_t addr, unsigned long size)
case 4:
return cpu_inl(addr);
default:
- hw_error("inp: bad size: %04"FMT_pioaddr" %lx", addr, size);
+ hw_error("inp: bad size: %04x %lx", addr, size);
}
}
-static void do_outp(pio_addr_t addr,
+static void do_outp(uint32_t addr,
unsigned long size, uint32_t val)
{
switch (size) {
@@ -751,7 +751,7 @@ static void do_outp(pio_addr_t addr,
case 4:
return cpu_outl(addr, val);
default:
- hw_error("outp: bad size: %04"FMT_pioaddr" %lx", addr, size);
+ hw_error("outp: bad size: %04x %lx", addr, size);
}
}