[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v6 4/6] Qemu-Xen-vTPM: Move tpm_passthrough_is_s
From: |
Xu, Quan |
Subject: |
Re: [Qemu-devel] [PATCH v6 4/6] Qemu-Xen-vTPM: Move tpm_passthrough_is_selftest() into tpm_util.c |
Date: |
Tue, 5 May 2015 02:33:12 +0000 |
> -----Original Message-----
> From: Stefan Berger [mailto:address@hidden
> Sent: Monday, May 04, 2015 11:26 PM
> To: Xu, Quan; address@hidden; address@hidden
> Cc: address@hidden; address@hidden; address@hidden;
> address@hidden
> Subject: Re: [PATCH v6 4/6] Qemu-Xen-vTPM: Move
> tpm_passthrough_is_selftest() into tpm_util.c
>
> On 05/04/2015 03:22 AM, Quan Xu wrote:
> > and rename it to tpm_util_is_selftest().
> >
> > Signed-off-by: Quan Xu <address@hidden>
> Reviewed-by: Stefan Berger <address@hidden>
>
> Thanks,
> Stefan
>
Stefan, thanks for your help and review.
thanks
Quan
>
>
>
> >
> > --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 <address@hidden>
> > + *
> > + * Copyright (c) 2010 - 2013 IBM Corporation
> > + * Authors:
> > + * Stefan Berger <address@hidden>
> > + *
> > + * 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
> > +<http://www.gnu.org/licenses/> */
> > +
> > +#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,
- Re: [Qemu-devel] [PATCH v6 3/6] Qemu-Xen-vTPM: Xen frontend driver infrastructure, (continued)
- Re: [Qemu-devel] [PATCH v6 3/6] Qemu-Xen-vTPM: Xen frontend driver infrastructure, Xu, Quan, 2015/05/04
- Re: [Qemu-devel] [PATCH v6 3/6] Qemu-Xen-vTPM: Xen frontend driver infrastructure, Stefan Berger, 2015/05/04
- Re: [Qemu-devel] [PATCH v6 3/6] Qemu-Xen-vTPM: Xen frontend driver infrastructure, Xu, Quan, 2015/05/11
- Re: [Qemu-devel] [PATCH v6 3/6] Qemu-Xen-vTPM: Xen frontend driver infrastructure, Stefan Berger, 2015/05/11
- Re: [Qemu-devel] [PATCH v6 3/6] Qemu-Xen-vTPM: Xen frontend driver infrastructure, Xu, Quan, 2015/05/11
Re: [Qemu-devel] [PATCH v6 3/6] Qemu-Xen-vTPM: Xen frontend driver infrastructure, Stefano Stabellini, 2015/05/08
[Qemu-devel] [PATCH v6 4/6] Qemu-Xen-vTPM: Move tpm_passthrough_is_selftest() into tpm_util.c, Quan Xu, 2015/05/04
[Qemu-devel] [PATCH v6 2/6] Qemu-Xen-vTPM: Xen frontend driver infrastructure, Quan Xu, 2015/05/04
Re: [Qemu-devel] [PATCH v6 2/6] Qemu-Xen-vTPM: Xen frontend driver infrastructure, Stefano Stabellini, 2015/05/08
[Qemu-devel] [PATCH v6 5/6] Qemu-Xen-vTPM: Qemu vTPM xenstubdoms backen., Quan Xu, 2015/05/04
[Qemu-devel] [PATCH v6 6/6] Qemu-Xen-vTPM: QEMU machine class is initialized before tpm_init(), Quan Xu, 2015/05/04