summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Jones <drjones@redhat.com>2015-11-03 12:10:13 -0600
committerSven Eden <yamakuzure@gmx.net>2017-04-26 12:58:55 +0200
commit27edf6f36e27bff66b04908b4dcebd359ae08116 (patch)
tree0269f130981d99e540efa9e2597b4ba8a1b59450
parent9e42188e79377946c9d5c197abfb58ad88d7baae (diff)
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.
-rw-r--r--src/basic/virt.c6
1 files 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",