KVM: remove in_range from io devices

[deliverable/linux.git] / arch / x86 / kvm / i8259.c

diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c
index 1ccb50c74f186d779e8f67b9b833e896b812b3d9..1d1bb75dc7bcb813b6086a61d1c521a8cc39d8ff 100644 (file)
--- a/arch/x86/kvm/i8259.c
+++ b/arch/x86/kvm/i8259.c
@@ -57,7 +57,7 @@ static void pic_unlock(struct kvm_pic *s)
        }
 
        if (wakeup) {
-               vcpu = s->kvm->vcpus[0];
+               vcpu = s->kvm->bsp_vcpu;
                if (vcpu)
                        kvm_vcpu_kick(vcpu);
        }
@@ -72,8 +72,10 @@ static void pic_clear_isr(struct kvm_kpic_state *s, int irq)
 void kvm_pic_clear_isr_ack(struct kvm *kvm)
 {
        struct kvm_pic *s = pic_irqchip(kvm);
+       pic_lock(s);
        s->pics[0].isr_ack = 0xff;
        s->pics[1].isr_ack = 0xff;
+       pic_unlock(s);
 }
 
 /*
@@ -252,7 +254,7 @@ void kvm_pic_reset(struct kvm_kpic_state *s)
 {
        int irq, irqbase, n;
        struct kvm *kvm = s->pics_state->irq_request_opaque;
-       struct kvm_vcpu *vcpu0 = kvm->vcpus[0];
+       struct kvm_vcpu *vcpu0 = kvm->bsp_vcpu;
 
        if (s == &s->pics_state->pics[0])
                irqbase = 0;
@@ -428,8 +430,7 @@ static u32 elcr_ioport_read(void *opaque, u32 addr1)
        return s->elcr;
 }
 
-static int picdev_in_range(struct kvm_io_device *this, gpa_t addr,
-                          int len, int is_write)
+static int picdev_in_range(gpa_t addr)
 {
        switch (addr) {
        case 0x20:
@@ -444,16 +445,23 @@ static int picdev_in_range(struct kvm_io_device *this, gpa_t addr,
        }
 }
 
-static void picdev_write(struct kvm_io_device *this,
+static inline struct kvm_pic *to_pic(struct kvm_io_device *dev)
+{
+       return container_of(dev, struct kvm_pic, dev);
+}
+
+static int picdev_write(struct kvm_io_device *this,
                         gpa_t addr, int len, const void *val)
 {
-       struct kvm_pic *s = this->private;
+       struct kvm_pic *s = to_pic(this);
        unsigned char data = *(unsigned char *)val;
+       if (!picdev_in_range(addr))
+               return -EOPNOTSUPP;
 
        if (len != 1) {
                if (printk_ratelimit())
                        printk(KERN_ERR "PIC: non byte write\n");
-               return;
+               return 0;
        }
        pic_lock(s);
        switch (addr) {
@@ -469,18 +477,21 @@ static void picdev_write(struct kvm_io_device *this,
                break;
        }
        pic_unlock(s);
+       return 0;
 }
 
-static void picdev_read(struct kvm_io_device *this,
-                       gpa_t addr, int len, void *val)
+static int picdev_read(struct kvm_io_device *this,
+                      gpa_t addr, int len, void *val)
 {
-       struct kvm_pic *s = this->private;
+       struct kvm_pic *s = to_pic(this);
        unsigned char data = 0;
+       if (!picdev_in_range(addr))
+               return -EOPNOTSUPP;
 
        if (len != 1) {
                if (printk_ratelimit())
                        printk(KERN_ERR "PIC: non byte read\n");
-               return;
+               return 0;
        }
        pic_lock(s);
        switch (addr) {
@@ -497,6 +508,7 @@ static void picdev_read(struct kvm_io_device *this,
        }
        *(unsigned char *)val = data;
        pic_unlock(s);
+       return 0;
 }
 
 /*
@@ -505,7 +517,7 @@ static void picdev_read(struct kvm_io_device *this,
 static void pic_irq_request(void *opaque, int level)
 {
        struct kvm *kvm = opaque;
-       struct kvm_vcpu *vcpu = kvm->vcpus[0];
+       struct kvm_vcpu *vcpu = kvm->bsp_vcpu;
        struct kvm_pic *s = pic_irqchip(kvm);
        int irq = pic_get_irq(&s->pics[0]);
 
@@ -516,6 +528,11 @@ static void pic_irq_request(void *opaque, int level)
        }
 }
 
+static const struct kvm_io_device_ops picdev_ops = {
+       .read     = picdev_read,
+       .write    = picdev_write,
+};
+
 struct kvm_pic *kvm_create_pic(struct kvm *kvm)
 {
        struct kvm_pic *s;
@@ -534,10 +551,7 @@ struct kvm_pic *kvm_create_pic(struct kvm *kvm)
        /*
         * Initialize PIO device
         */
-       s->dev.read = picdev_read;
-       s->dev.write = picdev_write;
-       s->dev.in_range = picdev_in_range;
-       s->dev.private = s;
-       kvm_io_bus_register_dev(&kvm->pio_bus, &s->dev);
+       kvm_iodevice_init(&s->dev, &picdev_ops);
+       kvm_io_bus_register_dev(kvm, &kvm->pio_bus, &s->dev);
        return s;
 }