aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2020-03-10 11:22:46 +0100
committerGerd Hoffmann <kraxel@redhat.com>2020-03-16 14:29:41 +0100
commitd68335174dc22d1201899607693a9b7ca0509f18 (patch)
treec7f7b1050de042b31473e3eb350bb7e73847529d /src
parent67cbfedb334db0df7395cc48ccd6bacb2a86a30d (diff)
downloadseabios-d68335174dc22d1201899607693a9b7ca0509f18.tar.gz
kvm: detect unconditionally
So we detect kvm even in case there is no qemu pci hostbridge present, for example when using the new, pci-less microvm machine type. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20200310102248.28412-2-kraxel@redhat.com
Diffstat (limited to 'src')
-rw-r--r--src/fw/paravirt.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/fw/paravirt.c b/src/fw/paravirt.c
index 4fcd8f57..ef420931 100644
--- a/src/fw/paravirt.c
+++ b/src/fw/paravirt.c
@@ -102,13 +102,13 @@ static void qemu_detect(void)
dprintf(1, "Running on QEMU (unknown nb: %04x:%04x)\n", v, d);
break;
}
- kvm_detect();
}
void
qemu_preinit(void)
{
qemu_detect();
+ kvm_detect();
if (!CONFIG_QEMU)
return;
@@ -118,12 +118,6 @@ qemu_preinit(void)
return;
}
- if (!runningOnQEMU()) {
- dprintf(1, "Warning: No QEMU Northbridge found (isapc?)\n");
- PlatformRunningOn |= PF_QEMU;
- kvm_detect();
- }
-
// On emulators, get memory size from nvram.
u32 rs = ((rtc_read(CMOS_MEM_EXTMEM2_LOW) << 16)
| (rtc_read(CMOS_MEM_EXTMEM2_HIGH) << 24));