# HG changeset patch
# User cegger
# Date 1271330306 -7200
Emulate MSRs needed for Nested Virtualization

diff -r 01758c6195f4 -r 9731aece91ac xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -2097,14 +2097,21 @@ int hvm_msr_read_intercept(struct cpu_us
          break;
 
     default:
+        ret = nestedhvm_rdmsr(v, ecx, &msr_content);
+        if ( ret < 0 )
+            goto gp_fault;
+        else if ( ret )
+            break;
+
+        BUG_ON( ret );
         ret = mce_rdmsr(ecx, &msr_content);
         if ( ret < 0 )
             goto gp_fault;
         else if ( ret )
             break;
-        /* ret == 0, This is not an MCE MSR, see other MSRs */
-        else if (!ret)
-            return hvm_funcs.msr_read_intercept(regs);
+
+        BUG_ON( ret );
+        return hvm_funcs.msr_read_intercept(regs);
     }
 
     regs->eax = (uint32_t)msr_content;
@@ -2196,13 +2203,21 @@ int hvm_msr_write_intercept(struct cpu_u
         break;
 
     default:
+        ret = nestedhvm_wrmsr(v, ecx, msr_content);
+        if ( ret < 0 )
+            goto gp_fault;
+        else if ( ret )
+            break;
+
+        BUG_ON( ret );
         ret = mce_wrmsr(ecx, msr_content);
         if ( ret < 0 )
             goto gp_fault;
         else if ( ret )
             break;
-        else if (!ret)
-            return hvm_funcs.msr_write_intercept(regs);
+
+        BUG_ON( ret );
+        return hvm_funcs.msr_write_intercept(regs);
     }
 
     return X86EMUL_OKAY;