From patchwork Thu Jun 27 19:53:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18174 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f199.google.com (mail-gh0-f199.google.com [209.85.160.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C92F825E0D for ; Thu, 27 Jun 2013 19:53:46 +0000 (UTC) Received: by mail-gh0-f199.google.com with SMTP id g14sf1468986ghb.6 for ; Thu, 27 Jun 2013 12:53:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=bKBbKutgE3p4WH9WMzW9nllm6vM2K8Vg6RicXCgj1iI=; b=DKKvyPCvYHaY8G+ZOtDNowoUmHvvRe7/3OygEZDqZSg/NUzexVkuMkjw891YjxFRMf PjdF2yXjQCx3fQkjdcZxwN4k5Sk3isnfGxo3PwtL0mg82IEWinwcuyjnW0VaZF1EVMq3 JGgjuGMTzr6y6zq1f/UjmSnhWo2kfeCSRibSPxH8evNJh7lRJ7mHzNezrVVthM3Cuk0f w2RoDYYFnTmp1JVIh+yuC46ZQcbYGPJ58JOGC/wyI2huLyDvGh7IjCVSkG3rBc85umgF KJvAhR4qA8uixeBKPnx2RobTPUZkZxE2vnY0WzwpqnKEHq6UPxlbD+RzJePZilLVrQ5m MOWw== X-Received: by 10.236.78.198 with SMTP id g46mr5656665yhe.56.1372362826209; Thu, 27 Jun 2013 12:53:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.50.167 with SMTP id d7ls979240qeo.25.gmail; Thu, 27 Jun 2013 12:53:46 -0700 (PDT) X-Received: by 10.52.165.83 with SMTP id yw19mr3497052vdb.98.1372362825996; Thu, 27 Jun 2013 12:53:45 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id f8si1176387vec.47.2013.06.27.12.53.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Jun 2013 12:53:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id pb11so1109589veb.37 for ; Thu, 27 Jun 2013 12:53:45 -0700 (PDT) X-Received: by 10.58.215.200 with SMTP id ok8mr4239021vec.21.1372362825888; Thu, 27 Jun 2013 12:53:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp162582veb; Thu, 27 Jun 2013 12:53:45 -0700 (PDT) X-Received: by 10.195.12.18 with SMTP id em18mr7300218wjd.78.1372362824203; Thu, 27 Jun 2013 12:53:44 -0700 (PDT) Received: from mnementh.archaic.org.uk (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]) by mx.google.com with ESMTPS id z10si1564201wje.169.2013.06.27.12.53.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 27 Jun 2013 12:53:44 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1UsIGA-0001Ev-IH; Thu, 27 Jun 2013 20:53:38 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , Juan Quintela , "Michael R. Hines" Subject: [PATCH] linux-user: Fix compilation failure Date: Thu, 27 Jun 2013 20:53:38 +0100 Message-Id: <1372362818-4740-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkf7XsYOk23RlUf6/zveNzgSXvesp8ubpCQwKS3bZPEpbviEgqJnqJYRaBfM/XtWHGpMy/G X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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);