kvm: drop s390 patch n/a for 4.18

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 0 insertions, 115 deletions

diff --git a/queue/KVM-s390-Do-not-report-unusabled-IDs-via-KVM_CAP_MAX.patch b/queue/KVM-s390-Do-not-report-unusabled-IDs-via-KVM_CAP_MAX.patch
deleted file mode 100644
index 4415d69..0000000
--- a/queue/KVM-s390-Do-not-report-unusabled-IDs-via-KVM_CAP_MAX.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From a86cb413f4bf273a9d341a3ab2c2ca44e12eb317 Mon Sep 17 00:00:00 2001
-From: Thomas Huth <thuth@redhat.com>
-Date: Thu, 23 May 2019 18:43:08 +0200
-Subject: [PATCH] KVM: s390: Do not report unusabled IDs via
- KVM_CAP_MAX_VCPU_ID
-
-commit a86cb413f4bf273a9d341a3ab2c2ca44e12eb317 upstream.
-
-KVM_CAP_MAX_VCPU_ID is currently always reporting KVM_MAX_VCPU_ID on all
-architectures. However, on s390x, the amount of usable CPUs is determined
-during runtime - it is depending on the features of the machine the code
-is running on. Since we are using the vcpu_id as an index into the SCA
-structures that are defined by the hardware (see e.g. the sca_add_vcpu()
-function), it is not only the amount of CPUs that is limited by the hard-
-ware, but also the range of IDs that we can use.
-Thus KVM_CAP_MAX_VCPU_ID must be determined during runtime on s390x, too.
-So the handling of KVM_CAP_MAX_VCPU_ID has to be moved from the common
-code into the architecture specific code, and on s390x we have to return
-the same value here as for KVM_CAP_MAX_VCPUS.
-This problem has been discovered with the kvm_create_max_vcpus selftest.
-With this change applied, the selftest now passes on s390x, too.
-
-Reviewed-by: Andrew Jones <drjones@redhat.com>
-Reviewed-by: Cornelia Huck <cohuck@redhat.com>
-Reviewed-by: David Hildenbrand <david@redhat.com>
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-Message-Id: <20190523164309.13345-9-thuth@redhat.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-
-diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
-index 6d0517ac18e5..0369f26ab96d 100644
---- a/arch/mips/kvm/mips.c
-+++ b/arch/mips/kvm/mips.c
-@@ -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;
-diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
-index 3393b166817a..aa3a678711be 100644
---- a/arch/powerpc/kvm/powerpc.c
-+++ b/arch/powerpc/kvm/powerpc.c
-@@ -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;
-diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
-index e5e8eb29e68e..28ebd647784c 100644
---- a/arch/s390/kvm/kvm-s390.c
-+++ b/arch/s390/kvm/kvm-s390.c
-@@ -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;
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index acb179f78fdc..83aefd759846 100644
---- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -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;
-diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
-index 90cedebaeb94..7eeebe5e9da2 100644
---- a/virt/kvm/arm/arm.c
-+++ b/virt/kvm/arm/arm.c
-@@ -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;
-diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 301089a462c4..ca54b09adf5b 100644
---- a/virt/kvm/kvm_main.c
-+++ b/virt/kvm/kvm_main.c
-@@ -3151,8 +3151,6 @@ static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)
- 	case KVM_CAP_MULTI_ADDRESS_SPACE:
- 		return KVM_ADDRESS_SPACE_NUM;
- #endif
--	case KVM_CAP_MAX_VCPU_ID:
--		return KVM_MAX_VCPU_ID;
- 	case KVM_CAP_NR_MEMSLOTS:
- 		return KVM_USER_MEM_SLOTS;
- 	default:
--- 
-2.9.5
-
diff --git a/queue/series b/queue/series
index f5b1995..52591a6 100644
--- a/queue/series
+++ b/queue/series
@@ -54,7 +54,6 @@ KVM-PPC-Book3S-HV-XIVE-Do-not-clear-IRQ-data-of-pass.patch
 powerpc-perf-Fix-MMCRA-corruption-by-bhrb_filter.patch
 ALSA-line6-Assure-canceling-delayed-work-at-disconne.patch
 ALSA-hda-realtek-Set-default-power-save-node-to-0.patch
-KVM-s390-Do-not-report-unusabled-IDs-via-KVM_CAP_MAX.patch
 drm-nouveau-i2c-Disable-i2c-bus-access-after-fini.patch
 i2c-mlxcpld-Fix-wrong-initialization-order-in-probe.patch
 i2c-synquacer-fix-synquacer_i2c_doxfer-return-value.patch