Module Name: src
Committed By: jym
Date: Sat May 7 17:39:47 UTC 2011
Modified Files:
src/sys/arch/xen/x86 [jym-xensuspend]: hypervisor_machdep.c
src/sys/arch/xen/xen [jym-xensuspend]: hypervisor.c xencons.c
src/sys/arch/xen/xenbus [jym-xensuspend]: xenbus_probe.c
Log Message:
KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.11.8.7 -r1.11.8.8 src/sys/arch/xen/x86/hypervisor_machdep.c
cvs rdiff -u -r1.43.2.6 -r1.43.2.7 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -u -r1.31.2.8 -r1.31.2.9 src/sys/arch/xen/xen/xencons.c
cvs rdiff -u -r1.27.2.7 -r1.27.2.8 src/sys/arch/xen/xenbus/xenbus_probe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/x86/hypervisor_machdep.c
diff -u src/sys/arch/xen/x86/hypervisor_machdep.c:1.11.8.7 src/sys/arch/xen/x86/hypervisor_machdep.c:1.11.8.8
--- src/sys/arch/xen/x86/hypervisor_machdep.c:1.11.8.7 Mon May 2 22:49:58 2011
+++ src/sys/arch/xen/x86/hypervisor_machdep.c Sat May 7 17:39:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor_machdep.c,v 1.11.8.7 2011/05/02 22:49:58 jym Exp $ */
+/* $NetBSD: hypervisor_machdep.c,v 1.11.8.8 2011/05/07 17:39:47 jym Exp $ */
/*
*
@@ -54,7 +54,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.11.8.7 2011/05/02 22:49:58 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.11.8.8 2011/05/07 17:39:47 jym Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -360,7 +360,7 @@
hypervisor_machdep_attach(void)
{
/* dom0 does not require the arch-dependent P2M translation table */
- if ( !xendomain_is_dom0() ) {
+ if (!xendomain_is_dom0()) {
build_p2m_frame_list_list();
sysctl_xen_sleepstate_setup();
}
@@ -370,7 +370,7 @@
hypervisor_machdep_resume(void)
{
/* dom0 does not require the arch-dependent P2M translation table */
- if ( !(xen_start_info.flags & SIF_INITDOMAIN) )
+ if (!xendomain_is_dom0())
update_p2m_frame_list_list();
}
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.43.2.6 src/sys/arch/xen/xen/hypervisor.c:1.43.2.7
--- src/sys/arch/xen/xen/hypervisor.c:1.43.2.6 Mon May 2 22:49:59 2011
+++ src/sys/arch/xen/xen/hypervisor.c Sat May 7 17:39:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.43.2.6 2011/05/02 22:49:59 jym Exp $ */
+/* $NetBSD: hypervisor.c,v 1.43.2.7 2011/05/07 17:39:47 jym Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.43.2.6 2011/05/02 22:49:59 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.43.2.7 2011/05/07 17:39:47 jym Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -304,8 +304,8 @@
}
static bool
-hypervisor_suspend(device_t dev, const pmf_qual_t *qual) {
-
+hypervisor_suspend(device_t dev, const pmf_qual_t *qual)
+{
events_suspend();
xengnt_suspend();
@@ -313,8 +313,8 @@
}
static bool
-hypervisor_resume(device_t dev, const pmf_qual_t *qual) {
-
+hypervisor_resume(device_t dev, const pmf_qual_t *qual)
+{
hypervisor_machdep_resume();
xengnt_resume();
Index: src/sys/arch/xen/xen/xencons.c
diff -u src/sys/arch/xen/xen/xencons.c:1.31.2.8 src/sys/arch/xen/xen/xencons.c:1.31.2.9
--- src/sys/arch/xen/xen/xencons.c:1.31.2.8 Mon May 2 22:49:59 2011
+++ src/sys/arch/xen/xen/xencons.c Sat May 7 17:39:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xencons.c,v 1.31.2.8 2011/05/02 22:49:59 jym Exp $ */
+/* $NetBSD: xencons.c,v 1.31.2.9 2011/05/07 17:39:47 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.31.2.8 2011/05/02 22:49:59 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.31.2.9 2011/05/07 17:39:47 jym Exp $");
#include "opt_xen.h"
@@ -217,7 +217,6 @@
aprint_verbose_dev(dev, "removed event channel %d\n", evtch);
}
-
return true;
}
Index: src/sys/arch/xen/xenbus/xenbus_probe.c
diff -u src/sys/arch/xen/xenbus/xenbus_probe.c:1.27.2.7 src/sys/arch/xen/xenbus/xenbus_probe.c:1.27.2.8
--- src/sys/arch/xen/xenbus/xenbus_probe.c:1.27.2.7 Mon May 2 22:49:59 2011
+++ src/sys/arch/xen/xenbus/xenbus_probe.c Sat May 7 17:39:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.27.2.7 2011/05/02 22:49:59 jym Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.27.2.8 2011/05/07 17:39:47 jym Exp $ */
/******************************************************************************
* Talks to Xen Store to figure out what devices we have.
*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.27.2.7 2011/05/02 22:49:59 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.27.2.8 2011/05/07 17:39:47 jym Exp $");
#if 0
#define DPRINTK(fmt, args...) \
@@ -122,8 +122,8 @@
}
static bool
-xenbus_suspend(device_t dev, const pmf_qual_t *qual) {
-
+xenbus_suspend(device_t dev, const pmf_qual_t *qual)
+{
xs_suspend();
xb_suspend_comms(dev);
@@ -131,8 +131,8 @@
}
static bool
-xenbus_resume(device_t dev, const pmf_qual_t *qual) {
-
+xenbus_resume(device_t dev, const pmf_qual_t *qual)
+{
xb_init_comms(dev);
xs_resume();
