 @@ -1,14 +1,14 @@
-/*      $NetBSD: xenevt.c,v 1.24 2008/03/01 18:32:48 rmind Exp $      */
+/*      $NetBSD: xenevt.c,v 1.25 2008/03/22 14:28:10 ad 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
 @@ -21,27 +21,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: xenevt.c,v 1.24 2008/03/01 18:32:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.25 2008/03/22 14:28:10 ad Exp $");
 #include "opt_xen.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/poll.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 @@ -64,29 +64,29 @@ __KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1
  * Each process with a xenevt device instance open can regiter events it
  * wants to receive. It will get pending events by read(), eventually blocking
  * until some event is available. Pending events are ack'd by a bitmask
  * write()en to the device. Some special operations (such as events binding)
  * are done though ioctl().
  * Processes get a device instance by opening a cloning device.
  */
 void		xenevtattach(int);
 static int	xenevt_fread(struct file *, off_t *, struct uio *,
     kauth_cred_t, int);
 static int	xenevt_fwrite(struct file *, off_t *, struct uio *,
     kauth_cred_t, int);
-static int	xenevt_fioctl(struct file *, u_long, void *, struct lwp *);
+static int	xenevt_fioctl(struct file *, u_long, void *);
-static int	xenevt_fpoll(struct file *, int, struct lwp *);
+static int	xenevt_fpoll(struct file *, int);
-static int	xenevt_fclose(struct file *, struct lwp *);
+static int	xenevt_fclose(struct file *);
 /* static int	xenevt_fkqfilter(struct file *, struct knote *); */
 static const struct fileops xenevt_fileops = {
 	xenevt_fread,
 	xenevt_fwrite,
 	xenevt_fioctl,
 	fnullop_fcntl,
 	xenevt_fpoll,
 	fbadop_stat,
 	xenevt_fclose,
 	/* xenevt_fkqfilter */ fnullop_kqfilter
 };
 @@ -291,33 +291,33 @@ xenevt_record(struct xenevt_d *d, evtchn
+}
 /* open the xenevt device; this is where we clone */
 int
 xenevtopen(dev_t dev, int flags, int mode, struct lwp *l)
+{
 	struct xenevt_d *d;
 	struct file *fp;
 	int fd, error;
 	switch(minor(dev)) {
 	case DEV_EVT:
 		/* falloc() will use the descriptor for us. */
-		if ((error = falloc(l, &fp, &fd)) != 0)
+		if ((error = fd_allocfile(&fp, &fd)) != 0)
 			return error;
 		d = malloc(sizeof(*d), M_DEVBUF, M_WAITOK | M_ZERO);
 		simple_lock_init(&d->lock);
 		selinit(&d->sel);
-		return fdclone(l, fp, fd, flags, &xenevt_fileops, d);
+		return fd_clone(fp, fd, flags, &xenevt_fileops, d);
 #ifdef XEN3
 	case DEV_XSD:
 		/* no clone for /dev/xsd_kva */
 		return (0);
 #endif
 	default:
 		break;
+	}
 	return ENODEV;
+}
 /* read from device: only for /dev/xsd_kva, xenevt is done though fread */
 int
 @@ -356,27 +356,27 @@ xenevtmmap(dev_t dev, off_t off, int pro
 #ifdef XEN3
 	if (minor(dev) == DEV_XSD) {
 		/* only one page, so off is always 0 */
 		if (off != 0)
 			return -1;
 		return x86_btop(
 		    xpmap_mtop(xen_start_info.store_mfn << PAGE_SHIFT));
+	}
 #endif
 	return -1;
+}
 static int
-xenevt_fclose(struct file *fp, struct lwp *l)
+xenevt_fclose(struct file *fp)
+{
 	struct xenevt_d *d = fp->f_data;
 	int i;
 	for (i = 0; i < NR_EVENT_CHANNELS; i++ ) {
 		if (devevent[i] == d) {
 #ifdef XEN3
 			evtchn_op_t op = { 0 };
 			int error;
 #endif
 			hypervisor_mask_event(i);
 			devevent[i] = NULL;
 #ifdef XEN3
 @@ -492,27 +492,27 @@ xenevt_fwrite(struct file *fp, off_t *of
 		goto out;
 	for (i = 0; i < nentries; i++) {
 		if (chans[i] < NR_EVENT_CHANNELS &&
 		    devevent[chans[i]] == d) {
 			hypervisor_unmask_event(chans[i]);
+		}
+	}
 out:
 	kmem_free(chans, nentries * sizeof(u_int16_t));
 	return 0;
+}
 static int
-xenevt_fioctl(struct file *fp, u_long cmd, void *addr, struct lwp *l)
+xenevt_fioctl(struct file *fp, u_long cmd, void *addr)
+{
 	struct xenevt_d *d = fp->f_data;
 #ifdef XEN3
 	evtchn_op_t op = { 0 };
 	int error;
 #else
 	u_int *arg = addr;
 #endif
 	switch(cmd) {
 	case EVTCHN_RESET:
 #ifdef XEN3
 	case IOCTL_EVTCHN_RESET:
 @@ -612,33 +612,33 @@ xenevt_fioctl(struct file *fp, u_long cm
 	default:
 		return EINVAL;
+	}
 	return 0;
+}
 /*
  * Support for poll() system call
+ *
  * Return true if the specific operation will not block indefinitely.
  */
 static int
-xenevt_fpoll(struct file *fp, int events, struct lwp *l)
+xenevt_fpoll(struct file *fp, int events)
+{
 	struct xenevt_d *d = fp->f_data;
 	int revents = events & (POLLOUT | POLLWRNORM); /* we can always write */
 	int s;
 	s = splsoftserial();
 	simple_lock(&d->lock);
 	if (events & (POLLIN | POLLRDNORM)) {
 		if (d->ring_read != d->ring_write) {
 			revents |= events & (POLLIN | POLLRDNORM);
 		} else {
 			/* Record that someone is waiting */
-			selrecord(l, &d->sel);
+			selrecord(curlwp, &d->sel);
+		}
+	}
 	simple_unlock(&d->lock);
 	splx(s);
 	return (revents);
+}