Patchwork [6/5] Introduce --enable-tpm-passthrough configure option

login
register
mail settings
Submitter Stefan Berger
Date Oct. 4, 2011, 6:44 p.m.
Message ID <4E8B5414.2050108@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/117685/
State New
Headers show

Comments

Stefan Berger - Oct. 4, 2011, 6:44 p.m.
Introduce --enable-tpm-passthrough configure option.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

---
  configure |   16 +++++++++++++++-
  1 file changed, 15 insertions(+), 1 deletion(-)

64-bit)
@@ -1052,6 +1062,7 @@ echo "  --enable-usb-redir       enable
  echo "  --disable-guest-agent    disable building of the QEMU Guest Agent"
  echo "  --enable-guest-agent     enable building of the QEMU Guest Agent"
  echo "  --enable-tpm             enable TPM support"
+echo "  --enable-tpm-passthrough enable TPM passthrough driver"
  echo ""
  echo "NOTE: The object files are built at the place where configure is 
launched"
  exit 1
@@ -2719,6 +2730,7 @@ echo "usb net redir     $usb_redir"
  echo "OpenGL support    $opengl"
  echo "build guest agent $guest_agent"
  echo "TPM support       $tpm"
+echo "TPM passthrough   $tpm_passthrough"

  if test "$sdl_too_old" = "yes"; then
  echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -3566,7 +3578,9 @@ fi
  if test "$tpm" = "yes"; then
    if test "$target_softmmu" = "yes" ; then
      if test "$linux" = "yes" ; then
-      echo "CONFIG_TPM_PASSTHROUGH=y" >> $config_target_mak
+      if test "$tpm_passthrough" = "yes" ; then
+        echo "CONFIG_TPM_PASSTHROUGH=y" >> $config_target_mak
+      fi
      fi
      echo "CONFIG_TPM=y" >> $config_host_mak
    fi

Patch

Index: qemu-git.pt/configure
===================================================================
--- qemu-git.pt.orig/configure
+++ qemu-git.pt/configure
@@ -183,6 +183,7 @@  opengl=""
  zlib="yes"
  guest_agent="yes"
  tpm="no"
+tpm_passthrough="no"

  # parse CC options first
  for opt do
@@ -769,11 +770,20 @@  for opt do
    ;;
    --enable-tpm) tpm="yes"
    ;;
+  --enable-tpm-passthrough) tpm_passthrough="yes"
+  ;;
    *) echo "ERROR: unknown option $opt"; show_help="yes"
    ;;
    esac
  done

+if test "$tpm" = "no" ; then
+    if test "$tpm_passthrough" = "yes"; then
+        echo "ERROR: --enable-tpm-passthrough requires --enable-tpm"
+        exit 1
+    fi
+fi
+
  #
  # If cpu ~= sparc and  sparc_cpu hasn't been defined, plug in the right
  # QEMU_CFLAGS/LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for