# HG changeset patch
# User cegger
# Date 1271330290 -7200
move viridian MSRs into the header.
The MSRs are used in nestedhvm.c for viridian emulation.

diff -r 0e6fd40c25bf -r d464876a6046 xen/arch/x86/hvm/viridian.c
--- a/xen/arch/x86/hvm/viridian.c
+++ b/xen/arch/x86/hvm/viridian.c
@@ -12,18 +12,10 @@
 #include <asm/paging.h>
 #include <asm/p2m.h>
 #include <asm/hvm/support.h>
+#include <asm/hvm/viridian.h>
 #include <public/sched.h>
 #include <public/hvm/hvm_op.h>
 
-/* Viridian MSR numbers. */
-#define VIRIDIAN_MSR_GUEST_OS_ID 0x40000000
-#define VIRIDIAN_MSR_HYPERCALL   0x40000001
-#define VIRIDIAN_MSR_VP_INDEX    0x40000002
-#define VIRIDIAN_MSR_EOI         0x40000070
-#define VIRIDIAN_MSR_ICR         0x40000071
-#define VIRIDIAN_MSR_TPR         0x40000072
-#define VIRIDIAN_MSR_APIC_ASSIST 0x40000073
-
 /* Viridian Hypercall Status Codes. */
 #define HV_STATUS_SUCCESS                       0x0000
 #define HV_STATUS_INVALID_HYPERCALL_CODE        0x0002
diff -r 0e6fd40c25bf -r d464876a6046 xen/include/asm-x86/hvm/viridian.h
--- a/xen/include/asm-x86/hvm/viridian.h
+++ b/xen/include/asm-x86/hvm/viridian.h
@@ -39,6 +39,15 @@ struct viridian_domain
     union viridian_hypercall_gpa hypercall_gpa;
 };
 
+/* Viridian MSR numbers. */
+#define VIRIDIAN_MSR_GUEST_OS_ID 0x40000000
+#define VIRIDIAN_MSR_HYPERCALL   0x40000001
+#define VIRIDIAN_MSR_VP_INDEX    0x40000002
+#define VIRIDIAN_MSR_EOI         0x40000070
+#define VIRIDIAN_MSR_ICR         0x40000071
+#define VIRIDIAN_MSR_TPR         0x40000072
+#define VIRIDIAN_MSR_APIC_ASSIST 0x40000073
+
 int
 cpuid_viridian_leaves(
     unsigned int leaf,