 @@ -1,14 +1,14 @@
-/*	$NetBSD: evtchn.h,v 1.16 2008/07/01 18:49:21 bouyer Exp $	*/
+/*	$NetBSD: evtchn.h,v 1.17 2008/10/24 21:09:24 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
 @@ -29,42 +29,42 @@
  * 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_EVENTS_H_
 #define _XEN_EVENTS_H_
 #define NR_PIRQS	256
 extern struct evtsource *evtsource[];
 void events_default_setup(void);
-void init_events(void);
+void events_init(void);
 unsigned int evtchn_do_event(int, struct intrframe *);
 void call_evtchn_do_event(int, struct intrframe *);
 void call_xenevt_event(int);
 int event_set_handler(int, int (*func)(void *), void *, int, const char *);
 int event_remove_handler(int, int (*func)(void *), void *);
 struct intrhand;
 void event_set_iplhandler(struct intrhand *, int);
 extern int debug_port;
 extern int xen_debug_handler(void *);
 int bind_virq_to_evtch(int);
 int bind_pirq_to_evtch(int);
-void unbind_pirq_from_evtch(int);
+int unbind_pirq_from_evtch(int);
-void unbind_virq_from_evtch(int);
+int unbind_virq_from_evtch(int);
 struct pintrhand {
 	int pirq;
 	int evtch;
 	int (*func)(void *);
 	void *arg;
 };
 struct pintrhand *pirq_establish(int, int, int (*)(void *), void *, int,
      const char *);
 #endif /*  _XEN_EVENTS_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: xenbus.h,v 1.9 2008/04/16 18:41:48 cegger Exp $ */
+/* $NetBSD: xenbus.h,v 1.10 2008/10/24 21:09:24 jym Exp $ */
 /******************************************************************************
  * xenbus.h
+ *
  * Talks to Xen Store to figure out what devices we have.
+ *
  * Copyright (C) 2005 Rusty Russell, IBM Corporation
  * Copyright (C) 2005 XenSource Ltd.
+ *
  * This file may be distributed separately from the Linux kernel, or
  * incorporated into other software packages, subject to the following license:
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this source file (the "Software"), to deal in the Software without
 @@ -149,30 +149,26 @@ int xenbus_gather(struct xenbus_transact
 /* notifer routines for when the xenstore comes up */
 // XXX int register_xenstore_notifier(struct notifier_block *nb);
 // XXX void unregister_xenstore_notifier(struct notifier_block *nb);
 int register_xenbus_watch(struct xenbus_watch *watch);
 void unregister_xenbus_watch(struct xenbus_watch *watch);
 void xs_suspend(void);
 void xs_resume(void);
 /* Used by xenbus_dev to borrow kernel's store connection. */
 int xenbus_dev_request_and_reply(struct xsd_sockmsg *msg, void **);
 /* Called from xen core code. */
 void xenbus_suspend(void);
 void xenbus_resume(void);
 void xenbus_probe(void *);
 int xenbus_free_device(struct xenbus_device *);
 #define XENBUS_IS_ERR_READ(str) ({			\
 	if (!IS_ERR(str) && strlen(str) == 0) {		\
 		kfree(str);				\
 		str = ERR_PTR(-ERANGE);			\
 	}						\
 	IS_ERR(str);					\
 })
 #define XENBUS_EXIST_ERR(err) ((err) == -ENOENT || (err) == -ERANGE)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_xpmap.c,v 1.10 2008/10/21 15:46:32 cegger Exp $	*/
+/*	$NetBSD: x86_xpmap.c,v 1.11 2008/10/24 21:09:24 jym Exp $	*/
 /*
  * Copyright (c) 2006 Mathieu Ropert <mro@adviseo.fr>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 @@ -69,27 +69,27 @@
  * 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: x86_xpmap.c,v 1.10 2008/10/21 15:46:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.11 2008/10/24 21:09:24 jym Exp $");
 #include "opt_xen.h"
 #include "opt_ddb.h"
 #include "ksyms.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm.h>
 #include <machine/pmap.h>
 #include <machine/gdt.h>
 #include <xen/xenfunc.h>
 @@ -113,27 +113,28 @@ static char XBUF[256];
 #define	XENPRINTK2(x)
 #endif
 #define	PRINTF(x) printf x
 #define	PRINTK(x) printk x
 /* on x86_64 kernel runs in ring 3 */
 #ifdef __x86_64__
 #define PG_k PG_u
 #else
 #define PG_k 0
 #endif
 volatile shared_info_t *HYPERVISOR_shared_info;
-union start_info_union start_info_union;
+/* Xen requires the start_info struct to be page aligned */
 union start_info_union start_info_union __aligned(PAGE_SIZE);
 unsigned long *xpmap_phys_to_machine_mapping;
 void xen_failsafe_handler(void);
 #ifdef XEN3
 #define HYPERVISOR_mmu_update_self(req, count, success_count) \
 	HYPERVISOR_mmu_update((req), (count), (success_count), DOMID_SELF)
 #else
 #define HYPERVISOR_mmu_update_self(req, count, success_count) \
 	HYPERVISOR_mmu_update((req), (count), (success_count))
 #endif
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: evtchn.c,v 1.38 2008/05/24 15:09:34 bouyer Exp $	*/
+/*	$NetBSD: evtchn.c,v 1.39 2008/10/24 21:09:24 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -54,27 +54,27 @@
  * 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: evtchn.c,v 1.38 2008/05/24 15:09:34 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.39 2008/10/24 21:09:24 jym Exp $");
 #include "opt_xen.h"
 #include "isa.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
 #include <sys/simplelock.h>
 @@ -164,27 +164,27 @@ events_default_setup(void)
 		pirq_needs_unmask_notify[i] = 0;
 #endif
 	/* No event-channel are 'live' right now. */
 	for (i = 0; i < NR_EVENT_CHANNELS; i++) {
 		evtsource[i] = NULL;
 		evtch_bindcount[i] = 0;
 		hypervisor_mask_event(i);
+	}
+}
 void
-init_events(void)
+events_init(void)
+{
 #ifndef XEN3
 	int evtch;
 	evtch = bind_virq_to_evtch(VIRQ_MISDIRECT);
 	aprint_verbose("misdirect virtual interrupt using event channel %d\n",
 	    evtch);
 	event_set_handler(evtch, &xen_misdirect_handler, NULL, IPL_HIGH,
 	    "misdirev");
 	hypervisor_enable_event(evtch);
 	/* This needs to be done early, but after the IRQ subsystem is
 	 * alive. */
 @@ -336,50 +336,52 @@ bind_virq_to_evtch(int virq)
 		evtchn = op.u.bind_virq.port;
 		virq_to_evtch[virq] = evtchn;
+	}
 	evtch_bindcount[evtchn]++;
 	simple_unlock(&irq_mapping_update_lock);
 	splx(s);
 	return evtchn;
+}
-void
+int
 unbind_virq_from_evtch(int virq)
+{
 	evtchn_op_t op;
 	int evtchn = virq_to_evtch[virq];
 	int s = splhigh();
 	simple_lock(&irq_mapping_update_lock);
 	evtch_bindcount[evtchn]--;
 	if (evtch_bindcount[evtchn] == 0) {
 		op.cmd = EVTCHNOP_close;
 #ifndef XEN3
 		op.u.close.dom = DOMID_SELF;
 #endif
 		op.u.close.port = evtchn;
 		if (HYPERVISOR_event_channel_op(&op) != 0)
 			panic("Failed to unbind virtual IRQ %d\n", virq);
 		virq_to_evtch[virq] = -1;
+	}
 	simple_unlock(&irq_mapping_update_lock);
 	splx(s);
 	return evtchn;
+}
 #if NPCI > 0 || NISA > 0
 int
 bind_pirq_to_evtch(int pirq)
+{
 	evtchn_op_t op;
 	int evtchn, s;
 	if (pirq >= NR_PIRQS) {
 		panic("pirq %d out of bound, increase NR_PIRQS", pirq);
+	}
 @@ -399,50 +401,52 @@ bind_pirq_to_evtch(int pirq)
 		printf("pirq %d evtchn %d\n", pirq, evtchn);
 #endif
 		pirq_to_evtch[pirq] = evtchn;
+	}
 	evtch_bindcount[evtchn]++;
 	simple_unlock(&irq_mapping_update_lock);
 	splx(s);
 	return evtchn;
+}
-void
+int
 unbind_pirq_from_evtch(int pirq)
+{
 	evtchn_op_t op;
 	int evtchn = pirq_to_evtch[pirq];
 	int s = splhigh();
 	simple_lock(&irq_mapping_update_lock);
 	evtch_bindcount[evtchn]--;
 	if (evtch_bindcount[evtchn] == 0) {
 		op.cmd = EVTCHNOP_close;
 #ifndef XEN3
 		op.u.close.dom = DOMID_SELF;
 #endif
 		op.u.close.port = evtchn;
 		if (HYPERVISOR_event_channel_op(&op) != 0)
 			panic("Failed to unbind physical IRQ %d\n", pirq);
 		pirq_to_evtch[pirq] = -1;
+	}
 	simple_unlock(&irq_mapping_update_lock);
 	splx(s);
 	return evtchn;
+}
 struct pintrhand *
 pirq_establish(int pirq, int evtch, int (*func)(void *), void *arg, int level,
     const char *evname)
+{
 	struct pintrhand *ih;
 	physdev_op_t physdev_op;
 	ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK);
 	if (ih == NULL) {
 		printf("pirq_establish: can't malloc handler info\n");
 		return NULL;

 @@ -1,14 +1,14 @@
-/* $NetBSD: hypervisor.c,v 1.41 2008/10/24 18:02:58 jym Exp $ */
+/* $NetBSD: hypervisor.c,v 1.42 2008/10/24 21:09:24 jym 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -53,27 +53,27 @@
  * 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.41 2008/10/24 18:02:58 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.42 2008/10/24 21:09:24 jym Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #ifndef XEN3
 #include <dev/sysmon/sysmonvar.h>
 #endif
 #include "xenbus.h"
 #include "xencons.h"
 #include "xennet_hypervisor.h"
 @@ -256,27 +256,27 @@ hypervisor_attach(device_t parent, devic
 	xengnt_init();
 	memset(&hac.hac_vcaa, 0, sizeof(hac.hac_vcaa));
 	hac.hac_vcaa.vcaa_name = "vcpu";
 	hac.hac_vcaa.vcaa_caa.cpu_number = 0;
 	hac.hac_vcaa.vcaa_caa.cpu_role = CPU_ROLE_SP;
 	hac.hac_vcaa.vcaa_caa.cpu_func = 0;
 	config_found_ia(self, "xendevbus", &hac.hac_vcaa, hypervisor_print);
 #else
 	aprint_normal("\n");
 #endif
-	init_events();
+	events_init();
 #if NXENBUS > 0
 	hac.hac_xenbus.xa_device = "xenbus";
 	config_found_ia(self, "xendevbus", &hac.hac_xenbus, hypervisor_print);
 #endif
 #if NXENCONS > 0
 	hac.hac_xencons.xa_device = "xencons";
 	config_found_ia(self, "xendevbus", &hac.hac_xencons, hypervisor_print);
 #endif
 #if NXENNET_HYPERVISOR > 0
 	hac.hac_xennet.xa_device = "xennet";
 	xennet_scan(self, &hac.hac_xennet, hypervisor_print);
 #endif

 @@ -1,14 +1,14 @@
-/*      $NetBSD: xbd_xenbus.c,v 1.31 2008/10/24 18:02:58 jym Exp $      */
+/*      $NetBSD: xbd_xenbus.c,v 1.32 2008/10/24 21:09:24 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,52 +21,53 @@
  * 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: xbd_xenbus.c,v 1.31 2008/10/24 18:02:58 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.32 2008/10/24 21:09:24 jym Exp $");
 #include "opt_xen.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 #include <dev/dkvar.h>
 #include <uvm/uvm.h>
 #include <xen/xen3-public/io/ring.h>
 #include <xen/xen3-public/io/blkif.h>
 #include <xen/xen3-public/io/protocols.h>
 #include <xen/granttables.h>
 #include <xen/xenbus.h>
 #include "locators.h"
 #undef XBD_DEBUG
 #ifdef XBD_DEBUG
 #define DPRINTF(x) printf x;
 #else
 #define DPRINTF(x)
 #endif
 #define GRANT_INVALID_REF -1
 @@ -276,26 +277,27 @@ xbd_xenbus_detach(device_t dev, int flag
 		dkwedge_delall(&sc->sc_dksc.sc_dkdev);
 		s = splbio();
 		/* Kill off any queued buffers. */
 		bufq_drain(sc->sc_dksc.sc_bufq);
 		bufq_free(sc->sc_dksc.sc_bufq);
 		splx(s);
 		/* detach disk */
 		disk_detach(&sc->sc_dksc.sc_dkdev);
 		disk_destroy(&sc->sc_dksc.sc_dkdev);
+	}
 	hypervisor_mask_event(sc->sc_evtchn);
 	event_remove_handler(sc->sc_evtchn, &xbd_handler, sc);
 	while (xengnt_status(sc->sc_ring_gntref)) {
 		tsleep(xbd_xenbus_detach, PRIBIO, "xbd_ref", hz/2);
+	}
 	xengnt_revoke_access(sc->sc_ring_gntref);
 	uvm_km_free(kernel_map, (vaddr_t)sc->sc_ring.sring,
 	    PAGE_SIZE, UVM_KMF_WIRED);
 	return 0;
+}
 static int
 xbd_xenbus_resume(void *p)
+{
 @@ -336,26 +338,32 @@ again:
 		return ENOMEM;
 	error = xenbus_printf(xbt, sc->sc_xbusd->xbusd_path,
 	    "ring-ref","%u", sc->sc_ring_gntref);
 	if (error) {
 		errmsg = "writing ring-ref";
 		goto abort_transaction;
+	}
 	error = xenbus_printf(xbt, sc->sc_xbusd->xbusd_path,
 	    "event-channel", "%u", sc->sc_evtchn);
 	if (error) {
 		errmsg = "writing event channel";
 		goto abort_transaction;
+	}
 	error = xenbus_printf(xbt, sc->sc_xbusd->xbusd_path,
 	    "protocol", "%s", XEN_IO_PROTO_ABI_NATIVE);
 	if (error) {
 		errmsg = "writing protocol";
 		goto abort_transaction;
+	}
 	error = xenbus_switch_state(sc->sc_xbusd, xbt, XenbusStateInitialised);
 	if (error) {
 		errmsg = "writing frontend XenbusStateInitialised";
 		goto abort_transaction;
+	}
 	error = xenbus_transaction_end(xbt, 0);
 	if (error == EAGAIN)
 		goto again;
 	if (error) {
 		xenbus_dev_fatal(sc->sc_xbusd, error, "completing transaction");
 		return -1;
+	}
 	return 0;

 @@ -1,14 +1,14 @@
-/* $NetBSD: xenbus_comms.h,v 1.4 2008/04/16 18:41:48 cegger Exp $ */
+/* $NetBSD: xenbus_comms.h,v 1.5 2008/10/24 21:09:24 jym Exp $ */
 /*
  * Private include for xenbus communications.
+ *
  * Copyright (C) 2005 Rusty Russell, IBM Corporation
+ *
  * This file may be distributed separately from the Linux kernel, or
  * incorporated into other software packages, subject to the following license:
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this source file (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
 @@ -20,27 +20,27 @@
  * 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.
  */
 #ifndef _XENBUS_COMMS_H
 #define _XENBUS_COMMS_H
 void xenbus_kernfs_init(void);
-int xs_init(void);
+int xs_init(device_t dev);
 int xb_init_comms(device_t dev);
 /* Low level routines. */
 int xb_write(const void *data, unsigned len);
 int xb_read(void *data, unsigned len);
 int xs_input_avail(void);
 extern struct xenstore_domain_interface *xenstore_interface;
 #endif /* _XENBUS_COMMS_H */
 /*
  * Local variables:

 @@ -1,14 +1,14 @@
-/* $NetBSD: xenbus_probe.c,v 1.24 2008/10/21 21:55:44 cegger Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.25 2008/10/24 21:09:24 jym Exp $ */
 /******************************************************************************
  * Talks to Xen Store to figure out what devices we have.
+ *
  * Copyright (C) 2005 Rusty Russell, IBM Corporation
  * Copyright (C) 2005 Mike Wray, Hewlett-Packard
  * Copyright (C) 2005 XenSource Ltd
+ *
  * This file may be distributed separately from the Linux kernel, or
  * incorporated into other software packages, subject to the following license:
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this source file (the "Software"), to deal in the Software without
  * restriction, including without limitation the rights to use, copy, modify,
 @@ -19,27 +19,27 @@
  * The above copyright notice and this permission notice shall be included in
  * 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: xenbus_probe.c,v 1.24 2008/10/21 21:55:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.25 2008/10/24 21:09:24 jym Exp $");
 #if 0
 #define DPRINTK(fmt, args...) \
     printf("xenbus_probe (%s:%d) " fmt ".\n", __func__, __LINE__, ##args)
 #else
 #define DPRINTK(fmt, args...) ((void)0)
 #endif
 #include <sys/types.h>
 #include <sys/null.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 @@ -556,27 +556,27 @@ xenbus_probe_init(void *unused)
 		/* And finally publish the above info in /kern/xen */
 		xenbus_kernfs_init();
 		DELAY(1000);
 #else /* DOM0OPS */
 		kthread_exit(0); /* can't get a working xenstore in this case */
 #endif /* DOM0OPS */
+	}
 	/* register event handler */
 	xb_init_comms(xenbus_dev);
 	/* Initialize the interface to xenstore. */
-	err = xs_init();
+	err = xs_init(xenbus_dev);
 	if (err) {
 		aprint_error_dev(xenbus_dev,
 				"Error initializing xenstore comms: %i\n", err);
 		goto err0;
+	}
 	if (!dom0) {
 		xenstored_ready = 1;
 		xenbus_probe(NULL);
+	}
 	DPRINTK("done");
 	config_pending_decr();

 @@ -1,14 +1,14 @@
-/* $NetBSD: xenbus_xs.c,v 1.15 2008/10/24 18:02:58 jym Exp $ */
+/* $NetBSD: xenbus_xs.c,v 1.16 2008/10/24 21:09:24 jym Exp $ */
 /******************************************************************************
  * xenbus_xs.c
+ *
  * This is the kernel equivalent of the "xs" library.  We don't need everything
  * and we use xenbus_comms for communication.
+ *
  * Copyright (C) 2005 Rusty Russell, IBM Corporation
+ *
  * This file may be distributed separately from the Linux kernel, or
  * incorporated into other software packages, subject to the following license:
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this source file (the "Software"), to deal in the Software without
 @@ -20,27 +20,27 @@
  * The above copyright notice and this permission notice shall be included in
  * 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: xenbus_xs.c,v 1.15 2008/10/24 18:02:58 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_xs.c,v 1.16 2008/10/24 21:09:24 jym Exp $");
 #if 0
 #define DPRINTK(fmt, args...) \
     printf("xenbus_xs (%s:%d) " fmt ".\n", __func__, __LINE__, ##args)
 #else
 #define DPRINTK(fmt, args...) ((void)0)
 #endif
 #include <sys/types.h>
 #include <sys/null.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 @@ -835,43 +835,47 @@ process_msg(void)
 static void
 xenbus_thread(void *unused)
+{
 	int err;
 	for (;;) {
 		err = process_msg();
 		if (err)
 			printk("XENBUS error %d while reading message\n", err);
+	}
+}
 int
-xs_init(void)
+xs_init(device_t dev)
+{
 	int err;
 	SIMPLEQ_INIT(&xs_state.reply_list);
 	simple_lock_init(&xs_state.reply_lock);
 	mutex_init(&xs_state.xs_lock, MUTEX_DEFAULT, IPL_NONE);
 	err = kthread_create(PRI_NONE, 0, NULL, xenwatch_thread,
 	    NULL, NULL, "xenwatch");
-	if (err)
+	if (err) {
-		printf("kthread_create(xenwatch): %d\n", err);
+		aprint_error_dev(dev, "kthread_create(xenwatch): %d\n", err);
 		return err;
+	}
 	err = kthread_create(PRI_NONE, 0, NULL, xenbus_thread,
 	    NULL, NULL, "xenbus");
-	if (err)
+	if (err) {
-		printf("kthread_create(xenbus): %d\n", err);
+		aprint_error_dev(dev, "kthread_create(xenbus): %d\n", err);
 		return err;
+	}
 	return 0;
+}
 /*
  * Local variables:
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
  *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
  */