]> xenbits.xensource.com Git - people/sstabellini/xen-unstable.git/.git/commitdiff
VMX: don't allow PVH to reach handle_mmio()
authorJan Beulich <jbeulich@suse.com>
Thu, 11 Dec 2014 11:24:05 +0000 (12:24 +0100)
committerJan Beulich <jbeulich@suse.com>
Thu, 11 Dec 2014 11:24:05 +0000 (12:24 +0100)
PVH guests accessing I/O ports via string ops is not supported yet.

Reported-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Mukesh Rathor <mukesh.rathor@oracle.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Kevin Tian <kevin.tian@intel.com>
Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
xen/arch/x86/hvm/vmx/vmx.c

index 0bf92b25c2435913b828e880e1c30a6a0acc8b4d..f2554d68d2a80f973c7a5435bc8b07b25ca98737 100644 (file)
@@ -3086,7 +3086,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs)
         if ( exit_qualification & 0x10 )
         {
             /* INS, OUTS */
-            if ( !handle_mmio() )
+            if ( unlikely(is_pvh_vcpu(v)) /* PVH fixme */ ||
+                 !handle_mmio() )
                 hvm_inject_hw_exception(TRAP_gp_fault, 0);
         }
         else