remove broken kvm patch from 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/kvm-x86-raise-gp-when-guest-vcpu-do-not-support-pmu.patch b/queue-4.19/kvm-x86-raise-gp-when-guest-vcpu-do-not-support-pmu.patch
deleted file mode 100644 (file)
index 9b6d67d..0000000
--- a/queue-4.19/kvm-x86-raise-gp-when-guest-vcpu-do-not-support-pmu.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e5dff72883999ab4d03a189c0e4e5d3f3d50b2ee Mon Sep 17 00:00:00 2001
-From: Liran Alon <liran.alon@oracle.com>
-Date: Mon, 25 Mar 2019 21:10:17 +0200
-Subject: KVM: x86: Raise #GP when guest vCPU do not support PMU
-
-[ Upstream commit 672ff6cff80ca43bf3258410d2b887036969df5f ]
-
-Before this change, reading a VMware pseduo PMC will succeed even when
-PMU is not supported by guest. This can easily be seen by running
-kvm-unit-test vmware_backdoors with "-cpu host,-pmu" option.
-
-Reviewed-by: Mihai Carabas <mihai.carabas@oracle.com>
-Signed-off-by: Liran Alon <liran.alon@oracle.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/kvm/pmu.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
-index 58ead7db71a31..e39741997893a 100644
---- a/arch/x86/kvm/pmu.c
-+++ b/arch/x86/kvm/pmu.c
-@@ -281,9 +281,13 @@ static int kvm_pmu_rdpmc_vmware(struct kvm_vcpu *vcpu, unsigned idx, u64 *data)
- int kvm_pmu_rdpmc(struct kvm_vcpu *vcpu, unsigned idx, u64 *data)
- {
-       bool fast_mode = idx & (1u << 31);
-+      struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
-       struct kvm_pmc *pmc;
-       u64 ctr_val;
- 
-+      if (!pmu->version)
-+              return 1;
-+
-       if (is_vmware_backdoor_pmc(idx))
-               return kvm_pmu_rdpmc_vmware(vcpu, idx, data);
- 
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 7a31ea5606eb844fd9996270e04b3f4686010df1..3448e48e6046b72852e9623cd5a0490240da9cf7 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -35,7 +35,6 @@ drm-amd-display-if-one-stream-full-updates-full-upda.patch
 s390-pkey-add-one-more-argument-space-for-debug-feat.patch
 x86-build-lto-fix-truncated-.bss-with-fdata-sections.patch
 x86-reboot-efi-use-efi-reboot-for-acer-travelmate-x5.patch
-kvm-x86-raise-gp-when-guest-vcpu-do-not-support-pmu.patch
 kvm-fix-spectrev1-gadgets.patch
 kvm-x86-avoid-misreporting-level-triggered-irqs-as-e.patch
 tools-lib-traceevent-fix-missing-equality-check-for-.patch