aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/hvm/i8254.c
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-04-15 13:28:02 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-04-15 13:28:02 +0100
commit6742db6e6819687ab311199bfe76476947ed75ed (patch)
tree3736ca574aebcce589b9769d62aeb96bc19b0176 /xen/arch/x86/hvm/i8254.c
parentef3c86eb818614eb5a4bdd7c0c82b1e1346dd60e (diff)
downloadxen-6742db6e6819687ab311199bfe76476947ed75ed.tar.gz
xen-6742db6e6819687ab311199bfe76476947ed75ed.tar.bz2
xen-6742db6e6819687ab311199bfe76476947ed75ed.zip
x86, hvm: I/O emulation handlers return X86EMUL_* return codes.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/hvm/i8254.c')
-rw-r--r--xen/arch/x86/hvm/i8254.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c
index 3cfd9dd47e..493b7317b9 100644
--- a/xen/arch/x86/hvm/i8254.c
+++ b/xen/arch/x86/hvm/i8254.c
@@ -487,7 +487,7 @@ static int handle_pit_io(
if ( bytes != 1 )
{
gdprintk(XENLOG_WARNING, "PIT bad access\n");
- return 1;
+ return X86EMUL_OKAY;
}
if ( dir == IOREQ_WRITE )
@@ -502,7 +502,7 @@ static int handle_pit_io(
gdprintk(XENLOG_WARNING, "PIT: read A1:A0=3!\n");
}
- return 1;
+ return X86EMUL_OKAY;
}
static void speaker_ioport_write(
@@ -526,11 +526,7 @@ static int handle_speaker_io(
{
struct PITState *vpit = vcpu_vpit(current);
- if ( bytes != 1 )
- {
- gdprintk(XENLOG_WARNING, "PIT_SPEAKER bad access\n");
- return 1;
- }
+ BUG_ON(bytes != 1);
spin_lock(&vpit->lock);
@@ -541,7 +537,7 @@ static int handle_speaker_io(
spin_unlock(&vpit->lock);
- return 1;
+ return X86EMUL_OKAY;
}
int pv_pit_handler(int port, int data, int write)