Patchwork [V19,4/7] Build the TPM frontend code

login
register
mail settings
Submitter Stefan Berger
Date June 4, 2012, 7:37 p.m.
Message ID <1338838668-7544-5-git-send-email-stefanb@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/162862/
State New
Headers show

Comments

Stefan Berger - June 4, 2012, 7:37 p.m.
Build the TPM frontend code that has been added so far.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 Makefile.target |    2 ++
 configure       |   11 +++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
Corey Bryant - Sept. 27, 2012, 2:24 p.m.
On 06/04/2012 03:37 PM, Stefan Berger wrote:
> Build the TPM frontend code that has been added so far.
>
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> ---
>   Makefile.target |    2 ++
>   configure       |   11 +++++++++++
>   2 files changed, 13 insertions(+), 0 deletions(-)
>
> diff --git a/Makefile.target b/Makefile.target
> index 1582904..cdf108a 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -192,6 +192,8 @@ obj-$(CONFIG_KVM) += kvm.o kvm-all.o
>   obj-$(CONFIG_NO_KVM) += kvm-stub.o
>   obj-$(CONFIG_VGA) += vga.o
>   obj-y += memory.o savevm.o cputlb.o
> +obj-y += tpm.o
> +obj-$(CONFIG_TPM) += tpm_tis.o
>   LIBS+=-lz
>
>   obj-i386-$(CONFIG_KVM) += hyperv.o
> diff --git a/configure b/configure
> index 1f338f8..d805c20 100755
> --- a/configure
> +++ b/configure
> @@ -194,6 +194,7 @@ zlib="yes"
>   guest_agent="yes"
>   libiscsi=""
>   coroutine=""
> +tpm="no"
>
>   # parse CC options first
>   for opt do
> @@ -824,6 +825,8 @@ for opt do
>     ;;
>     --disable-guest-agent) guest_agent="no"
>     ;;
> +  --enable-tpm) tpm="yes"
> +  ;;
>     *) echo "ERROR: unknown option $opt"; show_help="yes"
>     ;;
>     esac
> @@ -1110,6 +1113,7 @@ echo "  --disable-guest-agent    disable building of the QEMU Guest Agent"
>   echo "  --enable-guest-agent     enable building of the QEMU Guest Agent"
>   echo "  --with-coroutine=BACKEND coroutine backend. Supported options:"
>   echo "                           gthread, ucontext, sigaltstack, windows"
> +echo "  --enable-tpm             enable TPM support"
>   echo ""
>   echo "NOTE: The object files are built at the place where configure is launched"
>   exit 1
> @@ -3029,6 +3033,7 @@ echo "OpenGL support    $opengl"
>   echo "libiscsi support  $libiscsi"
>   echo "build guest agent $guest_agent"
>   echo "coroutine backend $coroutine_backend"
> +echo "TPM support       $tpm"
>
>   if test "$sdl_too_old" = "yes"; then
>   echo "-> Your SDL version is too old - please upgrade to have SDL support"
> @@ -3911,6 +3916,12 @@ if test "$gprof" = "yes" ; then
>     fi
>   fi
>
> +if test "$tpm" = "yes"; then
> +  if test "$target_softmmu" = "yes" ; then
> +    echo "CONFIG_TPM=y" >> $config_host_mak
> +  fi
> +fi
> +
>   if test "$ARCH" = "tci"; then
>     linker_script=""
>   else
>

This patch looks okay to me.

Patch

diff --git a/Makefile.target b/Makefile.target
index 1582904..cdf108a 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -192,6 +192,8 @@  obj-$(CONFIG_KVM) += kvm.o kvm-all.o
 obj-$(CONFIG_NO_KVM) += kvm-stub.o
 obj-$(CONFIG_VGA) += vga.o
 obj-y += memory.o savevm.o cputlb.o
+obj-y += tpm.o
+obj-$(CONFIG_TPM) += tpm_tis.o
 LIBS+=-lz
 
 obj-i386-$(CONFIG_KVM) += hyperv.o
diff --git a/configure b/configure
index 1f338f8..d805c20 100755
--- a/configure
+++ b/configure
@@ -194,6 +194,7 @@  zlib="yes"
 guest_agent="yes"
 libiscsi=""
 coroutine=""
+tpm="no"
 
 # parse CC options first
 for opt do
@@ -824,6 +825,8 @@  for opt do
   ;;
   --disable-guest-agent) guest_agent="no"
   ;;
+  --enable-tpm) tpm="yes"
+  ;;
   *) echo "ERROR: unknown option $opt"; show_help="yes"
   ;;
   esac
@@ -1110,6 +1113,7 @@  echo "  --disable-guest-agent    disable building of the QEMU Guest Agent"
 echo "  --enable-guest-agent     enable building of the QEMU Guest Agent"
 echo "  --with-coroutine=BACKEND coroutine backend. Supported options:"
 echo "                           gthread, ucontext, sigaltstack, windows"
+echo "  --enable-tpm             enable TPM support"
 echo ""
 echo "NOTE: The object files are built at the place where configure is launched"
 exit 1
@@ -3029,6 +3033,7 @@  echo "OpenGL support    $opengl"
 echo "libiscsi support  $libiscsi"
 echo "build guest agent $guest_agent"
 echo "coroutine backend $coroutine_backend"
+echo "TPM support       $tpm"
 
 if test "$sdl_too_old" = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -3911,6 +3916,12 @@  if test "$gprof" = "yes" ; then
   fi
 fi
 
+if test "$tpm" = "yes"; then
+  if test "$target_softmmu" = "yes" ; then
+    echo "CONFIG_TPM=y" >> $config_host_mak
+  fi
+fi
+
 if test "$ARCH" = "tci"; then
   linker_script=""
 else