From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpIFs-0002Be-MR for qemu-devel@nongnu.org; Mon, 04 May 2015 11:26:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YpIFp-0001FI-L9 for qemu-devel@nongnu.org; Mon, 04 May 2015 11:26:00 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:54763) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpIFp-0001FD-EM for qemu-devel@nongnu.org; Mon, 04 May 2015 11:25:57 -0400 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 May 2015 09:25:56 -0600 Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 9F64E19D8040 for ; Mon, 4 May 2015 09:16:58 -0600 (MDT) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t44FPW4j41550074 for ; Mon, 4 May 2015 08:25:32 -0700 Received: from d03av02.boulder.ibm.com (localhost [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t44FPrm9027820 for ; Mon, 4 May 2015 09:25:53 -0600 Message-ID: <55478F80.4020604@linux.vnet.ibm.com> Date: Mon, 04 May 2015 11:25:52 -0400 From: Stefan Berger MIME-Version: 1.0 References: <1430724181-476-1-git-send-email-quan.xu@intel.com> <1430724181-476-5-git-send-email-quan.xu@intel.com> In-Reply-To: <1430724181-476-5-git-send-email-quan.xu@intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 4/6] Qemu-Xen-vTPM: Move tpm_passthrough_is_selftest() into tpm_util.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Quan Xu , stefano.stabellini@eu.citrix.com, eblake@redhat.com Cc: dgdegra@tycho.nsa.gov, wei.liu2@citrix.com, qemu-devel@nongnu.org, xen-devel@lists.xen.org On 05/04/2015 03:22 AM, Quan Xu wrote: > and rename it to tpm_util_is_selftest(). > > Signed-off-by: Quan Xu Reviewed-by: Stefan Berger Thanks, Stefan > > --Changes in v6: > -Remove the redundant copy right. > -Reduce the includes to its minimum. > --- > hw/tpm/Makefile.objs | 2 +- > hw/tpm/tpm_passthrough.c | 13 +------------ > hw/tpm/tpm_util.c | 39 +++++++++++++++++++++++++++++++++++++++ > include/sysemu/tpm_backend_int.h | 1 + > 4 files changed, 42 insertions(+), 13 deletions(-) > create mode 100644 hw/tpm/tpm_util.c > > diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs > index 57919fa..e8fca65 100644 > --- a/hw/tpm/Makefile.objs > +++ b/hw/tpm/Makefile.objs > @@ -1,3 +1,3 @@ > -common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o > +common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o tpm_util.o > common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o > common-obj-$(CONFIG_TPM_XENSTUBDOMS) += xen_vtpm_frontend.o > diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c > index 2a45071..ff08e15 100644 > --- a/hw/tpm/tpm_passthrough.c > +++ b/hw/tpm/tpm_passthrough.c > @@ -112,17 +112,6 @@ static void tpm_write_fatal_error_response(uint8_t *out, uint32_t out_len) > } > } > > -static bool tpm_passthrough_is_selftest(const uint8_t *in, uint32_t in_len) > -{ > - struct tpm_req_hdr *hdr = (struct tpm_req_hdr *)in; > - > - if (in_len >= sizeof(*hdr)) { > - return (be32_to_cpu(hdr->ordinal) == TPM_ORD_ContinueSelfTest); > - } > - > - return false; > -} > - > static int tpm_passthrough_unix_tx_bufs(TPMPassthruState *tpm_pt, > const uint8_t *in, uint32_t in_len, > uint8_t *out, uint32_t out_len, > @@ -136,7 +125,7 @@ static int tpm_passthrough_unix_tx_bufs(TPMPassthruState *tpm_pt, > tpm_pt->tpm_executing = true; > *selftest_done = false; > > - is_selftest = tpm_passthrough_is_selftest(in, in_len); > + is_selftest = tpm_util_is_selftest(in, in_len); > > ret = tpm_passthrough_unix_write(tpm_pt->tpm_fd, in, in_len); > if (ret != in_len) { > diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c > new file mode 100644 > index 0000000..73be8c5 > --- /dev/null > +++ b/hw/tpm/tpm_util.c > @@ -0,0 +1,39 @@ > +/* > + * TPM util functions > + * > + * * Copyright (c) 2015 Intel Corporation > + * Authors: > + * Quan Xu > + * > + * Copyright (c) 2010 - 2013 IBM Corporation > + * Authors: > + * Stefan Berger > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see > + */ > + > +#include "sysemu/tpm_backend.h" > +#include "tpm_int.h" > +#include "sysemu/tpm_backend_int.h" > + > +bool tpm_util_is_selftest(const uint8_t *in, uint32_t in_len) > +{ > + struct tpm_req_hdr *hdr = (struct tpm_req_hdr *)in; > + > + if (in_len >= sizeof(*hdr)) { > + return (be32_to_cpu(hdr->ordinal) == TPM_ORD_ContinueSelfTest); > + } > + > + return false; > +} > diff --git a/include/sysemu/tpm_backend_int.h b/include/sysemu/tpm_backend_int.h > index 05d94d0..e18acab 100644 > --- a/include/sysemu/tpm_backend_int.h > +++ b/include/sysemu/tpm_backend_int.h > @@ -34,6 +34,7 @@ void tpm_backend_thread_create(TPMBackendThread *tbt, > void tpm_backend_thread_end(TPMBackendThread *tbt); > void tpm_backend_thread_tpm_reset(TPMBackendThread *tbt, > GFunc func, gpointer user_data); > +bool tpm_util_is_selftest(const uint8_t *in, uint32_t in_len); > > typedef enum TPMBackendCmd { > TPM_BACKEND_CMD_INIT = 1,