From 27edf6f36e27bff66b04908b4dcebd359ae08116 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 3 Nov 2015 12:10:13 -0600 Subject: [PATCH] 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(-) diff --git a/src/basic/virt.c b/src/basic/virt.c index 8e398e506..e07fa5a69 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -30,7 +30,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 { @@ -140,9 +140,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", -- 2.30.2