detect-virt: allow detection via SMBIOS on RISC-V

xypron · bluca · commit 4cef472e9bde · 2024-02-28T00:15:39.000Z
SMBIOS support in QEMU for RISC-V is merged upstream. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> (cherry picked from commit 5041e77) (cherry picked from commit 387a14a)
diff --git a/src/basic/virt.c b/src/basic/virt.c
@@ -154,7 +154,7 @@ static Virtualization detect_vm_device_tree(void) {
 #endif
 }
 
-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64)
+#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) || defined(__riscv)
 static Virtualization detect_vm_dmi_vendor(void) {
         static const char* const dmi_vendors[] = {
                 "/sys/class/dmi/id/product_name", /* Test this before sys_vendor to detect KVM over QEMU */

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ static Virtualization detect_vm_device_tree(void) {`
`154`	`154`	`#endif`
`155`	`155`	`}`
`156`	`156`
`157`		`-#if defined(__i386__) \|\| defined(__x86_64__) \|\| defined(__arm__) \|\| defined(__aarch64__) \|\| defined(__loongarch_lp64)`
	`157`	`+#if defined(__i386__) \|\| defined(__x86_64__) \|\| defined(__arm__) \|\| defined(__aarch64__) \|\| defined(__loongarch_lp64) \|\| defined(__riscv)`
`158`	`158`	`static Virtualization detect_vm_dmi_vendor(void) {`
`159`	`159`	`static const char* const dmi_vendors[] = {`
`160`	`160`	`"/sys/class/dmi/id/product_name", /* Test this before sys_vendor to detect KVM over QEMU */`