]> xenbits.xensource.com Git - people/vhanquez/xen-unstable.git/commitdiff
x86-64: refine access permission check for wrmsr to MSR_FAM10H_MMIO_CONF_BASE
authorKeir Fraser <keir@xen.org>
Tue, 11 Jan 2011 10:30:46 +0000 (10:30 +0000)
committerKeir Fraser <keir@xen.org>
Tue, 11 Jan 2011 10:30:46 +0000 (10:30 +0000)
We really don't want the mmconf window to move/disappear whenever we
use is ourselves, not only when we enabled it.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
xen/arch/x86/traps.c

index 6e2c5c7311b6440462e3420afac6f9be593bbd74..75d305fa6d389bcacfb60392ac7873a241471eb6 100644 (file)
@@ -2296,8 +2296,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs)
                 goto fail;
             if (
 #ifdef CONFIG_X86_64
-                 (pci_probe & PCI_PROBE_MMCONF) &&
-                 (pci_probe & PCI_CHECK_ENABLE_AMD_MMCONF) ?
+                 (pci_probe & PCI_PROBE_MASK) == PCI_PROBE_MMCONF ?
                  val != msr_content :
 #endif
                  ((val ^ msr_content) &