 @@ -1,14 +1,14 @@
-/*	$NetBSD: xen_mainbus.c,v 1.6.12.1 2020/04/16 08:46:35 bouyer Exp $	*/
+/*	$NetBSD: xen_mainbus.c,v 1.6.12.2 2020/04/16 17:46:44 bouyer Exp $	*/
 /*	NetBSD: mainbus.c,v 1.19 2017/05/23 08:54:39 nonaka Exp 	*/
 /*	NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp 	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * 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
 @@ -23,27 +23,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: xen_mainbus.c,v 1.6.12.1 2020/04/16 08:46:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_mainbus.c,v 1.6.12.2 2020/04/16 17:46:44 bouyer Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include "hypervisor.h"
 #include "pci.h"
 #include "opt_xen.h"
 #include "opt_mpbios.h"
 #include "opt_pcifixup.h"
 @@ -111,38 +111,49 @@ union xen_mainbus_attach_args {
 #if NIPMI > 0
 	struct ipmi_attach_args mba_ipmi;
 #endif
 };
 /*
  * Attach the mainbus.
  */
 void
 xen_mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	union xen_mainbus_attach_args mba;
 	switch(vm_guest) {
 	case VM_GUEST_XENPV:
 #if NIPMI > 0 && defined(XENPV)
-	memset(&mba.mba_ipmi, 0, sizeof(mba.mba_ipmi));
+		memset(&mba.mba_ipmi, 0, sizeof(mba.mba_ipmi));
-	mba.mba_ipmi.iaa_iot = x86_bus_space_io;
+		mba.mba_ipmi.iaa_iot = x86_bus_space_io;
-	mba.mba_ipmi.iaa_memt = x86_bus_space_mem;
+		mba.mba_ipmi.iaa_memt = x86_bus_space_mem;
-	if (ipmi_probe(&mba.mba_ipmi))
+		if (ipmi_probe(&mba.mba_ipmi))
-		config_found_ia(self, "ipmibus", &mba.mba_ipmi, 0);
+			config_found_ia(self, "ipmibus", &mba.mba_ipmi, 0);
 #endif
 	/* FALLTHROUGH */
-	mba.mba_haa.haa_busname = "hypervisor";
+	case VM_GUEST_XENHVM:
-	config_found_ia(self, "hypervisorbus", &mba.mba_haa, xen_mainbus_print);
+		mba.mba_haa.haa_busname = "hypervisor";
 		config_found_ia(self, "hypervisorbus",
-	/* save/restore for Xen */
+		    &mba.mba_haa, xen_mainbus_print);
-	if (!pmf_device_register(self, NULL, NULL))
+		break;
-		aprint_error_dev(self, "couldn't establish power handler\n");
+	default:
 		return;
+	}
 	if (vm_guest == VM_GUEST_XENPV) {
 		/* save/restore for Xen */
 		if (!pmf_device_register(self, NULL, NULL))
 			aprint_error_dev(self,
 			    "couldn't establish power handler\n");
+	}
+}
 static int
 xen_mainbus_print(void *aux, const char *pnp)
+{
 	union xen_mainbus_attach_args *mba = aux;
 	if (pnp)
 		aprint_normal("%s at %s", mba->mba_busname, pnp);
 	return UNCONF;
+}