Module Name: src
Committed By: bouyer
Date: Sun Sep 21 12:46:15 UTC 2014
Modified Files:
src/sys/arch/xen/x86: hypervisor_machdep.c
src/sys/arch/xen/xen: clock.c xbdback_xenbus.c
src/sys/arch/xen/xenbus: xenbus_client.c
Log Message:
Make Xen kernels compile without DIAGNOSTIC
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/xen/x86/hypervisor_machdep.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/xen/xen/clock.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/xen/xen/xbdback_xenbus.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/xenbus/xenbus_client.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.27 src/sys/arch/xen/x86/hypervisor_machdep.c:1.28
--- src/sys/arch/xen/x86/hypervisor_machdep.c:1.27 Sun Jan 13 21:01:05 2013
+++ src/sys/arch/xen/x86/hypervisor_machdep.c Sun Sep 21 12:46:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor_machdep.c,v 1.27 2013/01/13 21:01:05 bouyer Exp $ */
+/* $NetBSD: hypervisor_machdep.c,v 1.28 2014/09/21 12:46:15 bouyer Exp $ */
/*
*
@@ -54,7 +54,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.27 2013/01/13 21:01:05 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.28 2014/09/21 12:46:15 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -253,7 +253,7 @@ do_hypervisor_callback(struct intrframe
volatile shared_info_t *s = HYPERVISOR_shared_info;
struct cpu_info *ci;
volatile struct vcpu_info *vci;
- int level;
+ int level __diagused;
ci = curcpu();
vci = ci->ci_vcpu;
Index: src/sys/arch/xen/xen/clock.c
diff -u src/sys/arch/xen/xen/clock.c:1.62 src/sys/arch/xen/xen/clock.c:1.63
--- src/sys/arch/xen/xen/clock.c:1.62 Fri Feb 17 19:00:45 2012
+++ src/sys/arch/xen/xen/clock.c Sun Sep 21 12:46:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.62 2012/02/17 19:00:45 bouyer Exp $ */
+/* $NetBSD: clock.c,v 1.63 2014/09/21 12:46:15 bouyer Exp $ */
/*
*
@@ -29,7 +29,7 @@
#include "opt_xen.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.62 2012/02/17 19:00:45 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.63 2014/09/21 12:46:15 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -419,7 +419,7 @@ static struct evcnt hardclock_called[MAX
void
xen_initclocks(void)
{
- int err;
+ int err __diagused;
static bool tcdone = false;
struct cpu_info *ci = curcpu();
Index: src/sys/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.59 src/sys/arch/xen/xen/xbdback_xenbus.c:1.60
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.59 Wed Nov 6 06:23:15 2013
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Sun Sep 21 12:46:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.59 2013/11/06 06:23:15 mrg Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.60 2014/09/21 12:46:15 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.59 2013/11/06 06:23:15 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.60 2014/09/21 12:46:15 bouyer Exp $");
#include <sys/atomic.h>
#include <sys/buf.h>
@@ -1623,7 +1623,7 @@ xbdback_iodone(struct buf *bp)
while(!SLIST_EMPTY(&xbd_io->xio_rq)) {
struct xbdback_fragment *xbd_fr;
struct xbdback_request *xbd_req;
- struct xbdback_instance *rxbdi;
+ struct xbdback_instance *rxbdi __diagused;
int error;
xbd_fr = SLIST_FIRST(&xbd_io->xio_rq);
Index: src/sys/arch/xen/xenbus/xenbus_client.c
diff -u src/sys/arch/xen/xenbus/xenbus_client.c:1.12 src/sys/arch/xen/xenbus/xenbus_client.c:1.13
--- src/sys/arch/xen/xenbus/xenbus_client.c:1.12 Thu Mar 27 18:22:56 2014
+++ src/sys/arch/xen/xenbus/xenbus_client.c Sun Sep 21 12:46:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_client.c,v 1.12 2014/03/27 18:22:56 christos Exp $ */
+/* $NetBSD: xenbus_client.c,v 1.13 2014/09/21 12:46:15 bouyer Exp $ */
/******************************************************************************
* Client-facing interface for the Xenbus driver. In other words, the
* interface between the Xenbus and the device-specific code, be it the
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_client.c,v 1.12 2014/03/27 18:22:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_client.c,v 1.13 2014/09/21 12:46:15 bouyer Exp $");
#if 0
#define DPRINTK(fmt, args...) \
@@ -159,7 +159,7 @@ static void
_dev_error(struct xenbus_device *dev, int err, const char *fmt,
va_list ap)
{
- int ret;
+ int ret __diagused;
unsigned int len;
char *printf_buffer = NULL, *path_buffer = NULL;
