Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XENPVH option is not used. Fix consinit.c to use XENPVHVM as intended 

and XENPVH from defflag
This commit is contained in:
bouyer 2023-10-17 16:06:36 +00:00
parent 3c08d38d32
commit 40f65bebd2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/x86/x86/consinit.c
View File

@ -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 1.37 2023/10/17 12:07:42 bouyer Exp $")
#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

4
sys/arch/xen/conf/files.xen
View File

@ -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