Date: Wed, 15 Oct 2008 05:44:49 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r183907 - in projects/releng_6_xen/sys/xen: . evtchn xenbus Message-ID: <200810150544.m9F5inSq025526@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Wed Oct 15 05:44:49 2008 New Revision: 183907 URL: http://svn.freebsd.org/changeset/base/183907 Log: Update interfaces to build against RELENG_6 Modified: projects/releng_6_xen/sys/xen/evtchn/evtchn.c projects/releng_6_xen/sys/xen/gnttab.c projects/releng_6_xen/sys/xen/gnttab.h projects/releng_6_xen/sys/xen/xenbus/xenbus_xs.c Modified: projects/releng_6_xen/sys/xen/evtchn/evtchn.c ============================================================================== --- projects/releng_6_xen/sys/xen/evtchn/evtchn.c Wed Oct 15 05:44:08 2008 (r183906) +++ projects/releng_6_xen/sys/xen/evtchn/evtchn.c Wed Oct 15 05:44:49 2008 (r183907) @@ -21,7 +21,9 @@ __FBSDID("$FreeBSD$"); #include <machine/cpufunc.h> #include <machine/intr_machdep.h> + #include <machine/xen/xen-os.h> +#include <machine/xen/xenvar.h> #include <machine/xen/xen_intr.h> #include <machine/xen/synch_bitops.h> #include <machine/xen/evtchn.h> @@ -178,7 +180,7 @@ void force_evtchn_callback(void) } void -evtchn_do_upcall(struct trapframe *frame) +evtchn_do_upcall(struct intrframe *frame) { unsigned long l1, l2; unsigned int l1i, l2i, port; @@ -434,7 +436,7 @@ bind_caller_port_to_irqhandler(unsigned irq = bind_caller_port_to_irq(caller_port); intr_register_source(&xp->xp_pins[irq].xp_intsrc); - retval = intr_add_handler(devname, irq, NULL, handler, arg, irqflags, cookiep); + retval = intr_add_handler(devname, irq, handler, arg, irqflags, cookiep); if (retval != 0) { unbind_from_irq(irq); return -retval; @@ -457,7 +459,7 @@ bind_listening_port_to_irqhandler( irq = bind_listening_port_to_irq(remote_domain); intr_register_source(&xp->xp_pins[irq].xp_intsrc); - retval = intr_add_handler(devname, irq, NULL, handler, arg, irqflags, cookiep); + retval = intr_add_handler(devname, irq, handler, arg, irqflags, cookiep); if (retval != 0) { unbind_from_irq(irq); return -retval; @@ -471,7 +473,6 @@ bind_interdomain_evtchn_to_irqhandler( unsigned int remote_domain, unsigned int remote_port, const char *devname, - driver_filter_t filter, driver_intr_t handler, unsigned long irqflags) { @@ -480,7 +481,7 @@ bind_interdomain_evtchn_to_irqhandler( irq = bind_interdomain_evtchn_to_irq(remote_domain, remote_port); intr_register_source(&xp->xp_pins[irq].xp_intsrc); - retval = intr_add_handler(devname, irq, filter, handler, NULL, irqflags, NULL); + retval = intr_add_handler(devname, irq, handler, NULL, irqflags, NULL); if (retval != 0) { unbind_from_irq(irq); return -retval; @@ -493,7 +494,6 @@ int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, const char *devname, - driver_filter_t filter, driver_intr_t handler, unsigned long irqflags) { @@ -502,7 +502,7 @@ bind_virq_to_irqhandler(unsigned int vir irq = bind_virq_to_irq(virq, cpu); intr_register_source(&xp->xp_pins[irq].xp_intsrc); - retval = intr_add_handler(devname, irq, filter, handler, NULL, irqflags, NULL); + retval = intr_add_handler(devname, irq, handler, NULL, irqflags, NULL); if (retval != 0) { unbind_from_irq(irq); return -retval; @@ -523,7 +523,7 @@ bind_ipi_to_irqhandler(unsigned int ipi, irq = bind_ipi_to_irq(ipi, cpu); intr_register_source(&xp->xp_pins[irq].xp_intsrc); - retval = intr_add_handler(devname, irq, NULL, handler, NULL, irqflags, NULL); + retval = intr_add_handler(devname, irq, handler, NULL, irqflags, NULL); if (retval != 0) { unbind_from_irq(irq); return -retval; @@ -592,13 +592,11 @@ static void xenpic_dynirq_enable_sou static void xenpic_dynirq_disable_source(struct intsrc *isrc, int); static void xenpic_dynirq_eoi_source(struct intsrc *isrc); static void xenpic_dynirq_enable_intr(struct intsrc *isrc); -static void xenpic_dynirq_disable_intr(struct intsrc *isrc); static void xenpic_pirq_enable_source(struct intsrc *isrc); static void xenpic_pirq_disable_source(struct intsrc *isrc, int); static void xenpic_pirq_eoi_source(struct intsrc *isrc); static void xenpic_pirq_enable_intr(struct intsrc *isrc); -static void xenpic_pirq_disable_intr(struct intsrc *isrc); static int xenpic_vector(struct intsrc *isrc); @@ -613,7 +611,6 @@ struct pic xenpic_dynirq_template = { .pic_disable_source = xenpic_dynirq_disable_source, .pic_eoi_source = xenpic_dynirq_eoi_source, .pic_enable_intr = xenpic_dynirq_enable_intr, - .pic_disable_intr = xenpic_dynirq_disable_intr, .pic_vector = xenpic_vector, .pic_source_pending = xenpic_source_pending, .pic_suspend = xenpic_suspend, @@ -625,7 +622,6 @@ struct pic xenpic_pirq_template = { .pic_disable_source = xenpic_pirq_disable_source, .pic_eoi_source = xenpic_pirq_eoi_source, .pic_enable_intr = xenpic_pirq_enable_intr, - .pic_disable_intr = xenpic_pirq_disable_intr, .pic_vector = xenpic_vector, .pic_source_pending = xenpic_source_pending, .pic_suspend = xenpic_suspend, @@ -684,20 +680,6 @@ xenpic_dynirq_enable_intr(struct intsrc } static void -xenpic_dynirq_disable_intr(struct intsrc *isrc) -{ - unsigned int irq; - struct xenpic_intsrc *xp; - - xp = (struct xenpic_intsrc *)isrc; - mtx_lock_spin(&irq_mapping_update_lock); - xp->xp_masked = 1; - irq = xenpic_vector(isrc); - mask_evtchn(evtchn_from_irq(irq)); - mtx_unlock_spin(&irq_mapping_update_lock); -} - -static void xenpic_dynirq_eoi_source(struct intsrc *isrc) { unsigned int irq; @@ -830,32 +812,6 @@ xenpic_pirq_enable_intr(struct intsrc *i } static void -xenpic_pirq_disable_intr(struct intsrc *isrc) -{ - unsigned int irq; - int evtchn; - struct evtchn_close close; - - mtx_lock_spin(&irq_mapping_update_lock); - irq = xenpic_vector(isrc); - evtchn = evtchn_from_irq(irq); - - if (!VALID_EVTCHN(evtchn)) - goto done; - - mask_evtchn(evtchn); - - close.port = evtchn; - PANIC_IF(HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0); - - bind_evtchn_to_cpu(evtchn, 0); - evtchn_to_irq[evtchn] = -1; - irq_info[irq] = IRQ_UNBOUND; - done: - mtx_unlock_spin(&irq_mapping_update_lock); -} - -static void xenpic_pirq_enable_source(struct intsrc *isrc) { int evtchn; Modified: projects/releng_6_xen/sys/xen/gnttab.c ============================================================================== --- projects/releng_6_xen/sys/xen/gnttab.c Wed Oct 15 05:44:08 2008 (r183906) +++ projects/releng_6_xen/sys/xen/gnttab.c Wed Oct 15 05:44:49 2008 (r183907) @@ -25,11 +25,6 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mman.h> -#include <vm/vm.h> -#include <vm/vm_extern.h> - -#include <vm/vm_page.h> -#include <vm/vm_kern.h> #include <machine/xen/hypervisor.h> #include <machine/xen/synch_bitops.h> Modified: projects/releng_6_xen/sys/xen/gnttab.h ============================================================================== --- projects/releng_6_xen/sys/xen/gnttab.h Wed Oct 15 05:44:08 2008 (r183906) +++ projects/releng_6_xen/sys/xen/gnttab.h Wed Oct 15 05:44:49 2008 (r183907) @@ -36,12 +36,16 @@ #ifndef __ASM_GNTTAB_H__ +#include <vm/vm.h> +#include <vm/vm_extern.h> +#include <vm/vm_page.h> +#include <vm/vm_kern.h> + #include <machine/xen/hypervisor.h> #include <xen/interface/grant_table.h> #include <machine/xen/xen-os.h> #include <machine/xen/hypervisor.h> #include <machine/xen/features.h> - struct gnttab_free_callback { struct gnttab_free_callback *next; void (*fn)(void *); Modified: projects/releng_6_xen/sys/xen/xenbus/xenbus_xs.c ============================================================================== --- projects/releng_6_xen/sys/xen/xenbus/xenbus_xs.c Wed Oct 15 05:44:08 2008 (r183906) +++ projects/releng_6_xen/sys/xen/xenbus/xenbus_xs.c Wed Oct 15 05:44:49 2008 (r183907) @@ -883,7 +883,7 @@ static void xenbus_thread(void *unused) DELAY(10000); xenbus_running = 1; - pause("xenbus", hz/10); + tsleep(&lbolt, 0, "xenbus", hz/10); for (;;) { err = xs_process_msg(&type); @@ -922,13 +922,13 @@ int xs_init(void) if (err) return err; - err = kproc_create(xenwatch_thread, NULL, &p, + err = kthread_create(xenwatch_thread, NULL, &p, RFHIGHPID, 0, "xenwatch"); if (err) return err; xenwatch_pid = p->p_pid; - err = kproc_create(xenbus_thread, NULL, NULL, + err = kthread_create(xenbus_thread, NULL, NULL, RFHIGHPID, 0, "xenbus"); return err;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810150544.m9F5inSq025526>