From 63eeb9e6385bf7c43f2a8e1321abe0f24950f2cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Sun, 16 Dec 2018 17:18:22 +0000
Subject: [PATCH] redhat: enable tpmdev passthrough
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: <20181216171822.5255-2-marcandre.lureau@redhat.com>
Patchwork-id: 83531
O-Subject: [RHEL8/rhel qemu-kvm PATCH 1/1] redhat: enable tpmdev passthrough
Bugzilla: 1654486
RH-Acked-by: Ademar de Souza Reis Jr. <areis@redhat.com>
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

https://bugzilla.redhat.com/show_bug.cgi?id=1654486

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
 configure                     | 4 ++++
 redhat/qemu-kvm.spec.template | 2 +-
 tests/Makefile.include        | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 9446f49..139f3c8 100755
--- a/configure
+++ b/configure
@@ -3723,6 +3723,10 @@ if test "$mingw32" != "yes"; then
 else
   tpm_emulator=no
 fi
+
+# RHEL8-specific, only passthrough for now, rhbz#1654486
+tpm_emulator=no
+
 ##########################################
 # attr probe
 
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 1177ca3..d200288 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -301,8 +301,9 @@ check-qtest-i386-$(CONFIG_VHOST_USER_NET_TEST_i386) += tests/vhost-user-test$(EX
 ifeq ($(CONFIG_VHOST_USER_NET_TEST_i386),)
 check-qtest-x86_64-$(CONFIG_VHOST_USER_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF)
 endif
-check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-test$(EXESUF)
-check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-test$(EXESUF)
+# RHEL8 - disable emulator tests, only passthrough for now
+#check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-test$(EXESUF)
+#check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-test$(EXESUF)
 check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
 check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
 check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
-- 
1.8.3.1