1 files changed, 15 insertions, 8 deletions

diff --git a/virt/kvm/iodev.h b/virt/kvm/iodev.h
index 12fd3caffd2b..9ef709cc2cae 100644
--- a/virt/kvm/iodev.h
+++ b/virt/kvm/iodev.h
@@ -20,6 +20,7 @@
 #include <asm/errno.h>
 
 struct kvm_io_device;
+struct kvm_vcpu;
 
 /**
  * kvm_io_device_ops are called under kvm slots_lock.
@@ -27,11 +28,13 @@ struct kvm_io_device;
  * or non-zero to have it passed to the next device.
  **/
 struct kvm_io_device_ops {
-        int (*read)(struct kvm_io_device *this,
+        int (*read)(struct kvm_vcpu *vcpu,
+                    struct kvm_io_device *this,
                     gpa_t addr,
                     int len,
                     void *val);
-        int (*write)(struct kvm_io_device *this,
+        int (*write)(struct kvm_vcpu *vcpu,
+                     struct kvm_io_device *this,
                      gpa_t addr,
                      int len,
                      const void *val);
@@ -49,16 +52,20 @@ static inline void kvm_iodevice_init(struct kvm_io_device *dev,
         dev->ops = ops;
 }
 
-static inline int kvm_iodevice_read(struct kvm_io_device *dev,
-                                    gpa_t addr, int l, void *v)
+static inline int kvm_iodevice_read(struct kvm_vcpu *vcpu,
+                                    struct kvm_io_device *dev, gpa_t addr,
+                                    int l, void *v)
 {
-        return dev->ops->read ? dev->ops->read(dev, addr, l, v) : -EOPNOTSUPP;
+        return dev->ops->read ? dev->ops->read(vcpu, dev, addr, l, v)
+                                : -EOPNOTSUPP;
 }
 
-static inline int kvm_iodevice_write(struct kvm_io_device *dev,
-                                     gpa_t addr, int l, const void *v)
+static inline int kvm_iodevice_write(struct kvm_vcpu *vcpu,
+                                     struct kvm_io_device *dev, gpa_t addr,
+                                     int l, const void *v)
 {
-        return dev->ops->write ? dev->ops->write(dev, addr, l, v) : -EOPNOTSUPP;
+        return dev->ops->write ? dev->ops->write(vcpu, dev, addr, l, v)
+                                 : -EOPNOTSUPP;
 }
 
 static inline void kvm_iodevice_destructor(struct kvm_io_device *dev)