diff options
| author | Nikolay Nikolaev | 2015-03-26 15:39:28 +0100 |
|---|---|---|
| committer | Marc Zyngier | 2015-03-26 22:43:11 +0100 |
| commit | e32edf4fd0fa4897e12ca66118ab67bf257e16e4 (patch) | |
| tree | 8bd79dc3e3d03576e084ce2dbbde68c95fdd0ea8 /arch/x86/kvm/lapic.c | |
| parent | arm/arm64: KVM: Fix migration race in the arch timer (diff) | |
| download | kernel-qcow2-linux-e32edf4fd0fa4897e12ca66118ab67bf257e16e4.tar.gz kernel-qcow2-linux-e32edf4fd0fa4897e12ca66118ab67bf257e16e4.tar.xz kernel-qcow2-linux-e32edf4fd0fa4897e12ca66118ab67bf257e16e4.zip | |
KVM: Redesign kvm_io_bus_ API to pass VCPU structure to the callbacks.
This is needed in e.g. ARM vGIC emulation, where the MMIO handling
depends on the VCPU that does the access.
Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index e55b5fc344eb..ba57bb79e795 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1038,7 +1038,7 @@ static int apic_mmio_in_range(struct kvm_lapic *apic, gpa_t addr) addr < apic->base_address + LAPIC_MMIO_LENGTH; } -static int apic_mmio_read(struct kvm_io_device *this, +static int apic_mmio_read(struct kvm_vcpu *vcpu, struct kvm_io_device *this, gpa_t address, int len, void *data) { struct kvm_lapic *apic = to_lapic(this); @@ -1358,7 +1358,7 @@ static int apic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) return ret; } -static int apic_mmio_write(struct kvm_io_device *this, +static int apic_mmio_write(struct kvm_vcpu *vcpu, struct kvm_io_device *this, gpa_t address, int len, const void *data) { struct kvm_lapic *apic = to_lapic(this); |