diff options
author | Laurent Vivier <Laurent.Vivier@bull.net> | 2008-05-30 10:05:56 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-07-20 05:42:31 -0400 |
commit | 588968b6b7d34e6a88f538d1db9aca47b203623e (patch) | |
tree | 0ffb6f15b2b6cab5b758f62d71f9e264ddc0a4fb /arch | |
parent | 542472b53ea9e0add0ba23976018210191d84754 (diff) |
KVM: Add coalesced MMIO support (powerpc part)
This patch enables coalesced MMIO for powerpc architecture.
It defines KVM_MMIO_PAGE_OFFSET and KVM_CAP_COALESCED_MMIO.
It enables the compilation of coalesced_mmio.c.
Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.net>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kvm/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/kvm/powerpc.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index d0d358d367ec..04e3449e1f42 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 0513b359851b..b850d2497027 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; |