diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-29 07:52:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-29 07:52:16 -0700 |
| commit | ce949717b559709423c1ef716a9db16d1dcadaed (patch) | |
| tree | 003c5c064cd6104c8bff431e3431314bd614d7e0 /arch | |
| parent | 249842477c589ea29ff161ace9c8666d96e9883a (diff) | |
| parent | 0acf00014bcfd71090c3b0d43c98e970108064e4 (diff) | |
Merge git://github.com/rustyrussell/linux
* git://github.com/rustyrussell/linux:
lguest: move process freezing before pending signals check
lguest: don't allow KVM-detection cpuid.
lguest: Allow running under paravirt-enabled KVM.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/lguest/boot.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index 13ee258442a..f63da5ef217 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c @@ -70,6 +70,7 @@ #include <asm/i387.h> #include <asm/stackprotector.h> #include <asm/reboot.h> /* for struct machine_ops */ +#include <asm/kvm_para.h> /*G:010 * Welcome to the Guest! @@ -455,6 +456,15 @@ static void lguest_cpuid(unsigned int *ax, unsigned int *bx, *ax &= 0xFFFFF0FF; *ax |= 0x00000500; break; + + /* + * This is used to detect if we're running under KVM. We might be, + * but that's a Host matter, not us. So say we're not. + */ + case KVM_CPUID_SIGNATURE: + *bx = *cx = *dx = 0; + break; + /* * 0x80000000 returns the highest Extended Function, so we futureproof * like we do above by limiting it to known fields. |