Module Name: src
Committed By: bouyer
Date: Tue Oct 17 16:06:37 UTC 2023
Modified Files:
src/sys/arch/x86/x86: consinit.c
src/sys/arch/xen/conf: files.xen
Log Message:
XENPVH option is not used. Fix consinit.c to use XENPVHVM as intended
and XENPVH from defflag
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x86/x86/consinit.c
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/xen/conf/files.xen
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/x86/consinit.c
diff -u src/sys/arch/x86/x86/consinit.c:1.37 src/sys/arch/x86/x86/consinit.c:1.38
--- src/sys/arch/x86/x86/consinit.c:1.37 Tue Oct 17 12:07:42 2023
+++ src/sys/arch/x86/x86/consinit.c Tue Oct 17 16:06:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.37 2023/10/17 12:07:42 bouyer Exp $ */
+/* $NetBSD: consinit.c,v 1.38 2023/10/17 16:06:36 bouyer Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.37 2023/10/17 12:07:42 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.38 2023/10/17 16:06:36 bouyer Exp $");
#include "opt_kgdb.h"
#include "opt_puc.h"
@@ -100,6 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#endif
#ifdef XENPVHVM
+#include <xen/hypervisor.h>
#include <xen/xen.h>
#endif
@@ -189,7 +190,7 @@ consinit(void)
consinfo = &default_consinfo;
#if (NGENFB > 0)
-#if defined(XENPVH) && defined(DOM0OPS)
+#if defined(XENPVHVM) && defined(DOM0OPS)
if (vm_guest == VM_GUEST_XENPVH && xendomain_is_dom0())
fbinfo = xen_genfb_getbtinfo();
else
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.188 src/sys/arch/xen/conf/files.xen:1.189
--- src/sys/arch/xen/conf/files.xen:1.188 Tue Oct 17 12:07:42 2023
+++ src/sys/arch/xen/conf/files.xen Tue Oct 17 16:06:36 2023
@@ -1,6 +1,6 @@
-# $NetBSD: files.xen,v 1.188 2023/10/17 12:07:42 bouyer Exp $
+# $NetBSD: files.xen,v 1.189 2023/10/17 16:06:36 bouyer Exp $
-defflag opt_xen.h XEN XENPVH XENPVHVM PAE DOM0OPS
+defflag opt_xen.h XEN XENPVHVM PAE DOM0OPS
file arch/xen/x86/hypervisor_machdep.c xen
file arch/xen/x86/xen_intr.c xen
