svn commit: r188686 - in user/dfr/xenhvm/7/sys/xen: . evtchn xenbus

[Doug Rabson]

Author: dfr
Date: Mon Feb 16 17:43:45 2009
New Revision: 188686
URL: http://svn.freebsd.org/changeset/base/188686

Log:
  Fix build.

Modified:
  user/dfr/xenhvm/7/sys/xen/evtchn.h
  user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c
  user/dfr/xenhvm/7/sys/xen/xen_intr.h
  user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c

Modified: user/dfr/xenhvm/7/sys/xen/evtchn.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/evtchn.h	Mon Feb 16 17:19:38 2009	(r188685)
+++ user/dfr/xenhvm/7/sys/xen/evtchn.h	Mon Feb 16 17:43:45 2009	(r188686)
@@ -28,7 +28,7 @@ void notify_remote_via_irq(int irq);
 
 
 /* Entry point for notifications into Linux subsystems. */
-void evtchn_do_upcall(struct intrframe *frame);
+void evtchn_do_upcall(struct trapframe *frame);
 
 /* Entry point for notifications into the userland character device. */
 void evtchn_device_upcall(int port);

Modified: user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c	Mon Feb 16 17:19:38 2009	(r188685)
+++ user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c	Mon Feb 16 17:43:45 2009	(r188686)
@@ -184,7 +184,7 @@ void force_evtchn_callback(void)
 }
 
 void 
-evtchn_do_upcall(struct intrframe *frame) 
+evtchn_do_upcall(struct trapframe *frame) 
 {
 	unsigned long  l1, l2;
 	unsigned int   l1i, l2i, port;
@@ -450,7 +450,7 @@ bind_caller_port_to_irqhandler(unsigned 
 
 	irq = bind_caller_port_to_irq(caller_port);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, handler, arg, irqflags,
+	error = intr_add_handler(devname, irq, NULL, handler, arg, irqflags,
 	    &xp->xp_pins[irq].xp_cookie);
 
 	if (error) {
@@ -474,7 +474,7 @@ bind_listening_port_to_irqhandler(unsign
 
 	irq = bind_listening_port_to_irq(remote_domain);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, handler, arg, irqflags,
+	error = intr_add_handler(devname, irq, NULL, handler, arg, irqflags,
 	    &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);
@@ -488,7 +488,8 @@ bind_listening_port_to_irqhandler(unsign
 
 int 
 bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
-    unsigned int remote_port, const char *devname, driver_intr_t handler,
+    unsigned int remote_port, const char *devname,
+    driver_filter_t filter, driver_intr_t handler,
     unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
@@ -496,7 +497,7 @@ bind_interdomain_evtchn_to_irqhandler(un
 
 	irq = bind_interdomain_evtchn_to_irq(remote_domain, remote_port);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, handler, NULL,
+	error = intr_add_handler(devname, irq, filter, handler, NULL,
 	    irqflags, &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);
@@ -510,7 +511,7 @@ bind_interdomain_evtchn_to_irqhandler(un
 
 int 
 bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
-    const char *devname, driver_intr_t handler,
+    const char *devname, driver_filter_t filter, driver_intr_t handler,
     unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
@@ -518,7 +519,7 @@ bind_virq_to_irqhandler(unsigned int vir
 
 	irq = bind_virq_to_irq(virq, cpu);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, handler,
+	error = intr_add_handler(devname, irq, filter, handler,
 	    NULL, irqflags, &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);
@@ -532,7 +533,7 @@ bind_virq_to_irqhandler(unsigned int vir
 
 int 
 bind_ipi_to_irqhandler(unsigned int ipi, unsigned int cpu,
-    const char *devname, driver_intr_t handler,
+    const char *devname, driver_filter_t filter,
     unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
@@ -540,7 +541,7 @@ bind_ipi_to_irqhandler(unsigned int ipi,
 	
 	irq = bind_ipi_to_irq(ipi, cpu);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, handler,
+	error = intr_add_handler(devname, irq, filter, NULL,
 	    NULL, irqflags, &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);

Modified: user/dfr/xenhvm/7/sys/xen/xen_intr.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/xen_intr.h	Mon Feb 16 17:19:38 2009	(r188685)
+++ user/dfr/xenhvm/7/sys/xen/xen_intr.h	Mon Feb 16 17:43:45 2009	(r188686)
@@ -57,7 +57,7 @@ extern int bind_listening_port_to_irqhan
  * otherwise.
  */
 extern int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
-	const char *devname, driver_intr_t handler,
+	const char *devname, driver_filter_t filter, driver_intr_t handler,
 	unsigned long irqflags,	unsigned int *irqp);
 
 /*
@@ -66,7 +66,7 @@ extern int bind_virq_to_irqhandler(unsig
  * otherwise.
  */
 extern int bind_ipi_to_irqhandler(unsigned int ipi, unsigned int cpu,
-	const char *devname, driver_intr_t handler,
+	const char *devname, driver_filter_t filter,
 	unsigned long irqflags, unsigned int *irqp);
 
 /*
@@ -75,7 +75,8 @@ extern int bind_ipi_to_irqhandler(unsign
  * on success or errno otherwise.
  */
 extern int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
-	unsigned int remote_port, const char *devname, driver_intr_t handler,
+	unsigned int remote_port, const char *devname,
+	driver_filter_t filter, driver_intr_t handler,
 	unsigned long irqflags, unsigned int *irqp);
 
 /*

Modified: user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c	Mon Feb 16 17:19:38 2009	(r188685)
+++ user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c	Mon Feb 16 17:43:45 2009	(r188686)
@@ -791,7 +791,7 @@ xs_process_msg(enum xsd_sockmsg_type *ty
 	msg = malloc(sizeof(*msg), M_DEVBUF, M_WAITOK);
 	mtx_lock(&xs_state.reply_lock);
 	error = xb_read(&msg->hdr, sizeof(msg->hdr),
-	    &xs_state.reply_lock.mtx_object);
+	    &xs_state.reply_lock.lock_object);
 	mtx_unlock(&xs_state.reply_lock);
 	if (error) {
 		free(msg, M_DEVBUF);
@@ -801,7 +801,7 @@ xs_process_msg(enum xsd_sockmsg_type *ty
 	body = malloc(msg->hdr.len + 1, M_DEVBUF, M_WAITOK);
 	mtx_lock(&xs_state.reply_lock);
 	error = xb_read(body, msg->hdr.len,
-	    &xs_state.reply_lock.mtx_object); 
+	    &xs_state.reply_lock.lock_object); 
 	mtx_unlock(&xs_state.reply_lock);
 	if (error) {
 		free(body, M_DEVBUF);