Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b4357e0 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Radim Krčmář
Browse files

kvm: make KVM_COALESCED_MMIO_PAGE_OFFSET public 



Its value has never changed; we might as well make it part of the ABI instead
of using the return value of KVM_CHECK_EXTENSION(KVM_CAP_COALESCED_MMIO).

Because PPC does not always make MMIO available, the code has to be made
dependent on CONFIG_KVM_MMIO rather than KVM_COALESCED_MMIO_PAGE_OFFSET.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 30422558

arch/arm/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#define __KVM_HAVE_ARCH_INTC_INITIALIZED



#define KVM_USER_MEM_SLOTS 32

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_HAVE_ONE_REG

#define KVM_HALT_POLL_NS_DEFAULT 500000

arch/arm/include/uapi/asm/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_READONLY_MEM



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1



#define KVM_REG_SIZE(id)						\

	(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))

arch/arm64/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#define __KVM_HAVE_ARCH_INTC_INITIALIZED



#define KVM_USER_MEM_SLOTS 512

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_HALT_POLL_NS_DEFAULT 500000



#include <kvm/arm_vgic.h>

arch/arm64/include/uapi/asm/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_READONLY_MEM



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1



#define KVM_REG_SIZE(id)						\

	(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))

arch/mips/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
/* memory slots that does not exposed to userspace */

#define KVM_PRIVATE_MEM_SLOTS	0



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_HALT_POLL_NS_DEFAULT 500000



#ifdef CONFIG_KVM_MIPS_VZ