diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kvm/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/kvm/powerpc.c | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index d0d358d367e..04e3449e1f4 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | EXTRA_CFLAGS += -Ivirt/kvm -Iarch/powerpc/kvm | 5 | EXTRA_CFLAGS += -Ivirt/kvm -Iarch/powerpc/kvm |
6 | 6 | ||
7 | common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o) | 7 | common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o) |
8 | 8 | ||
9 | kvm-objs := $(common-objs) powerpc.o emulate.o booke_guest.o | 9 | kvm-objs := $(common-objs) powerpc.o emulate.o booke_guest.o |
10 | obj-$(CONFIG_KVM) += kvm.o | 10 | obj-$(CONFIG_KVM) += kvm.o |
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 777e0f34e0e..53826a5f6c0 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c | |||
@@ -145,6 +145,9 @@ int kvm_dev_ioctl_check_extension(long ext) | |||
145 | case KVM_CAP_USER_MEMORY: | 145 | case KVM_CAP_USER_MEMORY: |
146 | r = 1; | 146 | r = 1; |
147 | break; | 147 | break; |
148 | case KVM_CAP_COALESCED_MMIO: | ||
149 | r = KVM_COALESCED_MMIO_PAGE_OFFSET; | ||
150 | break; | ||
148 | default: | 151 | default: |
149 | r = 0; | 152 | r = 0; |
150 | break; | 153 | break; |
@@ -167,6 +170,10 @@ int kvm_arch_set_memory_region(struct kvm *kvm, | |||
167 | return 0; | 170 | return 0; |
168 | } | 171 | } |
169 | 172 | ||
173 | void kvm_arch_flush_shadow(struct kvm *kvm) | ||
174 | { | ||
175 | } | ||
176 | |||
170 | struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) | 177 | struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) |
171 | { | 178 | { |
172 | struct kvm_vcpu *vcpu; | 179 | struct kvm_vcpu *vcpu; |
@@ -240,10 +247,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) | |||
240 | { | 247 | { |
241 | } | 248 | } |
242 | 249 | ||
243 | void decache_vcpus_on_cpu(int cpu) | ||
244 | { | ||
245 | } | ||
246 | |||
247 | int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu, | 250 | int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu, |
248 | struct kvm_debug_guest *dbg) | 251 | struct kvm_debug_guest *dbg) |
249 | { | 252 | { |