On Mon, Aug 02, 2010 at 06:18:09PM +0300, Avi Kivity wrote:On 08/02/2010 05:46 PM, Joerg Roedel wrote:APM2 seems to be quiet about this.This patch lets the nested vmrun fail if the L1 hypervisorDon't you have to transfer an injected event to exitintinfo?
has not intercepted vmrun. This fixes the "vmrun intercept
check" unit test.
+
static bool nested_svm_vmrun(struct vcpu_svm *svm)
{
struct vmcb *nested_vmcb;
@@ -2029,6 +2037,17 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
if (!nested_vmcb)
return false;
+ if (!nested_vmcb_checks(nested_vmcb)) {
+ nested_vmcb->control.exit_code = SVM_EXIT_ERR;
+ nested_vmcb->control.exit_code_hi = 0;
+ nested_vmcb->control.exit_info_1 = 0;
+ nested_vmcb->control.exit_info_2 = 0;
+
+ nested_svm_unmap(page);
+
+ return false;
+ }
+
The VMRUN instruction then checks the guest state just loaded. If an illegal state has been loaded, the
processor exits back to the host (see “#VMEXIT” on page 374).
I just tried it out and event_inj
still contains the event after a failed vmrun on real hardware. This
makes sense because this is no real vmexit because the vm was never
entered.