 @@ -1,14 +1,14 @@
-#	$NetBSD: genassym.cf,v 1.82 2020/02/17 09:09:48 skrll Exp $
+#	$NetBSD: genassym.cf,v 1.82.4.1 2020/04/08 17:59:16 bouyer Exp $
+#
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Charles M. Hannum, and by Andrew Doran.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 @@ -350,26 +350,28 @@ define	RW_READ_INCR		RW_READ_INCR
 define	RW_HAS_WAITERS		RW_HAS_WAITERS
 define	RW_THREAD		RW_THREAD
 define	RW_READER		RW_READER
 define	RW_WRITER		RW_WRITER
 define	EV_COUNT		offsetof(struct evcnt, ev_count)
 define	OPTERON_MSR_PASSCODE	OPTERON_MSR_PASSCODE
 define	X86_BUS_SPACE_IO	X86_BUS_SPACE_IO
 define	BST_TYPE		offsetof(struct bus_space_tag, bst_type)
 define	VM_GUEST_XENPV		VM_GUEST_XENPV
 ifdef XEN
 define CPU_INFO_VCPU		offsetof(struct cpu_info, ci_vcpu)
 define CPU_INFO_XPENDING	offsetof(struct cpu_info, ci_xpending)
 define CPU_INFO_XMASK		offsetof(struct cpu_info, ci_xmask)
 define CPU_INFO_XUNMASK		offsetof(struct cpu_info, ci_xunmask)
 define CPU_INFO_XSOURCES	offsetof(struct cpu_info, ci_xsources)
 define EVTCHN_UPCALL_MASK	offsetof(struct vcpu_info, evtchn_upcall_mask)
 ifdef XENPV
 define XEN_PT_BASE		offsetof(struct start_info, pt_base)
 define XEN_NR_PT_FRAMES		offsetof(struct start_info, nr_pt_frames)
 define __HYPERVISOR_iret	__HYPERVISOR_iret
 endif /* XENPV */
 endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.S,v 1.200 2020/01/15 18:47:23 ad Exp $	*/
+/*	$NetBSD: locore.S,v 1.200.4.1 2020/04/08 17:59:16 bouyer Exp $	*/
 /*
  * Copyright-o-rama!
  */
 /*
  * Copyright (c) 1998, 2000, 2007, 2008, 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -932,26 +932,28 @@ longmode_hi:
 	/*
 	 * We want our own page tables, and will rebuild them. We will reclaim
 	 * the Xen space later, INCLUDING the stack. So we need to switch to a
 	 * temporary one now.
 	 */
 	movq	$tmpstk,%rax
 	subq	$8,%rax
 	movq	%rax,%rsp
 	xorl	%eax,%eax
 	cpuid
 	movl	%eax,_C_LABEL(cpuid_level)
 	movl	$VM_GUEST_XENPV, _C_LABEL(vm_guest)
 	movq	$cpu_info_primary,%rdi
 	movq	%rdi,CPU_INFO_SELF(%rdi) /* ci->ci_self = ci */
 	movq	$1,%rsi
 	call	cpu_init_msrs	/* cpu_init_msrs(ci, true); */
 	call	xen_locore
 	/*
 	 * The first VA available is returned by xen_locore in %rax. We
 	 * use it as the UAREA, and set up the stack here.
 	 */
 	movq	%rax,%rsi
 	movq	%rsi,_C_LABEL(lwp0uarea)(%rip)

 @@ -1,14 +1,14 @@
-#	$NetBSD: genassym.cf,v 1.119 2020/02/17 09:09:48 skrll Exp $
+#	$NetBSD: genassym.cf,v 1.119.4.1 2020/04/08 17:59:16 bouyer Exp $
+#
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Charles M. Hannum, and by Andrew Doran.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 @@ -364,26 +364,28 @@ define	EV_COUNT		offsetof(struct evcnt,
 define	OPTERON_MSR_PASSCODE	OPTERON_MSR_PASSCODE
 define	X86_BUS_SPACE_IO	X86_BUS_SPACE_IO
 define	BST_TYPE		offsetof(struct bus_space_tag, bst_type)
 define	L1_SHIFT		L1_SHIFT
 define	L2_SHIFT		L2_SHIFT
 define	L2_FRAME		L2_FRAME
 define	PGOFSET			PGOFSET
 define	PGSHIFT			PGSHIFT
 define	VM_GUEST_XENPV		VM_GUEST_XENPV
 ifdef XEN
 define CPU_INFO_VCPU		offsetof(struct cpu_info, ci_vcpu)
 define CPU_INFO_XPENDING	offsetof(struct cpu_info, ci_xpending)
 define CPU_INFO_XMASK		offsetof(struct cpu_info, ci_xmask)
 define CPU_INFO_XUNMASK		offsetof(struct cpu_info, ci_xunmask)
 define CPU_INFO_XSOURCES	offsetof(struct cpu_info, ci_xsources)
 define START_INFO_SHARED_INFO	offsetof(struct start_info, shared_info)
 define START_INFO_FLAGS		offsetof(struct start_info, flags)
 define START_INFO_CONSOLE_MFN	offsetof(struct start_info, console.domU.mfn)
 define START_INFO_STORE_MFN	offsetof(struct start_info, store_mfn)
 define SIF_INITDOMAIN		SIF_INITDOMAIN
 define EVTCHN_UPCALL_PENDING	offsetof(struct vcpu_info, evtchn_upcall_pending)
 define EVTCHN_UPCALL_MASK	offsetof(struct vcpu_info, evtchn_upcall_mask)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.S,v 1.179 2020/03/27 21:05:03 ad Exp $	*/
+/*	$NetBSD: locore.S,v 1.179.2.1 2020/04/08 17:59:16 bouyer Exp $	*/
 /*
  * Copyright-o-rama!
  */
 /*
  * Copyright (c) 1998, 2000, 2004, 2006, 2007, 2009, 2016
  * The NetBSD Foundation, Inc., All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, by Andrew Doran and by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -118,27 +118,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)locore.s	7.3 (Berkeley) 5/13/91
  */
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.179 2020/03/27 21:05:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.179.2.1 2020/04/08 17:59:16 bouyer Exp $");
 #include "opt_copy_symtab.h"
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #include "opt_multiboot.h"
 #include "opt_realmem.h"
 #include "opt_xen.h"
 #include "assym.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include "ksyms.h"
 @@ -1105,26 +1105,28 @@ begin:
 	movl	$128,%ecx
 	rep
 	movsl
 	/* Clear segment registers. */
 	xorl	%eax,%eax
 	movw	%ax,%fs
 	movw	%ax,%gs
 	xorl	%eax,%eax
 	cpuid
 	movl	%eax,RELOC(cpuid_level)
 	movl    $VM_GUEST_XENPV, RELOC(vm_guest)
 	/*
 	 * Use a temporary GDT page. We'll re-add it to uvm(9) once we're done
 	 * using it.
 	 */
 	movl	$RELOC(tmpgdt),%eax
 	pushl	%eax		/* start of temporary gdt */
 	call	_C_LABEL(initgdt)
 	addl	$4,%esp
 	call	xen_locore
 	/*
 	 * The first VA available is returned by xen_locore in %eax. We

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.h,v 1.117 2020/01/15 13:22:03 ad Exp $	*/
+/*	$NetBSD: cpu.h,v 1.117.4.1 2020/04/08 17:59:16 bouyer Exp $	*/
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -486,27 +486,29 @@ void	cpu_reset(void);
 /* longrun.c */
 u_int 	tmx86_get_longrun_mode(void);
 void 	tmx86_get_longrun_status(u_int *, u_int *, u_int *);
 void 	tmx86_init_longrun(void);
 /* identcpu.c */
 void 	cpu_probe(struct cpu_info *);
 void	cpu_identify(struct cpu_info *);
 void	identify_hypervisor(void);
 typedef enum vm_guest {
 	VM_GUEST_NO = 0,
 	VM_GUEST_VM,
-	VM_GUEST_XEN,
+	VM_GUEST_XENPV,
 	VM_GUEST_XENPVH,
 	VM_GUEST_XENHVM,
 	VM_GUEST_XENPVHVM,
 	VM_GUEST_HV,
 	VM_GUEST_VMWARE,
 	VM_GUEST_KVM,
 	VM_LAST
 } vm_guest_t;
 extern vm_guest_t vm_guest;
 /* cpu_topology.c */
 void	x86_cpu_topology(struct cpu_info *);
 /* locore.s */
 struct region_descriptor;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: identcpu.c,v 1.102 2020/04/04 14:49:35 ad Exp $	*/
+/*	$NetBSD: identcpu.c,v 1.102.2.1 2020/04/08 17:59:16 bouyer Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden,  and by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.102 2020/04/04 14:49:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.102.2.1 2020/04/08 17:59:16 bouyer Exp $");
 #include "opt_xen.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <machine/specialreg.h>
 #include <machine/pio.h>
 #include <machine/cpu.h>
 @@ -1119,27 +1119,27 @@ identify_hypervisor(void)
 			memcpy(&hv_vendor[0], &regs[1], sizeof(*regs));
 			memcpy(&hv_vendor[4], &regs[2], sizeof(*regs));
 			memcpy(&hv_vendor[8], &regs[3], sizeof(*regs));
 			if (memcmp(hv_vendor, "VMwareVMware", 12) == 0)
 				vm_guest = VM_GUEST_VMWARE;
 			else if (memcmp(hv_vendor, "Microsoft Hv", 12) == 0) {
 				vm_guest = VM_GUEST_HV;
 #if NHYPERV > 0
 				hyperv_early_init();
 #endif
 			} else if (memcmp(hv_vendor, "KVMKVMKVM\0\0\0", 12) == 0)
 				vm_guest = VM_GUEST_KVM;
 			else if (memcmp(hv_vendor, "XenVMMXenVMM", 12) == 0)
-				vm_guest = VM_GUEST_XEN;
+				vm_guest = VM_GUEST_XENHVM;
 			/* FreeBSD bhyve: "bhyve bhyve " */
 			/* OpenBSD vmm:   "OpenBSDVMM58" */
 			/* NetBSD nvmm:   "___ NVMM ___" */
+		}
 		return;
+	}
 	/*
 	 * Examine SMBIOS strings for older hypervisors.
 	 */
 	p = pmf_get_platform("system-serial");
 	if (p != NULL) {
 		if (strncmp(p, "VMware-", 7) == 0 || strncmp(p, "VMW", 3) == 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lapic.c,v 1.76 2019/12/01 08:23:09 maxv Exp $	*/
+/*	$NetBSD: lapic.c,v 1.76.6.1 2020/04/08 17:59:16 bouyer Exp $	*/
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.76 2019/12/01 08:23:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.76.6.1 2020/04/08 17:59:16 bouyer Exp $");
 #include "acpica.h"
 #include "ioapic.h"
 #include "opt_acpi.h"
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_multiprocessor.h"
 #include "opt_ntp.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 @@ -268,27 +268,27 @@ lapic_setup_bsp(paddr_t lapic_base)
 				if (ISSET(dmar->Flags, ACPI_DMAR_X2APIC_OPT_OUT)) {
 					reason = "by DMAR table";
+				}
 				AcpiPutTable(&dmar->Header);
+			}
+		}
 #endif	/* NACPICA > 0 */
 		if (vm_guest == VM_GUEST_VMWARE) {
 			vmt_hvcall(VM_CMD_GET_VCPU_INFO, regs);
 			if (ISSET(regs[0], VCPUINFO_VCPU_RESERVED) ||
 			    !ISSET(regs[0], VCPUINFO_LEGACY_X2APIC))
 				reason = "inside VMWare without intr "
 				    "redirection";
-		} else if (vm_guest == VM_GUEST_XEN) {
+		} else if (vm_guest == VM_GUEST_XENHVM) {
 			reason = "due to running under XEN";
 		} else if (vm_guest == VM_GUEST_NO &&
 		    CPUID_TO_FAMILY(curcpu()->ci_signature) == 6 &&
 		    CPUID_TO_MODEL(curcpu()->ci_signature) == 0x2a) {
 			hw_vendor = pmf_get_platform("board-vendor");
 			if (hw_vendor != NULL) {
 				/*
 				 * It seems that some Lenovo and ASUS
 				 * SandyBridge-based notebook BIOSes have a bug
 				 * which prevents booting AP in x2APIC mode.
 				 * Since the only way to detect mobile CPU is
 				 * to check northbridge pci id, which cannot be
 				 * done that early, disable x2APIC for all

 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_machdep.c,v 1.137 2020/04/04 19:50:54 christos Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.137.2.1 2020/04/08 17:59:16 bouyer Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
  * Copyright (c) 2005, 2008, 2009, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.137 2020/04/04 19:50:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.137.2.1 2020/04/08 17:59:16 bouyer Exp $");
 #include "opt_modular.h"
 #include "opt_physmem.h"
 #include "opt_splash.h"
 #include "opt_kaslr.h"
 #include "opt_svs.h"
 #include "opt_xen.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kcore.h>
 #include <sys/errno.h>
 @@ -1245,38 +1245,41 @@ sysctl_machdep_tsc_enable(SYSCTLFN_ARGS)
+	}
 	if (error)
 		return error;
 	*(int *)rnode->sysctl_data = val;
 	return 0;
+}
 #endif
 static const char * const vm_guest_name[VM_LAST] = {
 	[VM_GUEST_NO] =		"none",
 	[VM_GUEST_VM] =		"generic",
-	[VM_GUEST_XEN] =	"Xen",
+	[VM_GUEST_XENPV] =	"Xen PV",
 	[VM_GUEST_XENPVH] =	"Xen PVH",
 	[VM_GUEST_XENHVM] =	"Xen HVM",
 	[VM_GUEST_XENPVHVM] =	"Xen PVHVM",
 	[VM_GUEST_HV] =		"Hyper-V",
 	[VM_GUEST_VMWARE] =	"VMware",
 	[VM_GUEST_KVM] =	"KVM",
 };
 static int
 sysctl_machdep_hypervisor(SYSCTLFN_ARGS)
+{
 	struct sysctlnode node;
 	const char *t = NULL;
-	char buf[8];
+	char buf[10];
 	node = *rnode;
 	node.sysctl_data = buf;
 	if (vm_guest >= VM_GUEST_NO && vm_guest < VM_LAST)
 		t = vm_guest_name[vm_guest];
 	if (t == NULL)
 		t = "unknown";
 	strlcpy(buf, t, sizeof(buf));
 	return sysctl_lookup(SYSCTLFN_CALL(&node));
+}
 static void
 const_sysctl(struct sysctllog **clog, const char *name, int type,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.23 2019/05/24 14:28:48 nonaka Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.23.8.1 2020/04/08 17:59:16 bouyer Exp $	*/
 /*	NetBSD: autoconf.c,v 1.75 2003/12/30 12:33:22 pk Exp 	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -35,27 +35,27 @@
  *	@(#)autoconf.c	7.1 (Berkeley) 5/9/91
  */
 /*
  * Setup the system to run on the current machine.
+ *
  * Configure() is called at boot time and initializes the vba
  * device tables and the memory controller monitoring.  Available
  * devices are determined (from possibilities mentioned in ioconf.c),
  * and the drivers are initialized.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23 2019/05/24 14:28:48 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23.8.1 2020/04/08 17:59:16 bouyer Exp $");
 #include "opt_xen.h"
 #include "opt_multiprocessor.h"
 #include "opt_nfs_boot.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/vnode.h>
 @@ -118,27 +118,26 @@ cpu_configure(void)
 	startrtclock();
 #if defined(DOM0OPS)
 	if (xendomain_is_dom0()) {
 #if NBIOS32 > 0
 		bios32_init();
 		platform_init();
 		/* identify hypervisor type from SMBIOS */
 		identify_hypervisor();
 #endif /* NBIOS32 > 0 */
 	} else
 #endif /* DOM0OPS */
 		vm_guest = VM_GUEST_XEN;
 #ifdef PCIBIOS
 	pcibios_init();
 #endif
 	if (config_rootfound("mainbus", NULL) == NULL)
 		panic("configure: mainbus not configured");
 #ifdef INTRDEBUG
 	intr_printconfig();
 #endif
 #if NIOAPIC > 0
 	ioapic_enable();

 @@ -1,14 +1,14 @@
-/* $NetBSD: hypervisor.c,v 1.73 2020/04/07 08:14:42 jdolecek Exp $ */
+/* $NetBSD: hypervisor.c,v 1.73.2.1 2020/04/08 17:59:17 bouyer Exp $ */
 /*
  * Copyright (c) 2005 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -43,27 +43,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.73 2020/04/07 08:14:42 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.73.2.1 2020/04/08 17:59:17 bouyer Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 #include "xenbus.h"
 #include "xencons.h"
 #include "isa.h"
 #include "pci.h"
 #include "acpica.h"
 #include "opt_xen.h"
 @@ -207,27 +207,27 @@ hypervisor_match(device_t parent, cfdata
 	/*
 	 * The strategy here is to setup hypercall and all PVHVM
 	 * interfaces on match, or fail to match.
 	 * Ideally this should happen under attach, but it's too late
 	 * then and there's no way to bailout.
+	 *
 	 * If match fails, hypervisor does not attach, and the domain
 	 * can boot with the minimal PC AT ISA configuration just
 	 * enough to attach wd(4) and mount the rootfs.
 	 */
 	int vec;
 	extern vaddr_t hypercall_page;
-	if (vm_guest == VM_GUEST_XEN) {
+	if (vm_guest == VM_GUEST_XENHVM) {
 		aprint_normal("%s: Identified Guest XEN in HVM mode.\n",
 		    haa->haa_busname);
 		u_int descs[4];
 		x86_cpuid(XEN_CPUID_LEAF(2), descs);
 		/*
 		 * Given 32 bytes per hypercall stub, and an optimistic number
 		 * of 100 hypercalls ( the current max is 55), there shouldn't
 		 * be any reason to spill over the arbitrary number of 1
 		 * hypercall page. This is what we allocate in locore.S
 		 * anyway. Make sure the allocation matches the registration.
 		 */
 @@ -405,27 +405,27 @@ hypervisor_match(device_t parent, cfdata
+	 *
 	 * We need to do this because the HVM domain loader uses the
 	 * regular BIOS based native boot(8) procedure, which sets the
 	 * boot device to the native driver/partition of whatever was
 	 * detected by the native bootloader.
 	 */
 	struct btinfo_rootdevice bi;
 	snprintf(bi.devname, 6, "xbd0a");
 	bi.common.type = BTINFO_ROOTDEVICE;
 	bi.common.len = sizeof(struct btinfo_rootdevice);
 	/* From i386/multiboot.c */
-	/*	$NetBSD: hypervisor.c,v 1.73 2020/04/07 08:14:42 jdolecek Exp $	*/
+	/*	$NetBSD: hypervisor.c,v 1.73.2.1 2020/04/08 17:59:17 bouyer Exp $	*/
 	int i, len;
 	vaddr_t data;
 	extern struct bootinfo	bootinfo;
 	struct bootinfo *bip = (struct bootinfo *)&bootinfo;
 	len = bi.common.len;
 	data = (vaddr_t)&bip->bi_data;
 	for (i = 0; i < bip->bi_nentries; i++) {
 		struct btinfo_common *tmp;
 		tmp = (struct btinfo_common *)data;
 		data += tmp->len;
+	}