Skip to contentSkip to conversation

xen: replace magic value with define

PATCH New Christoph Egger 1 participant 1 message Aug 7, 2009

lore
Share & tools
lore

Christoph Egger

author
#0 lore raw

PATCH 1/1 xen: replace magic value with define

Hi!

Attached patch replaces magic value with define.

Signed-off-by Christoph Egger <[email protected]>
Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
xen/arch/x86/hvm/svm/svm.c +1 -1
diff -r b9cdcf502aa3 xen/arch/x86/hvm/svm/svm.c
@@ -266,7 +266,7 @@ static int svm_vmcb_restore(struct vcpu 
     if ( paging_mode_hap(v->domain) )
     {
         vmcb->np_enable = 1;
-        vmcb->g_pat = 0x0007040600070406ULL; /* guest PAT */
+        vmcb->g_pat = MSR_IA32_CR_PAT_RESET; /* guest PAT */
         vmcb->h_cr3 = pagetable_get_paddr(v->domain->arch.phys_table);
     }
xen/arch/x86/hvm/svm/vmcb.c +1 -1
diff -r b9cdcf502aa3 xen/arch/x86/hvm/svm/vmcb.c
@@ -232,7 +232,7 @@ static int construct_vmcb(struct vcpu *v
     if ( paging_mode_hap(v->domain) )
     {
         vmcb->np_enable = 1; /* enable nested paging */
-        vmcb->g_pat = 0x0007040600070406ULL; /* guest PAT */
+        vmcb->g_pat = MSR_IA32_CR_PAT_RESET; /* guest PAT */
         vmcb->h_cr3 = pagetable_get_paddr(v->domain->arch.phys_table);
 
         /* No point in intercepting CR3 reads/writes. */
xen/arch/x86/hvm/vmx/vmcs.c +1 -1
diff -r b9cdcf502aa3 xen/arch/x86/hvm/vmx/vmcs.c
@@ -743,7 +743,7 @@ static int construct_vmcs(struct vcpu *v
         u64 host_pat, guest_pat;
 
         rdmsrl(MSR_IA32_CR_PAT, host_pat);
-        guest_pat = 0x7040600070406ULL;
+        guest_pat = MSR_IA32_CR_PAT_RESET;
 
         __vmwrite(HOST_PAT, host_pat);
         __vmwrite(GUEST_PAT, guest_pat);
xen/include/asm-x86/msr-index.h +1 -0
diff -r b9cdcf502aa3 xen/include/asm-x86/msr-index.h
@@ -87,6 +87,7 @@
 #define MSR_IA32_MTRR_PHYSMASK7     0x0000020f
 
 #define MSR_IA32_CR_PAT             0x00000277
+#define MSR_IA32_CR_PAT_RESET       0x0007040600070406ULL
 
 #define MSR_IA32_MC0_CTL		0x00000400
 #define MSR_IA32_MC0_STATUS		0x00000401

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel