 @@ -1,14 +1,14 @@
-/*	$NetBSD: shutdown_xenbus.h,v 1.3 2007/10/17 19:58:29 garbled Exp $	*/
+/*	$NetBSD: shutdown_xenbus.h,v 1.3.34.1 2011/08/27 15:56:48 jym Exp $	*/
 /*-
  * Copyright (c)2006 YAMAMOTO Takashi,
  * 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
  *    documentation and/or other materials provided with the distribution.
 @@ -19,16 +19,19 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
  */
 #ifndef _XEN_SHUTDOWN_XENBUS_H_
 #define	_XEN_SHUTDOWN_XENBUS_H_
 /* Whether dom0 ordered a suspend (true) or not (false) */
 bool xen_suspend_allow;
 void shutdown_xenbus_setup(void);
 #endif /* _XEN_SHUTDOWN_XENBUS_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xen.h,v 1.30.8.7 2011/08/27 15:48:35 jym Exp $	*/
+/*	$NetBSD: xen.h,v 1.30.8.8 2011/08/27 15:56:48 jym Exp $	*/
 /*
+ *
  * Copyright (c) 2003, 2004 Keir Fraser (on behalf of the Xen team)
  * All rights reserved.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
  * deal in the Software without restriction, including without limitation the
  * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
  * sell copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
+ *
 @@ -63,27 +63,27 @@ void	xenconscn_attach(void);
 void	xenprivcmd_init(void);
 void	xbdback_init(void);
 void	xennetback_init(void);
 void	xen_shm_init(void);
 void	xenevt_event(int);
 void	xenevt_setipending(int, int);
 void	xenevt_notify(void);
 void	idle_block(void);
 /* xen_machdep.c */
-void	sysctl_xen_sleepstate_setup(void);
+void	sysctl_xen_suspend_setup(void);
 #if defined(XENDEBUG) || 1 /* XXX */
 #include <sys/stdarg.h>
 void printk(const char *, ...);
 void vprintk(const char *, va_list);
 #endif
 #endif
 #endif /* _XEN_H */
 /******************************************************************************

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hypervisor_machdep.c,v 1.11.8.9 2011/08/27 15:44:09 jym Exp $	*/
+/*	$NetBSD: hypervisor_machdep.c,v 1.11.8.10 2011/08/27 15:56:48 jym Exp $	*/
 /*
+ *
  * Copyright (c) 2004 Christian Limpach.
  * 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
 @@ -44,27 +44,27 @@
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.11.8.9 2011/08/27 15:44:09 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.11.8.10 2011/08/27 15:56:48 jym Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <uvm/uvm_extern.h>
 #include <machine/vmparam.h>
 #include <machine/pmap.h>
 #include <xen/xen.h>
 #include <xen/hypervisor.h>
 #include <xen/evtchn.h>
 @@ -373,27 +373,27 @@ hypervisor_set_ipending(struct cpu_info
 	ipl--;
 	KASSERT(ipl < NIPL);
 	KASSERT(ci->ci_isources[ipl] != NULL);
 	ci->ci_isources[ipl]->ipl_evt_mask1 |= 1UL << l1;
 	ci->ci_isources[ipl]->ipl_evt_mask2[l1] |= 1UL << l2;
+}
 void
 hypervisor_machdep_attach(void)
+{
  	/* dom0 does not require the arch-dependent P2M translation table */
 	if (!xendomain_is_dom0()) {
 		build_p2m_frame_list_list();
-		sysctl_xen_sleepstate_setup();
+		sysctl_xen_suspend_setup();
+	}
+}
 void
 hypervisor_machdep_resume(void)
+{
 	/* dom0 does not require the arch-dependent P2M translation table */
 	if (!xendomain_is_dom0())
 		update_p2m_frame_list_list();
+}
 /*
  * Generate the p2m_frame_list_list table,

 @@ -1,14 +1,14 @@
-/*	$Id: shutdown_xenbus.c,v 1.5.8.3 2009/11/01 21:43:28 jym Exp $	*/
+/*	$Id: shutdown_xenbus.c,v 1.5.8.4 2011/08/27 15:56:48 jym Exp $	*/
 /*-
  * Copyright (c)2006 YAMAMOTO Takashi,
  * 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
  *    documentation and/or other materials provided with the distribution.
 @@ -46,27 +46,27 @@
  * 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.
+ *
  */
 /*
  * watch "control/shutdown" and generate sysmon events.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shutdown_xenbus.c,v 1.5.8.3 2009/11/01 21:43:28 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shutdown_xenbus.c,v 1.5.8.4 2011/08/27 15:56:48 jym Exp $");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <xen/xenbus.h>
 #include <xen/shutdown_xenbus.h>
 #define	SHUTDOWN_PATH	"control"
 #define	SHUTDOWN_NAME	"shutdown"
 static struct sysmon_pswitch xenbus_power = {
 @@ -120,39 +120,41 @@ again:
 		free(reqstr, M_DEVBUF);
 		goto again;
+	}
 	if (error != 0) {
 		printf("%s: xenbus_transaction_end 2 %d\n", __func__, error);
+	}
 	if (strcmp(reqstr, "poweroff") == 0) {
 		sysmon_pswitch_event(&xenbus_power, PSWITCH_EVENT_PRESSED);
 	} else if (strcmp(reqstr, "halt") == 0) { /* XXX eventually halt without -p */
 		sysmon_pswitch_event(&xenbus_power, PSWITCH_EVENT_PRESSED);
 	} else if (strcmp(reqstr, "reboot") == 0) {
 		sysmon_pswitch_event(&xenbus_reset, PSWITCH_EVENT_PRESSED);
 	} else if (strcmp(reqstr, "suspend") == 0) {
 		xen_suspend_allow = true;
 		sysmon_pswitch_event(&xenbus_sleep, PSWITCH_EVENT_PRESSED);
 	} else {
 		printf("ignore shutdown request: %s\n", reqstr);
+	}
 	free(reqstr, M_DEVBUF);
+}
 static struct xenbus_watch xenbus_shutdown_watch = {
 	.node = __UNCONST(SHUTDOWN_PATH "/" SHUTDOWN_NAME), /* XXX */
 	.xbw_callback = xenbus_shutdown_handler,
 };
 void
 shutdown_xenbus_setup(void)
+{
 	xen_suspend_allow = false;
 	if (sysmon_pswitch_register(&xenbus_power) != 0 ||
 	    sysmon_pswitch_register(&xenbus_reset) != 0 ||
 	    sysmon_pswitch_register(&xenbus_sleep) != 0) {
 		aprint_error("%s: unable to register with sysmon\n", __func__);
 		return;
+	}
 	if (register_xenbus_watch(&xenbus_shutdown_watch)) {
 		aprint_error("%s: unable to watch control/shutdown\n", __func__);
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xen_machdep.c,v 1.4.12.9 2011/08/24 21:37:05 jym Exp $	*/
+/*	$NetBSD: xen_machdep.c,v 1.4.12.10 2011/08/27 15:56:48 jym Exp $	*/
 /*
  * Copyright (c) 2006 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,51 +43,52 @@
  * 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_machdep.c,v 1.4.12.9 2011/08/24 21:37:05 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.4.12.10 2011/08/27 15:56:48 jym Exp $");
 #include "opt_xen.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/boot_flag.h>
 #include <sys/mount.h>
 #include <sys/reboot.h>
 #include <sys/timetc.h>
 #include <sys/sysctl.h>
 #include <sys/pmf.h>
 #include <xen/hypervisor.h>
 #include <xen/shutdown_xenbus.h>
 #define DPRINTK(x) printk x
 #if 0
 #define DPRINTK(x)
 #endif
 u_int	tsc_get_timecount(struct timecounter *);
 uint64_t tsc_freq;	/* XXX */
-static int sysctl_xen_sleepstate(SYSCTLFN_ARGS);
+static int sysctl_xen_suspend(SYSCTLFN_ARGS);
 static void xen_suspend_domain(void);
 static void xen_prepare_suspend(void);
 static void xen_prepare_resume(void);
 void
 xen_parse_cmdline(int what, union xen_cmdline_parseinfo *xcp)
+{
 	char _cmd_line[256], *cmd_line, *opt, *s;
 	int b, i, ipidx = 0;
 	uint32_t xi_ip[5];
 	size_t len;
 	len = strlcpy(_cmd_line, xen_start_info.cmd_line, sizeof(_cmd_line));
 @@ -212,82 +213,86 @@ xen_parse_cmdline(int what, union xen_cm
 u_int
 tsc_get_timecount(struct timecounter *tc)
+{
 	panic("xen: tsc_get_timecount");
+}
 /*
  * this function sets up the machdep.xen.suspend sysctl(7) that
  * controls domain suspend/save.
  */
 void
-sysctl_xen_sleepstate_setup(void)
+sysctl_xen_suspend_setup(void)
+{
 	const struct sysctlnode *node = NULL;
 	/*
 	 * dom0 implements sleep support through ACPI. It should not call this
 	 * this function to register a suspend interface.
 	 */
 	KASSERT(!(xendomain_is_dom0()));
-	sysctl_createv(clog, 0, NULL, &node,
+	sysctl_createv(NULL, 0, NULL, &node,
 	    CTLFLAG_PERMANENT,
 	    CTLTYPE_NODE, "machdep", NULL,
 	    NULL, 0, NULL, 0,
 	    CTL_MACHDEP, CTL_EOL);
-	sysctl_createv(clog, 0, &node, &node,
+	sysctl_createv(NULL, 0, &node, &node,
 	    CTLFLAG_PERMANENT,
 	    CTLTYPE_NODE, "xen",
 	    SYSCTL_DESCR("Xen top level node"),
 	    NULL, 0, NULL, 0,
 	    CTL_CREATE, CTL_EOL);
-	sysctl_createv(clog, 0, &node, &node,
+	sysctl_createv(NULL, 0, &node, &node,
 	    CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
 	    CTLTYPE_INT, "suspend",
-	    SYSCTL_DESCR("Suspend/save control of current Xen domain"),
+	    SYSCTL_DESCR("Suspend/save current Xen domain"),
-	    NULL, sysctl_xen_sleepstate, 0, NULL, 0,
+	    sysctl_xen_suspend, 0, NULL, 0,
 	    CTL_CREATE, CTL_EOL);
+}
 static int
-sysctl_xen_sleepstate(SYSCTLFN_ARGS) {
+sysctl_xen_suspend(SYSCTLFN_ARGS)
+{
 	int error, t;
 	struct sysctlnode node;
 	node = *rnode;
 	node.sysctl_data = &t;
 	error = sysctl_lookup(SYSCTLFN_CALL(&node));
 	if (error || newp == NULL)
 		return error;
 	/* only allow domain to suspend when dom0 instructed to do so */
 	if (xen_suspend_allow == false)
 		return EAGAIN;
 	xen_suspend_domain();
 	return 0;
+}
 /*
  * Last operations before suspending domain
  */
 static void
-xen_prepare_suspend(void) {
+xen_prepare_suspend(void)
+{
 	kpreempt_disable();
 	/*
 	 * Xen lazy evaluation of recursive mappings requires
 	 * to flush the APDP entries
 	 */
 	pmap_unmap_all_apdp_pdes();
 #ifdef PAE
 	pmap_unmap_recursive_entries();
 #endif
 	xen_suspendclocks();
 @@ -305,61 +310,63 @@ xen_prepare_suspend(void) {
 	/* invalidate the shared_info page */
 	if (HYPERVISOR_update_va_mapping((vaddr_t)HYPERVISOR_shared_info,
 , UVMF_INVLPG)) {
 		DPRINTK(("HYPERVISOR_shared_info page invalidation failed"));
 		HYPERVISOR_crash();
+	}
+}
 /*
  * First operations before restoring domain context
  */
 static void
-xen_prepare_resume(void) {
+xen_prepare_resume(void)
+{
 	/* map the new shared_info page */
 	if (HYPERVISOR_update_va_mapping((vaddr_t)HYPERVISOR_shared_info,
 	    xen_start_info.shared_info | PG_RW | PG_V,
 	    UVMF_INVLPG)) {
 		DPRINTK(("could not map new shared info page"));
 		HYPERVISOR_crash();
+	}
 #ifdef PAE
 	pmap_map_recursive_entries();
 #endif
 	if (xen_start_info.nr_pages != physmem) {
 		/*
 		 * XXX JYM for now, we crash - fix it with memory
 		 * hotplug when supported
 		 */
 		DPRINTK(("xen_start_info.nr_pages != physmem"));
 		HYPERVISOR_crash();
+	}
 	DPRINTK(("preparing domain resume\n"));
 	aprint_verbose("preparing domain resume\n");
 	xen_suspend_allow = false;
 	xen_resumeclocks();
 	kpreempt_enable();
+}
 static void
-xen_suspend_domain(void) {
+xen_suspend_domain(void)
+{
 	paddr_t mfn;
 	int s = splvm();
 	/*
 	 * console becomes unavailable when suspended, so
 	 * direct communications to domain are hampered from there on.
 	 * We can only rely on low level primitives like printk(), until
 	 * console is fully restored
 	 */
 	if (!pmf_system_suspend(PMF_Q_NONE)) {
 		DPRINTK(("devices suspend failed"));
 		HYPERVISOR_crash();
+	}