 @@ -1,14 +1,14 @@
-/* $NetBSD: hypervisor.c,v 1.65 2014/02/01 20:07:07 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.65.4.1 2017/03/07 20:26:12 snj 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,32 +43,33 @@
  * 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.65 2014/02/01 20:07:07 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.65.4.1 2017/03/07 20:26:12 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include "xenbus.h"
 #include "xencons.h"
 #include "isa.h"
 #include "pci.h"
 #include "acpica.h"
 #include "opt_xen.h"
 #include "opt_mpbios.h"
 #include <xen/xen.h>
 #include <xen/hypervisor.h>
 #include <xen/evtchn.h>
 @@ -193,34 +194,52 @@ hypervisor_vcpu_print(void *aux, const c
  * Attach the hypervisor.
  */
 void
 hypervisor_attach(device_t parent, device_t self, void *aux)
+{
 #if NPCI >0
 #ifdef PCI_BUS_FIXUP
 	int pci_maxbus = 0;
 #endif
 #endif /* NPCI */
 	union hypervisor_attach_cookie hac;
 	char xen_extra_version[XEN_EXTRAVERSION_LEN];
 	static char xen_version_string[20];
 	int rc;
 	const struct sysctlnode *node = NULL;
 	xenkernfs_init();
 	xen_version = HYPERVISOR_xen_version(XENVER_version, NULL);
 	memset(xen_extra_version, 0, sizeof(xen_extra_version));
 	HYPERVISOR_xen_version(XENVER_extraversion, xen_extra_version);
-	aprint_normal(": Xen version %d.%d%s\n", XEN_MAJOR(xen_version),
+	rc = snprintf(xen_version_string, 20, "%d.%d%s", XEN_MAJOR(xen_version),
 		XEN_MINOR(xen_version), xen_extra_version);
 	aprint_normal(": Xen version %s\n", xen_version_string);
 	if (rc >= 20)
 		aprint_debug(": xen_version_string truncated\n");
 	sysctl_createv(NULL, 0, NULL, &node, 0,
 	    CTLTYPE_NODE, "xen",
 	    SYSCTL_DESCR("Xen top level node"),
 	    NULL, 0, NULL, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL);
 	if (node != NULL) {
 		sysctl_createv(NULL, 0, &node, NULL, CTLFLAG_READONLY,
 		    CTLTYPE_STRING, "version",
 		    SYSCTL_DESCR("Xen hypervisor version"),
 		    NULL, 0, xen_version_string, 0, CTL_CREATE, CTL_EOL);
+	}
 	xengnt_init();
 	events_init();
 	memset(&hac, 0, sizeof(hac));
 	hac.hac_vcaa.vcaa_name = "vcpu";
 	hac.hac_vcaa.vcaa_caa.cpu_number = 0;
 	hac.hac_vcaa.vcaa_caa.cpu_role = CPU_ROLE_BP;
 	hac.hac_vcaa.vcaa_caa.cpu_func = NULL; /* See xen/x86/cpu.c:vcpu_attach() */
 	config_found_ia(self, "xendevbus", &hac.hac_vcaa, hypervisor_print);
 #ifdef MULTIPROCESSOR