Module Name: src
Committed By: jmcneill
Date: Sat Oct 16 13:15:01 UTC 2021
Modified Files:
src/sys/arch/x86/isa: isa_machdep.c
Log Message:
Skip legacy device detection for VMware guests with ACPI enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/x86/isa/isa_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.48 src/sys/arch/x86/isa/isa_machdep.c:1.49
--- src/sys/arch/x86/isa/isa_machdep.c:1.48 Fri Oct 15 19:01:52 2021
+++ src/sys/arch/x86/isa/isa_machdep.c Sat Oct 16 13:15:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.48 2021/10/15 19:01:52 jmcneill Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.49 2021/10/16 13:15:01 jmcneill Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.48 2021/10/15 19:01:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.49 2021/10/16 13:15:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -387,6 +387,11 @@ device_isa_register(device_t dev, void *
"no-legacy-devices", true);
}
}
+ if (vm_guest == VM_GUEST_VMWARE &&
+ device_is_a(dev, "isa") && acpi_active) {
+ prop_dictionary_set_bool(device_properties(dev),
+ "no-legacy-devices", true);
+ }
#endif /* NACPICA > 0 */
return NULL;
}
