From 2ef8a4c4399dcb7b6fcaecd41f27377b584e9a4b Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 3 Nov 2015 12:10:13 -0600 Subject: arm/aarch64: detect-virt: check dmi ARM/AArch64 guests now have SMBIOS tables populated (when boot with a late enough QEMU and a late enough AAVMF is used as the bootloader). Furthermore, when booting ARM/AArch64 guests with ACPI, the DT detection obviously no longer works, so we need dmi detection. --- src/basic/virt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/basic/virt.c') diff --git a/src/basic/virt.c b/src/basic/virt.c index 1e10fc755f..42c54735d8 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -34,7 +34,7 @@ static int detect_vm_cpuid(void) { - /* Both CPUID and DMI are x86 specific interfaces... */ + /* CPUID is an x86 specific interface. */ #if defined(__i386__) || defined(__x86_64__) static const struct { @@ -144,9 +144,7 @@ static int detect_vm_device_tree(void) { } static int detect_vm_dmi(void) { - - /* Both CPUID and DMI are x86 specific interfaces... */ -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) static const char *const dmi_vendors[] = { "/sys/class/dmi/id/sys_vendor", -- cgit v1.2.3-54-g00ecf