From mboxrd@z Thu Jan 1 00:00:00 1970 From: Quan Xu Subject: [PATCH 6/6] vTPM: add QEMU_STUBDOM_VTPM compile option Date: Thu, 30 Oct 2014 03:38:51 -0400 Message-ID: <1414654731-32641-7-git-send-email-quan.xu@intel.com> References: <1414654731-32641-1-git-send-email-quan.xu@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1414654731-32641-1-git-send-email-quan.xu@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: keir@xen.org, ian.campbell@citrix.com, tim@xen.org, ian.jackson@eu.citrix.com, jbeulich@suse.com, Quan Xu List-Id: xen-devel@lists.xenproject.org Signed-off-by: Quan Xu --- Config.mk | 4 ++++ tools/Makefile | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/Config.mk b/Config.mk index a5b6c41..5a5f413 100644 --- a/Config.mk +++ b/Config.mk @@ -254,6 +254,10 @@ endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc1 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 + +# Qemu stubdom vtpm frontend. +QEMU_STUBDOM_VTPM ?= n + # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. diff --git a/tools/Makefile b/tools/Makefile index af9798a..1044149 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -197,6 +197,12 @@ else QEMU_XEN_ENABLE_DEBUG := endif +ifeq ($(QEMU_STUBDOM_VTPM),y) +QEMU_TPM_ARGS="--enable-tpm" +else +QEMU_TPM_ARGS="--disable-tpm" +endif + subdir-all-qemu-xen-dir: qemu-xen-dir-find if test -d $(QEMU_UPSTREAM_LOC) ; then \ source=$(QEMU_UPSTREAM_LOC); \ @@ -222,6 +228,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find --datadir=$(SHAREDIR)/qemu-xen \ --localstatedir=$(localstatedir) \ --disable-kvm \ + $(QEMU_TPM_ARGS) \ --disable-docs \ --disable-guest-agent \ --python=$(PYTHON) \ -- 1.8.3.2