Module Name: src
Committed By: bouyer
Date: Tue May 24 17:06:08 UTC 2022
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0
src/sys/arch/xen/xen: xen_acpi_machdep.c
Log Message:
PR kern/56853: add a dummy acpi_md_vbios_reset variable so that we
can again enable vga at pci for Xen.
Note that this only works in BIOS mode, not UEFI mode.
To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/xen/xen_acpi_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/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.195 src/sys/arch/amd64/conf/XEN3_DOM0:1.196
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.195 Tue May 24 16:01:25 2022
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue May 24 17:06:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.195 2022/05/24 16:01:25 bouyer Exp $
+# $NetBSD: XEN3_DOM0,v 1.196 2022/05/24 17:06:08 bouyer Exp $
# XEN3_DOM0 machine description file
#
@@ -14,7 +14,7 @@ include "arch/amd64/conf/std.xen"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "XEN3_DOM0-$Revision: 1.195 $"
+#ident "XEN3_DOM0-$Revision: 1.196 $"
maxusers 32 # estimated number of users
@@ -438,8 +438,7 @@ pms* at pckbc? # PS/2 mouse for wsmous
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
options PMS_ALPS_TOUCHPAD # Enable support for Alps Touchpads
-#vga* at pci? dev ? function ?# Needs acpi_md_vbios_reset
- # in acpi_wakeup.c (!xenpv)
+vga* at pci? dev ? function ?
#genfb* at pci? dev ? function ?# Needs acpi_md_vesa_modenum
# in acpi_wakeup.c (!xenpv)
#options VCONS_DRAW_INTR
Index: src/sys/arch/xen/xen/xen_acpi_machdep.c
diff -u src/sys/arch/xen/xen/xen_acpi_machdep.c:1.5 src/sys/arch/xen/xen/xen_acpi_machdep.c:1.6
--- src/sys/arch/xen/xen/xen_acpi_machdep.c:1.5 Tue Aug 18 16:41:03 2009
+++ src/sys/arch/xen/xen/xen_acpi_machdep.c Tue May 24 17:06:08 2022
@@ -1,15 +1,17 @@
-/* $NetBSD: xen_acpi_machdep.c,v 1.5 2009/08/18 16:41:03 jmcneill Exp $ */
+/* $NetBSD: xen_acpi_machdep.c,v 1.6 2022/05/24 17:06:08 bouyer Exp $ */
#include "acpica.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_acpi_machdep.c,v 1.5 2009/08/18 16:41:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_acpi_machdep.c,v 1.6 2022/05/24 17:06:08 bouyer Exp $");
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpivar.h>
#define ACPI_MACHDEP_PRIVATE
#include <machine/acpi_machdep.h>
+int acpi_md_vbios_reset = 0;
+
int
acpi_md_sleep(int state)
{
