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

Commit ca9edaee authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Consolidate userspace memory capability reporting into common code 



Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 1a811b61

arch/ia64/kvm/kvm-ia64.c

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ int kvm_dev_ioctl_check_extension(long ext) 


	switch (ext) {

	case KVM_CAP_IRQCHIP:

	case KVM_CAP_USER_MEMORY:

	case KVM_CAP_MP_STATE:



		r = 1;

arch/powerpc/kvm/powerpc.c

+0 −3
Original line number Diff line number Diff line
@@ -137,9 +137,6 @@ int kvm_dev_ioctl_check_extension(long ext) 
	int r;



	switch (ext) {

	case KVM_CAP_USER_MEMORY:

		r = 1;

		break;

	case KVM_CAP_COALESCED_MMIO:

		r = KVM_COALESCED_MMIO_PAGE_OFFSET;

		break;

arch/s390/kvm/kvm-s390.c

+0 −2
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ long kvm_arch_dev_ioctl(struct file *filp, 
int kvm_dev_ioctl_check_extension(long ext)

{

	switch (ext) {

	case KVM_CAP_USER_MEMORY:

		return 1;

	default:

		return 0;

	}

arch/x86/kvm/x86.c

+0 −1
Original line number Diff line number Diff line
@@ -964,7 +964,6 @@ int kvm_dev_ioctl_check_extension(long ext) 
	case KVM_CAP_IRQCHIP:

	case KVM_CAP_HLT:

	case KVM_CAP_MMU_SHADOW_CACHE_CONTROL:

	case KVM_CAP_USER_MEMORY:

	case KVM_CAP_SET_TSS_ADDR:

	case KVM_CAP_EXT_CPUID:

	case KVM_CAP_CLOCKSOURCE:

virt/kvm/kvm_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1908,6 +1908,7 @@ static int kvm_dev_ioctl_create_vm(void) 
static long kvm_dev_ioctl_check_extension_generic(long arg)

{

	switch (arg) {

	case KVM_CAP_USER_MEMORY:

	case KVM_CAP_DESTROY_MEMORY_REGION_WORKS:

		return 1;

	default: