[Qemu-devel] [PATCH] linux-user: Fix compilation failure

[Qemu-devel] [PATCH] linux-user: Fix compilation failure

[Peter Maydell]

Fix compilation failures for linux-user targets following recent
migration related commits bd2fa51fcd and 43487c67.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
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 <migration/qemu-file.h>
+#endif
 
 typedef void SaveStateHandler(QEMUFile *f, void *opaque);
 typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
-- 
1.7.9.5

Re: [Qemu-devel] [PATCH] linux-user: Fix compilation failure

[Michael R. Hines]

On 06/27/2013 03:53 PM, Peter Maydell wrote:
> Fix compilation failures for linux-user targets following recent
> migration related commits bd2fa51fcd and 43487c67.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> 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 <migration/qemu-file.h>
> +#endif
>
>   typedef void SaveStateHandler(QEMUFile *f, void *opaque);
>   typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);

Thanks for the quick patch =)

- Michael

Re: [Qemu-devel] [PATCH] linux-user: Fix compilation failure

[Anthony Liguori]

Applied.  Thanks.

Regards,

Anthony Liguori