From 045c7c77fdff5db611f21ee68a9928f992f5d700 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 14 2019 17:25:21 +0000
Subject: import qemu-kvm-1.5.3-160.el7_6.2


---

diff --git a/SOURCES/kvm-target-i386-define-md-clear-bit-rhel.patch b/SOURCES/kvm-target-i386-define-md-clear-bit-rhel.patch
new file mode 100644
index 0000000..2f7523d
--- /dev/null
+++ b/SOURCES/kvm-target-i386-define-md-clear-bit-rhel.patch
@@ -0,0 +1,33 @@
+From 8f9887acd04e8db0bebd0ad3fe1cf5d7294abdfd Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Sat,  2 Mar 2019 00:07:10 +0100
+Subject: target/i386: define md-clear bit
+
+Message-id: <20190301230710.692-1-pbonzini@redhat.com>
+O-Subject: [qemu PATCH] target/i386: define md-clear bit
+
+md-clear is a new CPUID bit which is set when microcode provides the
+mechanism to invoke a flush of various exploitable CPU buffers by invoking
+the VERW instruction.
+
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+
+---
+
+  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 4b3a238e8d..7247fdd179 100644
+--- a/target-i386/cpu.c
++++ b/target-i386/cpu.c
+@@ -168,7 +168,7 @@ static const char *cpuid_7_0_ecx_feature_name[] = {
+ static const char *cpuid_7_0_edx_feature_name[] = {
+     NULL, NULL, "avx512-4vnniw", "avx512-4fmaps",
+     NULL, NULL, NULL, NULL,
+-    NULL, NULL, NULL, NULL,
++    NULL, NULL, "md-clear", NULL,
+     NULL, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL,
+
diff --git a/SPECS/qemu-kvm.spec b/SPECS/qemu-kvm.spec
index 652e4b1..a813c1b 100644
--- a/SPECS/qemu-kvm.spec
+++ b/SPECS/qemu-kvm.spec
@@ -76,7 +76,7 @@ Obsoletes: %1 < %{obsoletes_version}                                      \
 Summary: QEMU is a machine emulator and virtualizer
 Name: %{pkgname}%{?pkgsuffix}
 Version: 1.5.3
-Release: 160%{?dist}.1
+Release: 160%{?dist}.2
 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
 Epoch: 10
 License: GPLv2 and GPLv2+ and CC-BY
@@ -3941,6 +3941,8 @@ Patch1941: kvm-ide-avoid-referencing-NULL-dev-in-rotational-rate-se.patch
 Patch1942: kvm-slirp-Correct-size-check-in-m_inc.patch
 # For bz#1664792 - mode="host-model" VMs include broken "arch-facilities" flag name [qemu-kvm] [rhel-7.6.z]
 Patch1943: kvm-i386-Deprecate-arch-facilities-and-make-it-block-liv.patch
+# For bz#1693216 - qemu-kvm: hardware: Microarchitectural Store Buffer Data Sampling [rhel-7.6.z]
+Patch1944: kvm-target-i386-define-md-clear-bit-rhel.patch
 
 
 BuildRequires: zlib-devel
@@ -6062,6 +6064,7 @@ tar -xf %{SOURCE21}
 %patch1941 -p1
 %patch1942 -p1
 %patch1943 -p1
+%patch1944 -p1
 
 %build
 buildarch="%{kvm_target}-softmmu"
@@ -6507,6 +6510,11 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || :
 %{_mandir}/man8/qemu-nbd.8*
 
 %changelog
+* Wed Apr 10 2019 Danilo C. L. de Paula <ddepaula@redhat.com> - 1.5.3-160.el7_6.2
+- kvm-target-i386-define-md-clear-bit-rhel.patch
+- Resolves: bz#1693216
+  (qemu-kvm: hardware: Microarchitectural Store Buffer Data Sampling)
+
 * Mon Jan 14 2019 Miroslav Rezanina <mrezanin@redhat.com> - 1.5.3-160.el7_6.1
 - kvm-i386-Deprecate-arch-facilities-and-make-it-block-liv.patch [bz#1664792]
 - Resolves: bz#1664792