From e732bc987f2f779e89f30193bf694e0456ab7ce0 Mon Sep 17 00:00:00 2001 From: Boqun Feng Date: Tue, 23 Nov 2021 15:09:26 +0800 Subject: [PATCH] virt: Fix the detection for Hyper-V VMs Use product_version instead of product_name in DMI table and the string "Hyper-V" to avoid misdetection. Fixes: #21468 Signed-off-by: Boqun Feng (cherry picked from commit 76eec0649936d9ae2f9087769f463feaf0cf5cb4) Related: #2158307 --- src/basic/virt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/basic/virt.c b/src/basic/virt.c index cc95097101..f750a0463f 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -143,7 +143,8 @@ static int detect_vm_dmi_vendor(void) { "/sys/class/dmi/id/product_name", /* Test this before sys_vendor to detect KVM over QEMU */ "/sys/class/dmi/id/sys_vendor", "/sys/class/dmi/id/board_vendor", - "/sys/class/dmi/id/bios_vendor" + "/sys/class/dmi/id/bios_vendor", + "/sys/class/dmi/id/product_version" /* For Hyper-V VMs test */ }; static const struct { @@ -162,7 +163,7 @@ static int detect_vm_dmi_vendor(void) { { "Parallels", VIRTUALIZATION_PARALLELS }, /* https://wiki.freebsd.org/bhyve */ { "BHYVE", VIRTUALIZATION_BHYVE }, - { "Microsoft", VIRTUALIZATION_MICROSOFT }, + { "Hyper-V", VIRTUALIZATION_MICROSOFT }, }; unsigned i; int r;