Message ID | 1323717136-21661-5-git-send-email-stefanb@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
On 12/12/2011 01:12 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 | 1 + > configure | 11 +++++++++++ > 2 files changed, 12 insertions(+), 0 deletions(-) > > diff --git a/Makefile.target b/Makefile.target > index 39b2e5a..37d5d10 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -205,6 +205,7 @@ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o > obj-$(CONFIG_KVM) += kvm.o kvm-all.o > obj-$(CONFIG_NO_KVM) += kvm-stub.o > obj-y += memory.o > +obj-$(CONFIG_TPM) += tpm.o tpm_tis.o > LIBS+=-lz > > QEMU_CFLAGS += $(VNC_TLS_CFLAGS) > diff --git a/configure b/configure > index cc5ae87..385feb4 100755 > --- a/configure > +++ b/configure > @@ -185,6 +185,7 @@ opengl="" > zlib="yes" > guest_agent="yes" > libiscsi="" > +tpm="no" Please probe instead of requiring it to be explicitly enabled. Regards, Anthony Liguori > > # parse CC options first > for opt do > @@ -784,6 +785,8 @@ for opt do > ;; > --disable-guest-agent) guest_agent="no" > ;; > + --enable-tpm) tpm="yes" > + ;; > *) echo "ERROR: unknown option $opt"; show_help="yes" > ;; > esac > @@ -1070,6 +1073,7 @@ echo " --disable-usb-redir disable usb network redirection support" > echo " --enable-usb-redir enable usb network redirection support" > 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 "" > echo "NOTE: The object files are built at the place where configure is launched" > exit 1 > @@ -2845,6 +2849,7 @@ echo "usb net redir $usb_redir" > echo "OpenGL support $opengl" > echo "libiscsi support $libiscsi" > echo "build guest agent $guest_agent" > +echo "TPM support $tpm" > > if test "$sdl_too_old" = "yes"; then > echo "-> Your SDL version is too old - please upgrade to have SDL support" > @@ -3714,6 +3719,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
On 12/12/2011 06:24 PM, Anthony Liguori wrote: > On 12/12/2011 01:12 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 | 1 + >> configure | 11 +++++++++++ >> 2 files changed, 12 insertions(+), 0 deletions(-) >> >> diff --git a/Makefile.target b/Makefile.target >> index 39b2e5a..37d5d10 100644 >> --- a/Makefile.target >> +++ b/Makefile.target >> @@ -205,6 +205,7 @@ obj-$(CONFIG_REALLY_VIRTFS) += >> 9pfs/virtio-9p-device.o >> obj-$(CONFIG_KVM) += kvm.o kvm-all.o >> obj-$(CONFIG_NO_KVM) += kvm-stub.o >> obj-y += memory.o >> +obj-$(CONFIG_TPM) += tpm.o tpm_tis.o >> LIBS+=-lz >> >> QEMU_CFLAGS += $(VNC_TLS_CFLAGS) >> diff --git a/configure b/configure >> index cc5ae87..385feb4 100755 >> --- a/configure >> +++ b/configure >> @@ -185,6 +185,7 @@ opengl="" >> zlib="yes" >> guest_agent="yes" >> libiscsi="" >> +tpm="no" > > Please probe instead of requiring it to be explicitly enabled. At this point there is not much to probe. We're only building the front-end with no backend, i.e., passthrough, being built in. Stefan > > Regards, > > Anthony Liguori > >> >> # parse CC options first >> for opt do >> @@ -784,6 +785,8 @@ for opt do >> ;; >> --disable-guest-agent) guest_agent="no" >> ;; >> + --enable-tpm) tpm="yes" >> + ;; >> *) echo "ERROR: unknown option $opt"; show_help="yes" >> ;; >> esac >> @@ -1070,6 +1073,7 @@ echo " --disable-usb-redir disable usb >> network redirection support" >> echo " --enable-usb-redir enable usb network redirection >> support" >> 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 "" >> echo "NOTE: The object files are built at the place where configure >> is launched" >> exit 1 >> @@ -2845,6 +2849,7 @@ echo "usb net redir $usb_redir" >> echo "OpenGL support $opengl" >> echo "libiscsi support $libiscsi" >> echo "build guest agent $guest_agent" >> +echo "TPM support $tpm" >> >> if test "$sdl_too_old" = "yes"; then >> echo "-> Your SDL version is too old - please upgrade to have SDL >> support" >> @@ -3714,6 +3719,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 >
diff --git a/Makefile.target b/Makefile.target index 39b2e5a..37d5d10 100644 --- a/Makefile.target +++ b/Makefile.target @@ -205,6 +205,7 @@ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-y += memory.o +obj-$(CONFIG_TPM) += tpm.o tpm_tis.o LIBS+=-lz QEMU_CFLAGS += $(VNC_TLS_CFLAGS) diff --git a/configure b/configure index cc5ae87..385feb4 100755 --- a/configure +++ b/configure @@ -185,6 +185,7 @@ opengl="" zlib="yes" guest_agent="yes" libiscsi="" +tpm="no" # parse CC options first for opt do @@ -784,6 +785,8 @@ for opt do ;; --disable-guest-agent) guest_agent="no" ;; + --enable-tpm) tpm="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -1070,6 +1073,7 @@ echo " --disable-usb-redir disable usb network redirection support" echo " --enable-usb-redir enable usb network redirection support" 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 "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2845,6 +2849,7 @@ echo "usb net redir $usb_redir" echo "OpenGL support $opengl" echo "libiscsi support $libiscsi" echo "build guest agent $guest_agent" +echo "TPM support $tpm" if test "$sdl_too_old" = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -3714,6 +3719,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
Build the TPM frontend code that has been added so far. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> --- Makefile.target | 1 + configure | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)