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
This commit is contained in:
parent
67cbfedb33
commit
d68335174d
|
@ -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));
|
||||
|
|
Loading…
Reference in New Issue