From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1wyj-0006xM-Ti for qemu-devel@nongnu.org; Tue, 10 Oct 2017 12:02:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1wye-0004rm-6A for qemu-devel@nongnu.org; Tue, 10 Oct 2017 12:01:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43114) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1wye-0004rW-0S for qemu-devel@nongnu.org; Tue, 10 Oct 2017 12:01:52 -0400 Date: Tue, 10 Oct 2017 12:01:50 -0400 (EDT) From: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Message-ID: <1536039278.28241921.1507651310809.JavaMail.zimbra@redhat.com> In-Reply-To: References: <20171009225623.29232-1-marcandre.lureau@redhat.com> <20171009225623.29232-18-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 17/42] tpm-tis: move TPMState to TIS header List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Berger Cc: qemu-devel@nongnu.org, amarnath valluri ----- Original Message ----- > On 10/09/2017 06:55 PM, Marc-Andr=C3=A9 Lureau wrote: > > Signed-off-by: Marc-Andr=C3=A9 Lureau > > --- > > hw/tpm/tpm_int.h | 23 ++--------------------- > > hw/tpm/tpm_tis.h | 19 +++++++++++++++++++ > > hw/tpm/tpm_util.c | 1 + > > 3 files changed, 22 insertions(+), 21 deletions(-) > > > > diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h > > index 252c4082ef..e231d0eb4f 100644 > > --- a/hw/tpm/tpm_int.h > > +++ b/hw/tpm/tpm_int.h > > @@ -12,28 +12,9 @@ > > #ifndef TPM_TPM_INT_H > > #define TPM_TPM_INT_H > > =20 > > -#include "exec/memory.h" > > -#include "tpm_tis.h" > > +#include "qemu/osdep.h" > > =20 > > -/* overall state of the TPM interface */ > > -struct TPMState { > > - ISADevice busdev; > > - MemoryRegion mmio; > > - > > - union { > > - TPMTISEmuState tis; > > - } s; > > - > > - TPMBackendCmd cmd; > > - > > - char *backend; > > - TPMBackend *be_driver; > > - TPMVersion be_tpm_version; > > -}; > > - > > -#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS) > > - > > -#define TPM_STANDARD_CMDLINE_OPTS \ > > +#define TPM_STANDARD_CMDLINE_OPTS \ > > { \ > > .name =3D "type", \ > > .type =3D QEMU_OPT_STRING, \ > > diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h > > index 31e612a7f4..30e35eef64 100644 > > --- a/hw/tpm/tpm_tis.h > > +++ b/hw/tpm/tpm_tis.h > > @@ -72,4 +72,23 @@ typedef struct TPMTISEmuState { > > uint32_t irq_num; > > } TPMTISEmuState; > > =20 > > +/* overall state of the TPM interface */ > > +struct TPMState { > > + ISADevice busdev; > > + MemoryRegion mmio; > > + > > + union { > > + TPMTISEmuState tis; > > + } s; > > + > > + uint8_t locty_number; >=20 > This one probably shouldn't be here at this point. You seem to have > added it in the move? >=20 good catch, removed Thanks