aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2015-08-06 19:39:59 +0100
committerWill Deacon <will.deacon@arm.com>2015-08-07 15:31:37 +0100
commit2ec1740506eb94cb53a9532e15816ffe8245e25d (patch)
treea33a66ef5c35c2ade811d29f12f796ab330e7818
parente7b95bd430760d8b895520f54fdf9d19972904d2 (diff)
downloadkvmtool-2ec1740506eb94cb53a9532e15816ffe8245e25d.tar.gz
kvm__emulate_io: Don't fall through from IO in to IO out if no handler
If an IO port device has no io_in handler, kvm__emulate_io would fall through and call the io_out handler instead. Fix to only call the handler for the appropriate direction. If no handler exists, kvm__emulate_io will automatically treat it as an IO error (due to the default "ret = false"). Signed-off-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--ioport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ioport.c b/ioport.c
index 8c55a842..263fe50f 100644
--- a/ioport.c
+++ b/ioport.c
@@ -192,7 +192,7 @@ bool kvm__emulate_io(struct kvm_cpu *vcpu, u16 port, void *data, int direction,
while (count--) {
if (direction == KVM_EXIT_IO_IN && ops->io_in)
ret = ops->io_in(entry, vcpu, port, ptr, size);
- else if (ops->io_out)
+ else if (direction == KVM_EXIT_IO_OUT && ops->io_out)
ret = ops->io_out(entry, vcpu, port, ptr, size);
ptr += size;