diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-06-27 20:53:38 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-27 15:38:35 -0500 |
| commit | ec3f8c9913c1eeab78a02711be7c2a803dfb4d62 (patch) | |
| tree | 83cb20503769dc850673302db6d4e66c7e8a24cc | |
| parent | c394ace828a559be13ec0bde15b476970f186dad (diff) | |
linux-user: Fix compilation failure
Fix compilation failures for linux-user targets following recent
migration related commits bd2fa51fcd and 43487c67.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1372362818-4740-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | exec.c | 2 | ||||
| -rw-r--r-- | include/hw/hw.h | 1 | ||||
| -rw-r--r-- | include/migration/vmstate.h | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -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 cc9f847ea6..33bdb92712 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 ebc4d09141..1c31b5d6fb 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 <migration/qemu-file.h> +#endif typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); |