Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e52de1b8 authored by Avi Kivity's avatar Avi Kivity Committed by Linus Torvalds
Browse files

[PATCH] KVM: Improve reporting of vmwrite errors 



This will allow us to see the root cause when a vmwrite error happens.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 37a7d8b0

drivers/kvm/vmx.c

+9 −3
Original line number Diff line number Diff line
@@ -152,15 +152,21 @@ static u64 vmcs_read64(unsigned long field) 
#endif

}



static noinline void vmwrite_error(unsigned long field, unsigned long value)

{

	printk(KERN_ERR "vmwrite error: reg %lx value %lx (err %d)\n",

	       field, value, vmcs_read32(VM_INSTRUCTION_ERROR));

	dump_stack();

}



static void vmcs_writel(unsigned long field, unsigned long value)

{

	u8 error;



	asm volatile (ASM_VMX_VMWRITE_RAX_RDX "; setna %0"

		       : "=q"(error) : "a"(value), "d"(field) : "cc" );

	if (error)

		printk(KERN_ERR "vmwrite error: reg %lx value %lx (err %d)\n",

		       field, value, vmcs_read32(VM_INSTRUCTION_ERROR));

	if (unlikely(error))

		vmwrite_error(field, value);

}



static void vmcs_write16(unsigned long field, u16 value)