From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53071)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1YVakr-0003a8-4c
	for qemu-devel@nongnu.org; Wed, 11 Mar 2015 03:08:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1YVakn-0002Hv-0d
	for qemu-devel@nongnu.org; Wed, 11 Mar 2015 03:08:33 -0400
Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:33050)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1YVakm-0002Hn-PU
	for qemu-devel@nongnu.org; Wed, 11 Mar 2015 03:08:28 -0400
Received: by widfb4 with SMTP id fb4so24517923wid.0
	for <qemu-devel@nongnu.org>; Wed, 11 Mar 2015 00:08:28 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <54FFE9E7.4070901@redhat.com>
Date: Wed, 11 Mar 2015 08:08:23 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <20150311075850-mutt-send-email-mst@redhat.com>
In-Reply-To: <20150311075850-mutt-send-email-mst@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH] exec: don't include hw/boards for
	linux-user
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: "Michael S. Tsirkin" <mst@redhat.com>, qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>, =?windows-1252?Q?Andreas_?= =?windows-1252?Q?F=E4rber?= <afaerber@suse.de>



On 11/03/2015 07:58, Michael S. Tsirkin wrote:
> As noted by Andreas, hw/boards.h shouldn't be used outside softmmu code.
> Include it conditionally, and drop the (now unnecessary) ifdef guards in
> hw/boards.h
> 
> Reported-by: Andreas Färber <afaerber@suse.de>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  include/hw/boards.h | 4 ----
>  exec.c              | 2 ++
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index cd6deb0..f44d6f5 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -3,8 +3,6 @@
>  #ifndef HW_BOARDS_H
>  #define HW_BOARDS_H
>  
> -#if !defined(CONFIG_USER_ONLY)
> -
>  #include "qemu/typedefs.h"
>  #include "sysemu/blockdev.h"
>  #include "sysemu/accel.h"
> @@ -158,5 +156,3 @@ struct MachineState {
>  };
>  
>  #endif
> -
> -#endif
> diff --git a/exec.c b/exec.c
> index fe64009..bc37c7b 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -26,7 +26,9 @@
>  #include "cpu.h"
>  #include "tcg.h"
>  #include "hw/hw.h"
> +#if !defined(CONFIG_USER_ONLY)
>  #include "hw/boards.h"
> +#endif
>  #include "hw/qdev.h"
>  #include "qemu/osdep.h"
>  #include "sysemu/kvm.h"
> 

Acked-by: Paolo Bonzini <pbonzini@redhat.com>