diff --git a/kvm-i386-Add-stibp-flag-name.patch b/kvm-i386-Add-stibp-flag-name.patch new file mode 100644 index 0000000..b286de7 --- /dev/null +++ b/kvm-i386-Add-stibp-flag-name.patch @@ -0,0 +1,51 @@ +From 730ab8e3a8e9a703f2b2374b8f55429dd6b2254c Mon Sep 17 00:00:00 2001 +From: Eduardo Habkost +Date: Thu, 14 Mar 2019 19:41:28 +0000 +Subject: [PATCH] i386: Add "stibp" flag name + +RH-Author: Eduardo Habkost +Message-id: <20190314194128.15795-2-ehabkost@redhat.com> +Patchwork-id: 84870 +O-Subject: [RHEL-AV-8.0.0 qemu-kvm PATCH 1/1] i386: Add "stibp" flag name +Bugzilla: 1686260 +RH-Acked-by: Paolo Bonzini +RH-Acked-by: Igor Mammedov +RH-Acked-by: Danilo de Paula + +The STIBP flag may be supported by the host KVM module, so QEMU +can allow it to be configured manually, and it can be exposed to +guests when using "-cpu host". + +No additional migration code is required because the whole +contents of spec_ctrl is already migrated in the "cpu/spec_ctrl" +section. + +Corresponding KVM patch was submitted at: +https://lore.kernel.org/lkml/20181205191956.31480-1-ehabkost@redhat.com/ + +Signed-off-by: Eduardo Habkost +Message-Id: <20181210180250.31299-1-ehabkost@redhat.com> +Signed-off-by: Eduardo Habkost +(cherry picked from commit 0e8916582991b9fd0b94850a8444b8b80d0a0955) +Signed-off-by: Eduardo Habkost +Signed-off-by: Danilo C. L. de Paula +--- + target/i386/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/target/i386/cpu.c b/target/i386/cpu.c +index d990070..c115572 100644 +--- a/target/i386/cpu.c ++++ b/target/i386/cpu.c +@@ -1079,7 +1079,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, +- NULL, NULL, "spec-ctrl", NULL, ++ NULL, NULL, "spec-ctrl", "stibp", + NULL, "arch-capabilities", NULL, "ssbd", + }, + .cpuid = { +-- +1.8.3.1 + diff --git a/qemu-kvm.spec b/qemu-kvm.spec index ebb0766..ae8e0a4 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -68,7 +68,7 @@ Obsoletes: %1-rhev Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 3.1.0 -Release: 19%{?dist} +Release: 20%{?dist} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped Epoch: 15 License: GPLv2 and GPLv2+ and CC-BY @@ -220,6 +220,8 @@ Patch66: kvm-Revert-i386-Add-CPUID-bit-for-PCONFIG.patch Patch67: kvm-migration-Fix-cancel-state.patch # For bz#1608649 - Query-migrate get "failed" status after migrate-cancel Patch68: kvm-migration-rdma-Fix-qemu_rdma_cleanup-null-check.patch +# For bz#1686260 - stibp is missing on qemu 3.0 and qemu 3.1 +Patch69: kvm-i386-Add-stibp-flag-name.patch BuildRequires: zlib-devel BuildRequires: glib2-devel @@ -1112,6 +1114,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Fri Mar 15 2019 Danilo Cesar Lemes de Paula - 3.1.0-20.el8 +- kvm-i386-Add-stibp-flag-name.patch [bz#1686260] +- Resolves: bz#1686260 + (stibp is missing on qemu 3.0 and qemu 3.1) + * Fri Mar 15 2019 Danilo Cesar Lemes de Paula - 3.1.0-19.el8 - kvm-migration-Fix-cancel-state.patch [bz#1608649] - kvm-migration-rdma-Fix-qemu_rdma_cleanup-null-check.patch [bz#1608649]