From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsIGL-00071H-D8 for qemu-devel@nongnu.org; Thu, 27 Jun 2013 15:53:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsIGH-0002ec-0U for qemu-devel@nongnu.org; Thu, 27 Jun 2013 15:53:49 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:58300 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsIGG-0002eQ-QI for qemu-devel@nongnu.org; Thu, 27 Jun 2013 15:53:44 -0400 From: Peter Maydell Date: Thu, 27 Jun 2013 20:53:38 +0100 Message-Id: <1372362818-4740-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] linux-user: Fix compilation failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Juan Quintela , "Michael R. Hines" , patches@linaro.org Fix compilation failures for linux-user targets following recent migration related commits bd2fa51fcd and 43487c67. Signed-off-by: Peter Maydell --- Longer term we should probably try to disentangle migration from user-mode emulators a bit better (eg hw.h should probably not pull in any of the migration headers if CONFIG_USER_ONLY); this is a minimal patch which fixes the compilation failures. exec.c | 2 +- include/hw/hw.h | 1 - include/migration/vmstate.h | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 2e6fc00..f99041b 100644 --- a/exec.c +++ b/exec.c @@ -2629,7 +2629,6 @@ bool cpu_physical_memory_is_io(hwaddr phys_addr) return !(memory_region_is_ram(mr) || memory_region_is_romd(mr)); } -#endif void qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) { @@ -2639,3 +2638,4 @@ void qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) func(block->host, block->offset, block->length, opaque); } } +#endif diff --git a/include/hw/hw.h b/include/hw/hw.h index cc9f847..33bdb92 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -11,7 +11,6 @@ #include "exec/ioport.h" #include "hw/irq.h" #include "block/aio.h" -#include "migration/qemu-file.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index ebc4d09..1c31b5d 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -26,7 +26,9 @@ #ifndef QEMU_VMSTATE_H #define QEMU_VMSTATE_H 1 +#ifndef CONFIG_USER_ONLY #include +#endif typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); -- 1.7.9.5