summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Jones <drjones@redhat.com>2015-11-03 12:10:13 -0600
committerAndrew Jones <drjones@redhat.com>2015-11-04 11:19:37 -0600
commit2ef8a4c4399dcb7b6fcaecd41f27377b584e9a4b (patch)
tree3d2f8528fe5f90f1109fe6bc0d3db41c8833191b /src
parent42685451ed0f1c422395a05820ee4328c352808f (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.
Diffstat (limited to 'src')
-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 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",