[src/trunk]: src/sys/arch/xen/xen Fix side effect of previous commit: skip xe...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e2f688582e87
branches:  trunk
changeset: 955036:e2f688582e87
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Sep 15 10:58:02 2020 +0000

description:
Fix side effect of previous commit: skip xencons attachement only for
PVHVM guests. Should fix issue with console on PV dom0 reported by
kardel@ in private mail

diffstat:

 sys/arch/xen/xen/hypervisor.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ae678f11b9c0 -r e2f688582e87 sys/arch/xen/xen/hypervisor.c
--- a/sys/arch/xen/xen/hypervisor.c     Tue Sep 15 10:33:58 2020 +0000
+++ b/sys/arch/xen/xen/hypervisor.c     Tue Sep 15 10:58:02 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.88 2020/09/09 16:46:06 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.89 2020/09/15 10:58:02 bouyer Exp $ */
 
 /*
  * Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.88 2020/09/09 16:46:06 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.89 2020/09/15 10:58:02 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -676,7 +676,7 @@
        config_found_ia(self, "xendevbus", &hac.hac_xenbus, hypervisor_print);
 #endif
 #if NXENCONS > 0
-       if (xencons_interface != 0) {
+       if (xencons_interface != 0 || vm_guest != VM_GUEST_XENPVHVM) {
                memset(&hac, 0, sizeof(hac));
                hac.hac_xencons.xa_device = "xencons";
                config_found_ia(self, "xendevbus", &hac.hac_xencons, hypervisor_print);