|
@@ -481,7 +481,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
|
|
break;
|
|
break;
|
|
case KVM_CAP_S390_HPAGE_1M:
|
|
case KVM_CAP_S390_HPAGE_1M:
|
|
r = 0;
|
|
r = 0;
|
|
- if (hpage)
|
|
|
|
|
|
+ if (hpage && !kvm_is_ucontrol(kvm))
|
|
r = 1;
|
|
r = 1;
|
|
break;
|
|
break;
|
|
case KVM_CAP_S390_MEM_OP:
|
|
case KVM_CAP_S390_MEM_OP:
|
|
@@ -691,7 +691,7 @@ static int kvm_vm_ioctl_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap)
|
|
mutex_lock(&kvm->lock);
|
|
mutex_lock(&kvm->lock);
|
|
if (kvm->created_vcpus)
|
|
if (kvm->created_vcpus)
|
|
r = -EBUSY;
|
|
r = -EBUSY;
|
|
- else if (!hpage || kvm->arch.use_cmma)
|
|
|
|
|
|
+ else if (!hpage || kvm->arch.use_cmma || kvm_is_ucontrol(kvm))
|
|
r = -EINVAL;
|
|
r = -EINVAL;
|
|
else {
|
|
else {
|
|
r = 0;
|
|
r = 0;
|