Commit ca9edaee authored by Avi Kivity's avatar Avi Kivity

KVM: Consolidate userspace memory capability reporting into common code

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 1a811b61
...@@ -180,7 +180,6 @@ int kvm_dev_ioctl_check_extension(long ext) ...@@ -180,7 +180,6 @@ int kvm_dev_ioctl_check_extension(long ext)
switch (ext) { switch (ext) {
case KVM_CAP_IRQCHIP: case KVM_CAP_IRQCHIP:
case KVM_CAP_USER_MEMORY:
case KVM_CAP_MP_STATE: case KVM_CAP_MP_STATE:
r = 1; r = 1;
......
...@@ -137,9 +137,6 @@ int kvm_dev_ioctl_check_extension(long ext) ...@@ -137,9 +137,6 @@ int kvm_dev_ioctl_check_extension(long ext)
int r; int r;
switch (ext) { switch (ext) {
case KVM_CAP_USER_MEMORY:
r = 1;
break;
case KVM_CAP_COALESCED_MMIO: case KVM_CAP_COALESCED_MMIO:
r = KVM_COALESCED_MMIO_PAGE_OFFSET; r = KVM_COALESCED_MMIO_PAGE_OFFSET;
break; break;
......
...@@ -113,8 +113,6 @@ long kvm_arch_dev_ioctl(struct file *filp, ...@@ -113,8 +113,6 @@ long kvm_arch_dev_ioctl(struct file *filp,
int kvm_dev_ioctl_check_extension(long ext) int kvm_dev_ioctl_check_extension(long ext)
{ {
switch (ext) { switch (ext) {
case KVM_CAP_USER_MEMORY:
return 1;
default: default:
return 0; return 0;
} }
......
...@@ -964,7 +964,6 @@ int kvm_dev_ioctl_check_extension(long ext) ...@@ -964,7 +964,6 @@ int kvm_dev_ioctl_check_extension(long ext)
case KVM_CAP_IRQCHIP: case KVM_CAP_IRQCHIP:
case KVM_CAP_HLT: case KVM_CAP_HLT:
case KVM_CAP_MMU_SHADOW_CACHE_CONTROL: case KVM_CAP_MMU_SHADOW_CACHE_CONTROL:
case KVM_CAP_USER_MEMORY:
case KVM_CAP_SET_TSS_ADDR: case KVM_CAP_SET_TSS_ADDR:
case KVM_CAP_EXT_CPUID: case KVM_CAP_EXT_CPUID:
case KVM_CAP_CLOCKSOURCE: case KVM_CAP_CLOCKSOURCE:
......
...@@ -1908,6 +1908,7 @@ static int kvm_dev_ioctl_create_vm(void) ...@@ -1908,6 +1908,7 @@ static int kvm_dev_ioctl_create_vm(void)
static long kvm_dev_ioctl_check_extension_generic(long arg) static long kvm_dev_ioctl_check_extension_generic(long arg)
{ {
switch (arg) { switch (arg) {
case KVM_CAP_USER_MEMORY:
case KVM_CAP_DESTROY_MEMORY_REGION_WORKS: case KVM_CAP_DESTROY_MEMORY_REGION_WORKS:
return 1; return 1;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment