From 87bc4b40fca5e46d86367bf9deef45830469e946 Mon Sep 17 00:00:00 2001 From: Jan Losinski Date: Thu, 29 Aug 2019 15:45:51 +0200 Subject: [PATCH] basic/virt: Fix current virtualbox detection In a current VirtualBox installation the board_vendor is set to "Oracle Corporation". So we need to add this to the dmi_vendor_table for a relieable detection. This fixes #13429 Signed-off-by: Jan Losinski --- src/basic/virt.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/basic/virt.c b/src/basic/virt.c index 7a7400773bd..65a36037d93 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -140,17 +140,18 @@ static int detect_vm_dmi(void) { const char *vendor; int id; } dmi_vendor_table[] = { - { "KVM", VIRTUALIZATION_KVM }, - { "QEMU", VIRTUALIZATION_QEMU }, + { "KVM", VIRTUALIZATION_KVM }, + { "QEMU", VIRTUALIZATION_QEMU }, /* http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 */ - { "VMware", VIRTUALIZATION_VMWARE }, - { "VMW", VIRTUALIZATION_VMWARE }, - { "innotek GmbH", VIRTUALIZATION_ORACLE }, - { "Xen", VIRTUALIZATION_XEN }, - { "Bochs", VIRTUALIZATION_BOCHS }, - { "Parallels", VIRTUALIZATION_PARALLELS }, + { "VMware", VIRTUALIZATION_VMWARE }, + { "VMW", VIRTUALIZATION_VMWARE }, + { "innotek GmbH", VIRTUALIZATION_ORACLE }, + { "Oracle Corporation", VIRTUALIZATION_ORACLE }, + { "Xen", VIRTUALIZATION_XEN }, + { "Bochs", VIRTUALIZATION_BOCHS }, + { "Parallels", VIRTUALIZATION_PARALLELS }, /* https://wiki.freebsd.org/bhyve */ - { "BHYVE", VIRTUALIZATION_BHYVE }, + { "BHYVE", VIRTUALIZATION_BHYVE }, }; unsigned i; int r;