 @@ -1,14 +1,14 @@
-/* $NetBSD: hypervisor.c,v 1.73.2.2 2020/04/11 21:21:16 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.73.2.3 2020/04/16 17:47:37 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.2.2 2020/04/11 21:21:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.73.2.3 2020/04/16 17:47:37 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"
 @@ -240,28 +240,26 @@ hypervisor_match(device_t parent, cfdata
 		 * 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.
 		 */
 		KASSERT(descs[0] == 1);
 		/* XXX: vtophys(&hypercall_page) */
 		wrmsr(descs[1], (uintptr_t)&hypercall_page - KERNBASE);
 		vm_guest = VM_GUEST_XENPVHVM; /* Be more specific */
 	} else {
 		aprint_normal("%s: Xen HVM mode not identified. Exiting.\n",
 		    haa->haa_busname);
 		return 0;
+	}
 	if (-1 != HYPERVISOR_xen_version(XENVER_version, NULL)) {
 		printf("%s: detected functional hypercall page.\n",
 		    haa->haa_busname);
 		xen_init_features();
+	}
 	/* Init various preset boot time data structures  */
 	/* XEN xenstore shared page address, event channel */
 @@ -415,27 +413,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.2.2 2020/04/11 21:21:16 bouyer Exp $	*/
+	/*	$NetBSD: hypervisor.c,v 1.73.2.3 2020/04/16 17:47:37 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;
+	}