svn commit: r245710 - in projects/virtio/sys/dev/virtio: . balloon block network scsi

[Bryan Venteicher]

Author: bryanv
Date: Mon Jan 21 06:45:01 2013
New Revision: 245710
URL: http://svnweb.freebsd.org/changeset/base/245710

Log:
  virtio: Change virtqueue intr handlers to return void
  
  Approved by:	grehan (implicit)

Modified:
  projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c
  projects/virtio/sys/dev/virtio/block/virtio_blk.c
  projects/virtio/sys/dev/virtio/network/if_vtnet.c
  projects/virtio/sys/dev/virtio/scsi/virtio_scsi.c
  projects/virtio/sys/dev/virtio/virtqueue.h

Modified: projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c
==============================================================================
--- projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c	Mon Jan 21 06:42:56 2013	(r245709)
+++ projects/virtio/sys/dev/virtio/balloon/virtio_balloon.c	Mon Jan 21 06:45:01 2013	(r245710)
@@ -90,7 +90,7 @@ static int	vtballoon_config_change(devic
 static void	vtballoon_negotiate_features(struct vtballoon_softc *);
 static int	vtballoon_alloc_virtqueues(struct vtballoon_softc *);
 
-static int	vtballoon_vq_intr(void *);
+static void	vtballoon_vq_intr(void *);
 
 static void	vtballoon_inflate(struct vtballoon_softc *, int);
 static void	vtballoon_deflate(struct vtballoon_softc *, int);
@@ -300,7 +300,7 @@ vtballoon_alloc_virtqueues(struct vtball
 	return (virtio_alloc_virtqueues(dev, 0, nvqs, vq_info));
 }
 
-static int
+static void
 vtballoon_vq_intr(void *xsc)
 {
 	struct vtballoon_softc *sc;
@@ -310,8 +310,6 @@ vtballoon_vq_intr(void *xsc)
 	VTBALLOON_LOCK(sc);
 	wakeup_one(sc);
 	VTBALLOON_UNLOCK(sc);
-
-	return (1);
 }
 
 static void

Modified: projects/virtio/sys/dev/virtio/block/virtio_blk.c
==============================================================================
--- projects/virtio/sys/dev/virtio/block/virtio_blk.c	Mon Jan 21 06:42:56 2013	(r245709)
+++ projects/virtio/sys/dev/virtio/block/virtio_blk.c	Mon Jan 21 06:45:01 2013	(r245710)
@@ -136,7 +136,7 @@ static struct vtblk_request * vtblk_bio_
 static int	vtblk_execute_request(struct vtblk_softc *,
 		    struct vtblk_request *);
 
-static int	vtblk_vq_intr(void *);
+static void	vtblk_vq_intr(void *);
 static void	vtblk_intr_task(void *, int);
 
 static void	vtblk_stop(struct vtblk_softc *);
@@ -808,7 +808,7 @@ vtblk_execute_request(struct vtblk_softc
 	return (virtqueue_enqueue(sc->vtblk_vq, req, sg, readable, writable));
 }
 
-static int
+static void
 vtblk_vq_intr(void *xsc)
 {
 	struct vtblk_softc *sc;
@@ -817,8 +817,6 @@ vtblk_vq_intr(void *xsc)
 
 	virtqueue_disable_intr(sc->vtblk_vq);
 	taskqueue_enqueue_fast(sc->vtblk_tq, &sc->vtblk_intr_task);
-
-	return (1);
 }
 
 static void

Modified: projects/virtio/sys/dev/virtio/network/if_vtnet.c
==============================================================================
--- projects/virtio/sys/dev/virtio/network/if_vtnet.c	Mon Jan 21 06:42:56 2013	(r245709)
+++ projects/virtio/sys/dev/virtio/network/if_vtnet.c	Mon Jan 21 06:45:01 2013	(r245710)
@@ -124,7 +124,7 @@ static int	vtnet_rx_csum(struct vtnet_so
 static int	vtnet_rxeof_merged(struct vtnet_softc *, struct mbuf *, int);
 static int	vtnet_rxeof(struct vtnet_softc *, int, int *);
 static void	vtnet_rx_intr_task(void *, int);
-static int	vtnet_rx_vq_intr(void *);
+static void	vtnet_rx_vq_intr(void *);
 
 static void	vtnet_txeof(struct vtnet_softc *);
 static struct mbuf * vtnet_tx_offload(struct vtnet_softc *, struct mbuf *,
@@ -136,7 +136,7 @@ static void	vtnet_start_locked(struct if
 static void	vtnet_start(struct ifnet *);
 static void	vtnet_tick(void *);
 static void	vtnet_tx_intr_task(void *, int);
-static int	vtnet_tx_vq_intr(void *);
+static void	vtnet_tx_vq_intr(void *);
 
 static void	vtnet_stop(struct vtnet_softc *);
 static int	vtnet_reinit(struct vtnet_softc *);
@@ -1744,7 +1744,7 @@ vtnet_rx_intr_task(void *arg, int pendin
 	}
 }
 
-static int
+static void
 vtnet_rx_vq_intr(void *xsc)
 {
 	struct vtnet_softc *sc;
@@ -1753,8 +1753,6 @@ vtnet_rx_vq_intr(void *xsc)
 
 	vtnet_disable_rx_intr(sc);
 	taskqueue_enqueue_fast(sc->vtnet_tq, &sc->vtnet_rx_intr_task);
-
-	return (1);
 }
 
 static void
@@ -2116,7 +2114,7 @@ vtnet_tx_intr_task(void *arg, int pendin
 	VTNET_UNLOCK(sc);
 }
 
-static int
+static void
 vtnet_tx_vq_intr(void *xsc)
 {
 	struct vtnet_softc *sc;
@@ -2125,8 +2123,6 @@ vtnet_tx_vq_intr(void *xsc)
 
 	vtnet_disable_tx_intr(sc);
 	taskqueue_enqueue_fast(sc->vtnet_tq, &sc->vtnet_tx_intr_task);
-
-	return (1);
 }
 
 static void

Modified: projects/virtio/sys/dev/virtio/scsi/virtio_scsi.c
==============================================================================
--- projects/virtio/sys/dev/virtio/scsi/virtio_scsi.c	Mon Jan 21 06:42:56 2013	(r245709)
+++ projects/virtio/sys/dev/virtio/scsi/virtio_scsi.c	Mon Jan 21 06:45:01 2013	(r245710)
@@ -176,9 +176,9 @@ static void	vtscsi_control_vq_task(void 
 static void	vtscsi_event_vq_task(void *, int);
 static void	vtscsi_request_vq_task(void *, int);
 
-static int	vtscsi_control_vq_intr(void *);
-static int	vtscsi_event_vq_intr(void *);
-static int	vtscsi_request_vq_intr(void *);
+static void	vtscsi_control_vq_intr(void *);
+static void	vtscsi_event_vq_intr(void *);
+static void	vtscsi_request_vq_intr(void *);
 static void 	vtscsi_disable_vqs_intr(struct vtscsi_softc *);
 static void 	vtscsi_enable_vqs_intr(struct vtscsi_softc *);
 
@@ -2222,7 +2222,7 @@ vtscsi_request_vq_task(void *arg, int pe
 	VTSCSI_UNLOCK(sc);
 }
 
-static int
+static void
 vtscsi_control_vq_intr(void *xsc)
 {
 	struct vtscsi_softc *sc;
@@ -2232,11 +2232,9 @@ vtscsi_control_vq_intr(void *xsc)
 	virtqueue_disable_intr(sc->vtscsi_control_vq);
 	taskqueue_enqueue_fast(sc->vtscsi_tq,
 	    &sc->vtscsi_control_intr_task);
-
-	return (1);
 }
 
-static int
+static void
 vtscsi_event_vq_intr(void *xsc)
 {
 	struct vtscsi_softc *sc;
@@ -2246,11 +2244,9 @@ vtscsi_event_vq_intr(void *xsc)
 	virtqueue_disable_intr(sc->vtscsi_event_vq);
 	taskqueue_enqueue_fast(sc->vtscsi_tq,
 	    &sc->vtscsi_event_intr_task);
-
-	return (1);
 }
 
-static int
+static void
 vtscsi_request_vq_intr(void *xsc)
 {
 	struct vtscsi_softc *sc;
@@ -2260,8 +2256,6 @@ vtscsi_request_vq_intr(void *xsc)
 	virtqueue_disable_intr(sc->vtscsi_request_vq);
 	taskqueue_enqueue_fast(sc->vtscsi_tq,
 	    &sc->vtscsi_request_intr_task);
-
-	return (1);
 }
 
 static void

Modified: projects/virtio/sys/dev/virtio/virtqueue.h
==============================================================================
--- projects/virtio/sys/dev/virtio/virtqueue.h	Mon Jan 21 06:42:56 2013	(r245709)
+++ projects/virtio/sys/dev/virtio/virtqueue.h	Mon Jan 21 06:45:01 2013	(r245710)
@@ -39,7 +39,7 @@ struct sglist;
 #define VIRTIO_RING_F_EVENT_IDX		(1 << 29)
 
 /* Device callback for a virtqueue interrupt. */
-typedef int virtqueue_intr_t(void *);
+typedef void virtqueue_intr_t(void *);
 
 #define VIRTQUEUE_MAX_NAME_SZ	32