Patchwork tpm: Fix several compiler warnings (redefined data types)

login
register
mail settings
Submitter Stefan Weil
Date April 2, 2013, 8:14 p.m.
Message ID <1364933691-21197-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/233133/
State Accepted
Headers show

Comments

Stefan Weil - April 2, 2013, 8:14 p.m.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 tpm/tpm_int.h |    9 ++-------
 tpm/tpm_tis.h |    4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)
Stefan Berger - April 3, 2013, 10:39 a.m.
On 04/02/2013 04:14 PM, Stefan Weil wrote:

What compiler and options did you use?

> Signed-off-by: Stefan Weil <sw@weilnetz.de>

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

> ---
>   tpm/tpm_int.h |    9 ++-------
>   tpm/tpm_tis.h |    4 ++--
>   2 files changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/tpm/tpm_int.h b/tpm/tpm_int.h
> index b4787ad..340bfd5 100644
> --- a/tpm/tpm_int.h
> +++ b/tpm/tpm_int.h
> @@ -15,11 +15,8 @@
>   #include "exec/memory.h"
>   #include "tpm/tpm_tis.h"
>
> -struct TPMDriverOps;
> -typedef struct TPMDriverOps TPMDriverOps;
> -
>   /* overall state of the TPM interface */
> -typedef struct TPMState {
> +struct TPMState {
>       ISADevice busdev;
>       MemoryRegion mmio;
>
> @@ -32,12 +29,10 @@ typedef struct TPMState {
>
>       char *backend;
>       TPMBackend *be_driver;
> -} TPMState;
> +};
>
>   #define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
>
> -typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty);
> -
>   struct TPMDriverOps {
>       enum TpmType type;
>       /* get a descriptive text of the backend to display to the user */
> diff --git a/tpm/tpm_tis.h b/tpm/tpm_tis.h
> index 0c8df80..7f216e5 100644
> --- a/tpm/tpm_tis.h
> +++ b/tpm/tpm_tis.h
> @@ -35,10 +35,10 @@
>   #define TYPE_TPM_TIS                "tpm-tis"
>
>
> -typedef struct TPMSizedBuffer {
> +struct TPMSizedBuffer {
>       uint32_t size;
>       uint8_t  *buffer;
> -} TPMSizedBuffer;
> +};
>
>   typedef enum {
>       TPM_TIS_STATE_IDLE = 0,
Stefan Weil - April 3, 2013, 7:52 p.m.
Am 03.04.2013 12:39, schrieb Stefan Berger:
> On 04/02/2013 04:14 PM, Stefan Weil wrote:
>
> What compiler and options did you use?
>

That's the MinGW-w64 cross gdb from Debian Squeeze with QEMU's
default compiler options.

$ amd64-mingw32msvc-gcc --version
amd64-mingw32msvc-gcc (GCC) 4.4.4make: Entering directory
`/qemu/bin/debug/w64'
  CC    tpm/tpm.o
In file included from /qemu/tpm/tpm_int.h:16,
                 from /qemu/tpm/tpm.c:19:
/qemu/tpm/tpm_tis.h:41: error: redefinition of typedef 'TPMSizedBuffer'
/qemu/include/tpm/tpm.h:18: note: previous declaration of
'TPMSizedBuffer' was here
In file included from /qemu/tpm/tpm.c:19:
/qemu/tpm/tpm_int.h:19: error: redefinition of typedef 'TPMDriverOps'
/qemu/include/backends/tpm.h:34: note: previous declaration of
'TPMDriverOps' was here
/qemu/tpm/tpm_int.h:35: error: redefinition of typedef 'TPMState'
/qemu/include/tpm/tpm.h:17: note: previous declaration of 'TPMState' was
here
/qemu/tpm/tpm_int.h:39: error: redefinition of typedef 'TPMRecvDataCB'
/qemu/include/tpm/tpm.h:19: note: previous declaration of
'TPMRecvDataCB' was here
make: *** [tpm/tpm.o] Fehler 1
make: Leaving directory `/qemu/bin/debug/w64'

Copyright (C) 2010 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

QEMU was configured with

./configure' '--cross-prefix=amd64-mingw32msvc-' '--enable-debug'
'--disable-docs'

Regards,

Stefan W.
Anthony Liguori - April 5, 2013, 12:51 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

diff --git a/tpm/tpm_int.h b/tpm/tpm_int.h
index b4787ad..340bfd5 100644
--- a/tpm/tpm_int.h
+++ b/tpm/tpm_int.h
@@ -15,11 +15,8 @@ 
 #include "exec/memory.h"
 #include "tpm/tpm_tis.h"
 
-struct TPMDriverOps;
-typedef struct TPMDriverOps TPMDriverOps;
-
 /* overall state of the TPM interface */
-typedef struct TPMState {
+struct TPMState {
     ISADevice busdev;
     MemoryRegion mmio;
 
@@ -32,12 +29,10 @@  typedef struct TPMState {
 
     char *backend;
     TPMBackend *be_driver;
-} TPMState;
+};
 
 #define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
 
-typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty);
-
 struct TPMDriverOps {
     enum TpmType type;
     /* get a descriptive text of the backend to display to the user */
diff --git a/tpm/tpm_tis.h b/tpm/tpm_tis.h
index 0c8df80..7f216e5 100644
--- a/tpm/tpm_tis.h
+++ b/tpm/tpm_tis.h
@@ -35,10 +35,10 @@ 
 #define TYPE_TPM_TIS                "tpm-tis"
 
 
-typedef struct TPMSizedBuffer {
+struct TPMSizedBuffer {
     uint32_t size;
     uint8_t  *buffer;
-} TPMSizedBuffer;
+};
 
 typedef enum {
     TPM_TIS_STATE_IDLE = 0,