1 files changed, 9 insertions, 10 deletions

diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 14e1379876d..260d1fcf29a 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -11,15 +11,13 @@
 /**
  * virtqueue - a queue to register buffers for sending or receiving.
  * @callback: the function to call when buffers are consumed (can be NULL).
- *    If this returns false, callbacks are suppressed until vq_ops->restart
- *    is called.
  * @vdev: the virtio device this queue was created for.
  * @vq_ops: the operations for this virtqueue (see below).
  * @priv: a pointer for the virtqueue implementation to use.
  */
 struct virtqueue
 {
-        bool (*callback)(struct virtqueue *vq);
+        void (*callback)(struct virtqueue *vq);
         struct virtio_device *vdev;
         struct virtqueue_ops *vq_ops;
         void *priv;
@@ -41,13 +39,12 @@ struct virtqueue
  *      vq: the struct virtqueue we're talking about.
  *      len: the length written into the buffer
  *      Returns NULL or the "data" token handed to add_buf.
- * @restart: restart callbacks after callback returned false.
+ * @disable_cb: disable callbacks
+ *      vq: the struct virtqueue we're talking about.
+ * @enable_cb: restart callbacks after disable_cb.
  *      vq: the struct virtqueue we're talking about.
  *      This returns "false" (and doesn't re-enable) if there are pending
  *      buffers in the queue, to avoid a race.
- * @shutdown: "unadd" all buffers.
- *      vq: the struct virtqueue we're talking about.
- *      Remove everything from the queue.
  *
  * Locking rules are straightforward: the driver is responsible for
  * locking.  No two operations may be invoked simultaneously.
@@ -65,9 +62,8 @@ struct virtqueue_ops {
 
         void *(*get_buf)(struct virtqueue *vq, unsigned int *len);
 
-        bool (*restart)(struct virtqueue *vq);
-
-        void (*shutdown)(struct virtqueue *vq);
+        void (*disable_cb)(struct virtqueue *vq);
+        bool (*enable_cb)(struct virtqueue *vq);
 };
 
 /**
@@ -97,12 +93,15 @@ void unregister_virtio_device(struct virtio_device *dev);
  * @probe: the function to call when a device is found.  Returns a token for
  *    remove, or PTR_ERR().
  * @remove: the function when a device is removed.
+ * @config_changed: optional function to call when the device configuration
+ *    changes; may be called in interrupt context.
  */
 struct virtio_driver {
         struct device_driver driver;
         const struct virtio_device_id *id_table;
         int (*probe)(struct virtio_device *dev);
         void (*remove)(struct virtio_device *dev);
+        void (*config_changed)(struct virtio_device *dev);
 };
 
 int register_virtio_driver(struct virtio_driver *drv);