summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/early.c
diff options
context:
space:
mode:
authorCarsten Otte <cotte@de.ibm.com>2008-03-25 18:47:44 +0100
committerAvi Kivity <avi@qumranet.com>2008-04-27 12:00:50 +0300
commitfa5877439d5a062d91c3abd5a690483bbdb4268e (patch)
tree0bd9c1794134d891678e3602ba78a6facec39d78 /arch/s390/kernel/early.c
parent85f8fffe3c2ab13f13526c46b5471fc22e98ccfe (diff)
downloadop-kernel-dev-fa5877439d5a062d91c3abd5a690483bbdb4268e.zip
op-kernel-dev-fa5877439d5a062d91c3abd5a690483bbdb4268e.tar.gz
s390: KVM guest: detect when running on kvm
This patch adds functionality to detect if the kernel runs under the KVM hypervisor. A macro MACHINE_IS_KVM is exported for device drivers. This allows drivers to skip device detection if the systems runs non-virtualized. We also define a preferred console to avoid having the ttyS0, which is a line mode only console. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/s390/kernel/early.c')
-rw-r--r--arch/s390/kernel/early.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 540a67f..68ec408 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -144,6 +144,10 @@ static noinline __init void detect_machine_type(void)
/* Running on a P/390 ? */
if (cpuinfo->cpu_id.machine == 0x7490)
machine_flags |= 4;
+
+ /* Running under KVM ? */
+ if (cpuinfo->cpu_id.version == 0xfe)
+ machine_flags |= 64;
}
#ifdef CONFIG_64BIT
OpenPOWER on IntegriCloud