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

Commit f8d221d2 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-5.2-2' of... 

Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master

KVM: s390: Fixes

- fix compilation for !CONFIG_PCI
- fix the output of KVM_CAP_MAX_VCPU_ID
parents 24e8a2ca a86cb413

arch/mips/kvm/mips.c

+3 −0
Original line number Diff line number Diff line
@@ -1122,6 +1122,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_MAX_VCPUS:

		r = KVM_MAX_VCPUS;

		break;

	case KVM_CAP_MAX_VCPU_ID:

		r = KVM_MAX_VCPU_ID;

		break;

	case KVM_CAP_MIPS_FPU:

		/* We don't handle systems with inconsistent cpu_has_fpu */

		r = !!raw_cpu_has_fpu;

arch/powerpc/kvm/powerpc.c

+3 −0
Original line number Diff line number Diff line
@@ -657,6 +657,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_MAX_VCPUS:

		r = KVM_MAX_VCPUS;

		break;

	case KVM_CAP_MAX_VCPU_ID:

		r = KVM_MAX_VCPU_ID;

		break;

#ifdef CONFIG_PPC_BOOK3S_64

	case KVM_CAP_PPC_GET_SMMU_INFO:

		r = 1;

arch/s390/kvm/kvm-s390.c

+1 −0
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
		break;

	case KVM_CAP_NR_VCPUS:

	case KVM_CAP_MAX_VCPUS:

	case KVM_CAP_MAX_VCPU_ID:

		r = KVM_S390_BSCA_CPU_SLOTS;

		if (!kvm_s390_use_sca_entries())

			r = KVM_MAX_VCPUS;

arch/x86/kvm/x86.c

+3 −0
Original line number Diff line number Diff line
@@ -3122,6 +3122,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_MAX_VCPUS:

		r = KVM_MAX_VCPUS;

		break;

	case KVM_CAP_MAX_VCPU_ID:

		r = KVM_MAX_VCPU_ID;

		break;

	case KVM_CAP_PV_MMU:	/* obsolete */

		r = 0;

		break;

virt/kvm/arm/arm.c

+3 −0
Original line number Diff line number Diff line
@@ -224,6 +224,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_MAX_VCPUS:

		r = KVM_MAX_VCPUS;

		break;

	case KVM_CAP_MAX_VCPU_ID:

		r = KVM_MAX_VCPU_ID;

		break;

	case KVM_CAP_MSI_DEVID:

		if (!kvm)

			r = -EINVAL;