From patchwork Fri Apr 8 20:28:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8786031 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6209CC0553 for ; Fri, 8 Apr 2016 20:50:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8155B202B8 for ; Fri, 8 Apr 2016 20:50:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9AA5B20172 for ; Fri, 8 Apr 2016 20:50:31 +0000 (UTC) Received: from localhost ([::1]:58236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aodMN-0004LS-0K for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 16:50:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod2M-0004Xz-Qq for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aod2L-00029s-Jm for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:50 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:35366) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod2L-00029f-AD for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:49 -0400 Received: by mail-wm0-x243.google.com with SMTP id a140so6839453wma.2 for ; Fri, 08 Apr 2016 13:29:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=jik2quOBIr79o0g98xrt9iFXXxZbT95b9cmZk1jxBNk=; b=Bl3NVDUyfQD+rTsr/16PVh/woHC2mE/If+ObSOJtpTZmJOCJsDrT01qq5Mw3Df8BYg 8yqB4EFoWsljVrPe1CMzDCJmp3PBUtyGMqicO8tg4VSjyyJL+MWjWt6zRhR3gNZU8snL AfUeP06wiUcl9dbPt2vCUvukcRQK32YHq3MVuTBAvKNYaHsDaCaXMIuDciu2iMLy5R8m DTG54LjA/cENG4QuIKwy+lT8kYW+3uot5b6o/PCu+ntPViqmQG+Udj7zZYdjRZ+SlwOO QNXl9DiRVJVXAdPnUw0KUTqe5BjSARsqgMqJ5V+lSAOAeV2fb/e9neX4dRm3NGfkjV1B DlVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=jik2quOBIr79o0g98xrt9iFXXxZbT95b9cmZk1jxBNk=; b=ItRHsRBGf19GRpoYF25XBedXZyt8tY7saur2g+DSL2cw+UtweXI2usaDu4QxoPU6JP 7mL2SGgPgCs4GOEkfcCQa5Bo672R8cVA/ctYTv7BUH2BIeBSA2ssfMBL42ddnav6K17b Gv+TGNgLomgwUh7J8x3Xt/7BHAxgmTvexH33BV5XmvByUGqNI2GbTTo9VKPYj+FKvO68 gCZ02ZzZ6PCmlDLfIjtkyB8147yje8a6jq88XvSw/341TF1YDaacG6pZgy/RxmFLXY4n ifdsKKVZLe1gBeeck8rhn9JFwg16kGhS/tl2dUVZjfrvkD0lqOYsQ54nHeC9vcRe5jUM p/wA== X-Gm-Message-State: AD7BkJJkNcn2XaqrqhRTBvOMojK6dmiR7a9jRebP8gyXWOmJdgHkDw4o946KY+tUbDK7Uw== X-Received: by 10.28.19.140 with SMTP id 134mr5970233wmt.73.1460147388787; Fri, 08 Apr 2016 13:29:48 -0700 (PDT) Received: from 640k.lan (94-39-141-76.adsl-ull.clienti.tiscali.it. [94.39.141.76]) by smtp.gmail.com with ESMTPSA id w10sm3849168wjz.9.2016.04.08.13.29.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Apr 2016 13:29:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 8 Apr 2016 22:28:55 +0200 Message-Id: <1460147350-7601-36-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1460147350-7601-1-git-send-email-pbonzini@redhat.com> References: <1460147350-7601-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH 35/50] hw: cannot include hw/hw.h from user emulation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All qdev definitions are available from other headers, user-mode emulation does not need hw/hw.h. By considering system emulation only, it is simpler to disentangle hw/hw.h from NEED_CPU_H. Signed-off-by: Paolo Bonzini --- exec.c | 21 +++++++++++---------- include/hw/hw.h | 5 +++-- include/hw/ppc/openpic.h | 2 +- kvm-stub.c | 1 - target-i386/cpu.c | 2 +- target-s390x/cpu.c | 3 ++- target-s390x/mem_helper.c | 3 +++ target-s390x/misc_helper.c | 2 +- 8 files changed, 22 insertions(+), 17 deletions(-) diff --git a/exec.c b/exec.c index c4f9036..fbfa02e 100644 --- a/exec.c +++ b/exec.c @@ -25,23 +25,23 @@ #include "qemu/cutils.h" #include "cpu.h" #include "tcg.h" -#include "hw/hw.h" +#include "hw/qdev-core.h" #if !defined(CONFIG_USER_ONLY) #include "hw/boards.h" #endif -#include "hw/qdev.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" #include "hw/xen/xen.h" #include "qemu/timer.h" #include "qemu/config-file.h" #include "qemu/error-report.h" -#include "exec/memory.h" -#include "sysemu/dma.h" -#include "exec/address-spaces.h" #if defined(CONFIG_USER_ONLY) #include #else /* !CONFIG_USER_ONLY */ +#include "hw/hw.h" +#include "exec/memory.h" +#include "sysemu/dma.h" +#include "exec/address-spaces.h" #include "sysemu/xen-mapcache.h" #include "trace.h" #endif @@ -641,7 +641,6 @@ void cpu_exec_exit(CPUState *cpu) void cpu_exec_init(CPUState *cpu, Error **errp) { CPUClass *cc = CPU_GET_CLASS(cpu); - int cpu_index; Error *local_err = NULL; cpu->as = NULL; @@ -668,7 +667,7 @@ void cpu_exec_init(CPUState *cpu, Error **errp) #if defined(CONFIG_USER_ONLY) cpu_list_lock(); #endif - cpu_index = cpu->cpu_index = cpu_get_free_index(&local_err); + cpu->cpu_index = cpu_get_free_index(&local_err); if (local_err) { error_propagate(errp, local_err); #if defined(CONFIG_USER_ONLY) @@ -678,14 +677,16 @@ void cpu_exec_init(CPUState *cpu, Error **errp) } QTAILQ_INSERT_TAIL(&cpus, cpu, node); #if defined(CONFIG_USER_ONLY) + (void) cc; cpu_list_unlock(); -#endif +#else if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { - vmstate_register(NULL, cpu_index, &vmstate_cpu_common, cpu); + vmstate_register(NULL, cpu->cpu_index, &vmstate_cpu_common, cpu); } if (cc->vmsd != NULL) { - vmstate_register(NULL, cpu_index, cc->vmsd, cpu); + vmstate_register(NULL, cpu->cpu_index, cc->vmsd, cpu); } +#endif } #if defined(CONFIG_USER_ONLY) diff --git a/include/hw/hw.h b/include/hw/hw.h index 0456fc3..29931d1 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -3,10 +3,11 @@ #define QEMU_HW_H -#if !defined(CONFIG_USER_ONLY) && !defined(NEED_CPU_H) -#include "exec/cpu-common.h" +#ifdef CONFIG_USER_ONLY +#error Cannot include hw/hw.h from user emulation #endif +#include "exec/cpu-common.h" #include "exec/ioport.h" #include "hw/irq.h" #include "block/aio.h" diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index 1cf188d..afe950b 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -2,7 +2,7 @@ #define __OPENPIC_H__ #include "qemu-common.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "qom/cpu.h" #define TYPE_OPENPIC "openpic" diff --git a/kvm-stub.c b/kvm-stub.c index b962b24..63735a8 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/hw.h" #include "cpu.h" #include "sysemu/kvm.h" diff --git a/target-i386/cpu.c b/target-i386/cpu.c index ddae932..fdef6ed 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -34,7 +34,6 @@ #include "qapi/visitor.h" #include "sysemu/arch_init.h" -#include "hw/hw.h" #if defined(CONFIG_KVM) #include #endif @@ -43,6 +42,7 @@ #include "hw/qdev-properties.h" #ifndef CONFIG_USER_ONLY #include "exec/address-spaces.h" +#include "hw/hw.h" #include "hw/xen/xen.h" #include "hw/i386/apic_internal.h" #endif diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 4bfff34..e665165 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -30,10 +30,11 @@ #include "qemu/cutils.h" #include "qemu/timer.h" #include "qemu/error-report.h" -#include "hw/hw.h" #include "trace.h" #include "qapi/visitor.h" +#include "migration/vmstate.h" #ifndef CONFIG_USER_ONLY +#include "hw/hw.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index 7078622..9d206a9 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -22,7 +22,10 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" + +#if !defined(CONFIG_USER_ONLY) #include "hw/s390x/storage-keys.h" +#endif /*****************************************************************************/ /* Softmmu support */ diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 71cbe34..762dc21 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -30,9 +30,9 @@ #include #endif #include "exec/cpu_ldst.h" -#include "hw/watchdog/wdt_diag288.h" #if !defined(CONFIG_USER_ONLY) +#include "hw/watchdog/wdt_diag288.h" #include "sysemu/cpus.h" #include "sysemu/sysemu.h" #include "hw/s390x/ebcdic.h"