From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:58626)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1URm64-0001xA-SF
	for qemu-devel@nongnu.org; Mon, 15 Apr 2013 12:17:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1URm62-0005p4-1E
	for qemu-devel@nongnu.org; Mon, 15 Apr 2013 12:17:36 -0400
Received: from mx1.redhat.com ([209.132.183.28]:30535)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1URm61-0005ox-Pj
	for qemu-devel@nongnu.org; Mon, 15 Apr 2013 12:17:33 -0400
Message-ID: <516C28A4.7000800@redhat.com>
Date: Mon, 15 Apr 2013 18:19:48 +0200
From: Laszlo Ersek <lersek@redhat.com>
MIME-Version: 1.0
References: <1366031973-7718-1-git-send-email-pbonzini@redhat.com>
	<1366031973-7718-9-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1366031973-7718-9-git-send-email-pbonzini@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 08/12] tpm: reorganize headers and split
 hardware part
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org

On 04/15/13 15:19, Paolo Bonzini wrote:

> diff --git a/include/backends/tpm.h b/include/backends/tpm.h
> index 9e93cc5..a96b110 100644
> --- a/include/backends/tpm.h
> +++ b/include/backends/tpm.h
> @@ -18,7 +18,7 @@
>  #include "qapi/error.h"
>  #include "qapi-types.h"
>  #include "qemu/option.h"
> -#include "tpm/tpm.h"
> +#include "sysemu/tpm.h"
>  
>  #define TYPE_TPM_BACKEND "tpm-backend"
>  #define TPM_BACKEND(obj) \
> @@ -30,6 +30,7 @@
>  
>  typedef struct TPMBackendClass TPMBackendClass;
>  typedef struct TPMBackend TPMBackend;
> +typedef struct TPMState TPMState;
>  
>  typedef struct TPMDriverOps TPMDriverOps;
>  

This breaks the build for me:

include/sysemu/tpm_backend.h:33: error: redefinition of typedef 'TPMState'
include/sysemu/tpm.h:17: note: previous declaration of 'TPMState' was here

The prev decl. is from 8f0605cc.

"include/sysemu/tpm.h" seems like a "more common" header, so suggesting
to drop the typedef from the backend. Anyway the x86_64 default config
build completes that way.

Thanks,
Laszlo

diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index a96b110..4667874 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -30,7 +30,6 @@

 typedef struct TPMBackendClass TPMBackendClass;
 typedef struct TPMBackend TPMBackend;
-typedef struct TPMState TPMState;

 typedef struct TPMDriverOps TPMDriverOps;