From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVmfY-00046R-Nd for qemu-devel@nongnu.org; Wed, 11 Mar 2015 15:51:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVmfS-0005RJ-Hj for qemu-devel@nongnu.org; Wed, 11 Mar 2015 15:51:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59809) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVmfS-0005R8-AQ for qemu-devel@nongnu.org; Wed, 11 Mar 2015 15:51:46 -0400 Date: Wed, 11 Mar 2015 20:51:41 +0100 From: "Michael S. Tsirkin" Message-ID: <20150311205141-mutt-send-email-mst@redhat.com> References: <1426096767-30494-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1426096767-30494-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 20/25] exec: don't include hw/boards for linux-user List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?us-ascii?B?PT9VVEYtOD9xP0FuZHJlYXM9MjBGPUMzPUE0cmJlcj89?= , Paolo Bonzini 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=E4rber Cc: Peter Maydell Signed-off-by: Michael S. Tsirkin Reviewed-by: Andreas F=E4rber --- 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 =20 -#if !defined(CONFIG_USER_ONLY) - #include "qemu/typedefs.h" #include "sysemu/blockdev.h" #include "sysemu/accel.h" @@ -158,5 +156,3 @@ struct MachineState { }; =20 #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" --=20 MST