projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...
[firefly-linux-kernel-4.4.55.git]
/
virt
/
kvm
/
coalesced_mmio.c
diff --git
a/virt/kvm/coalesced_mmio.c
b/virt/kvm/coalesced_mmio.c
index 00d86427af0f8bae911c2e41a33303c2d02a3428..571c1ce37d152f86c3690d9e2427f5eeca97cd2c 100644
(file)
--- a/
virt/kvm/coalesced_mmio.c
+++ b/
virt/kvm/coalesced_mmio.c
@@
-8,7
+8,7
@@
*
*/
*
*/
-#include
"iodev.h"
+#include
<kvm/iodev.h>
#include <linux/kvm_host.h>
#include <linux/slab.h>
#include <linux/kvm_host.h>
#include <linux/slab.h>
@@
-60,8
+60,9
@@
static int coalesced_mmio_has_room(struct kvm_coalesced_mmio_dev *dev)
return 1;
}
return 1;
}
-static int coalesced_mmio_write(struct kvm_io_device *this,
- gpa_t addr, int len, const void *val)
+static int coalesced_mmio_write(struct kvm_vcpu *vcpu,
+ struct kvm_io_device *this, gpa_t addr,
+ int len, const void *val)
{
struct kvm_coalesced_mmio_dev *dev = to_mmio(this);
struct kvm_coalesced_mmio_ring *ring = dev->kvm->coalesced_mmio_ring;
{
struct kvm_coalesced_mmio_dev *dev = to_mmio(this);
struct kvm_coalesced_mmio_ring *ring = dev->kvm->coalesced_mmio_ring;