From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsIQC-0003Bf-JT for qemu-devel@nongnu.org; Thu, 27 Jun 2013 16:04:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsIQ4-0006H2-Uh for qemu-devel@nongnu.org; Thu, 27 Jun 2013 16:04:00 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:44025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsIQ4-0006Gl-Ov for qemu-devel@nongnu.org; Thu, 27 Jun 2013 16:03:52 -0400 Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Jun 2013 14:03:51 -0600 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 30B681FF0027 for ; Thu, 27 Jun 2013 13:58:31 -0600 (MDT) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5RK3b8g045312 for ; Thu, 27 Jun 2013 14:03:37 -0600 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5RK5wC9031554 for ; Thu, 27 Jun 2013 14:05:58 -0600 Message-ID: <51CC9A90.2020508@linux.vnet.ibm.com> Date: Thu, 27 Jun 2013 16:03:28 -0400 From: "Michael R. Hines" MIME-Version: 1.0 References: <1372362818-4740-1-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1372362818-4740-1-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] linux-user: Fix compilation failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Anthony Liguori , patches@linaro.org, "Michael R. Hines" , qemu-devel@nongnu.org, Juan Quintela 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 > --- > 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); Thanks for the quick patch =) - Michael