Skip to contentSkip to conversation

kvm__emulate_io: Don't fall through from IO in to IO out if no handler

PATCH New Josh Triplett 1 participant 1 message Aug 6, 2015 KVM

lore
Share & tools
lore

Josh Triplett

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 ioport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
ioport.c +1 -1
index 8c55a84..263fe50 100644
@@ -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;
Signature · 1 line
2.5.0