diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-09-21 17:02:46 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-09-21 17:02:46 +0200 |
| commit | 1b33d3acd1a7550b858379f38e01e085dc444d08 (patch) | |
| tree | 7c97db23a20fa3e9c258e53e81952cabddd4702a /xen/arch/x86/hvm/viridian.c | |
| parent | 508609eec58f748a1f86953322e6ac32ae0b3c19 (diff) | |
| download | xen-1b33d3acd1a7550b858379f38e01e085dc444d08.tar.gz xen-1b33d3acd1a7550b858379f38e01e085dc444d08.tar.bz2 xen-1b33d3acd1a7550b858379f38e01e085dc444d08.zip | |
x86: enable VIA CPU support
Newer VIA CPUs have both 64-bit and VMX support. Enable them to be
recognized for these purposes, at once stripping off any 32-bit CPU
only bits from the respective CPU support file, and adding 64-bit ones
found in recent Linux.
This particularly implies untying the VMX == Intel assumption in a few
places.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/hvm/viridian.c')
| -rw-r--r-- | xen/arch/x86/hvm/viridian.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 67e9392ecf..6c7f2dc3eb 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -156,8 +156,7 @@ static void enable_hypercall_page(struct domain *d) *(u32 *)(p + 1) = 0x80000000; *(u8 *)(p + 5) = 0x0f; /* vmcall/vmmcall */ *(u8 *)(p + 6) = 0x01; - *(u8 *)(p + 7) = ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) - ? 0xc1 : 0xd9); + *(u8 *)(p + 7) = (cpu_has_vmx ? 0xc1 : 0xd9); *(u8 *)(p + 8) = 0xc3; /* ret */ memset(p + 9, 0xcc, PAGE_SIZE - 9); /* int3, int3, ... */ |