Commit-ID: dcfa407df0a0db52f08b6fe4917f265cd0b1e7d5
Gitweb: http://git.kernel.org/tip/dcfa407df0a0db52f08b6fe4917f265cd0b1e7d5
Author: Andreas Herrmann <andreas.herrmann@xxxxxxxxxxxxxxxxxx>
AuthorDate: Mon, 16 Jun 2014 13:47:29 +0200
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Wed, 30 Jul 2014 15:19:06 +0300
kvm tools, mips: Adapt signature of kvm_cpu__emulate_io
Use struct kvm_cpu instead of struct kvm.
This change is req'd due to commit
8d770c4096cdf73e1b79e7395ef3a86aa2887077
(kvmtool: virtio: pass trapped vcpu to IO accessors).
Signed-off-by: Andreas Herrmann <andreas.herrmann@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/mips/include/kvm/kvm-cpu-arch.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/kvm/mips/include/kvm/kvm-cpu-arch.h b/tools/kvm/mips/include/kvm/kvm-cpu-arch.h
index fc286b1..3db7f2b 100644
--- a/tools/kvm/mips/include/kvm/kvm-cpu-arch.h
+++ b/tools/kvm/mips/include/kvm/kvm-cpu-arch.h
@@ -29,9 +29,9 @@ struct kvm_cpu {
* As these are such simple wrappers, let's have them in the header so they'll
* be cheaper to call:
*/
-static inline bool kvm_cpu__emulate_io(struct kvm *kvm, u16 port, void *data, int direction, int size, u32 count)
+static inline bool kvm_cpu__emulate_io(struct kvm_cpu *vcpu, u16 port, void *data, int direction, int size, u32 count)
{
- return kvm__emulate_io(kvm, port, data, direction, size, count);
+ return kvm__emulate_io(vcpu, port, data, direction, size, count);
}
static inline bool kvm_cpu__emulate_mmio(struct kvm_cpu *vcpu, u64 phys_addr, u8 *data, u32 len, u8 is_write)
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|