KVM testing guest was fixed

ddk · ddk · commit 2d7b060aca50 · 2009-11-18T15:16:12.000+09:00
diff --git a/kvm/kernel/kvm_main.c b/kvm/kernel/kvm_main.c
@@ -1204,7 +1204,7 @@ static void report_emulation_failure(struct x86_emulate_ctxt *ctxt)
 	emulator_read_std(rip_linear, (void *)opcodes, 4, ctxt);
 
 	printk(KERN_ERR "emulation failed but !mmio_needed?"
-	       " rip %lx %02x %02x %02x %02x\n",
+	       " rip %lx %02x %02x %02x %02x\n",		  
 	       rip, opcodes[0], opcodes[1], opcodes[2], opcodes[3]);
 	reported = 1;
 }
@@ -1275,7 +1275,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
 			return EMULATE_DONE;
 		}		
 		if (!vcpu->mmio_needed) { /* ground zero */		  
-			report_emulation_failure(&emulate_ctxt);
+			report_emulation_failure(&emulate_ctxt);			
 			FUNCTION_EXIT();			
 			return EMULATE_FAIL;
 		}
diff --git a/kvm/user/test/bootstrap.S b/kvm/user/test/bootstrap.S
@@ -22,7 +22,7 @@ pmode:
 	mov %ax, %gs
 	mov %ax, %ss
 	mov $0xa0000, %esp
-##	ljmp $8, $0x100000
+	ljmp $8, $0x100000
 	jmp main_loop		
 
 main_loop:
diff --git a/vcproj/kernel/winkvm.suo b/vcproj/kernel/winkvm.suo

Original file line number	Diff line number	Diff line change
`@@ -1204,7 +1204,7 @@ static void report_emulation_failure(struct x86_emulate_ctxt *ctxt)`
`1204`	`1204`	`emulator_read_std(rip_linear, (void *)opcodes, 4, ctxt);`
`1205`	`1205`
`1206`	`1206`	`printk(KERN_ERR "emulation failed but !mmio_needed?"`
`1207`		`- " rip %lx %02x %02x %02x %02x\n",`
	`1207`	`+ " rip %lx %02x %02x %02x %02x\n",`
`1208`	`1208`	`rip, opcodes[0], opcodes[1], opcodes[2], opcodes[3]);`
`1209`	`1209`	`reported = 1;`
`1210`	`1210`	`}`
`@@ -1275,7 +1275,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,`
`1275`	`1275`	`return EMULATE_DONE;`
`1276`	`1276`	`}`
`1277`	`1277`	`if (!vcpu->mmio_needed) { /* ground zero */`
`1278`		`- report_emulation_failure(&emulate_ctxt);`
	`1278`	`+ report_emulation_failure(&emulate_ctxt);`
`1279`	`1279`	`FUNCTION_EXIT();`
`1280`	`1280`	`return EMULATE_FAIL;`
`1281`	`1281`	`}`