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>

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

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"
 

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);