From: Avi Kivity [EMAIL PROTECTED]
Signed-off-by: Avi Kivity [EMAIL PROTECTED]
diff --git a/qemu/block-vmdk.c b/qemu/block-vmdk.c
index dbc8b6b..cab2078 100644
--- a/qemu/block-vmdk.c
+++ b/qemu/block-vmdk.c
@@ -343,7 +343,7 @@ static int vmdk_parent_open(BlockDriverState *bs, const
char *
From: Avi Kivity [EMAIL PROTECTED]
Conflicts:
qemu/hw/pc.c
Signed-off-by: Avi Kivity [EMAIL PROTECTED]
--
To unsubscribe from this list: send the line unsubscribe kvm-commits in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Guillaume Thouvenin [EMAIL PROTECTED]
If we call the emulator we shouldn't call skip_emulated_instruction()
in the first place, since the emulator already computes the next rip
for us. Thus we move -skip_emulated_instruction() out of
kvm_emulate_pio() and into handle_io() (and the svm