From patchwork Wed Mar 16 10:46:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8598441 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 305119F3D1 for ; Wed, 16 Mar 2016 11:09:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4FB1F202AE for ; Wed, 16 Mar 2016 11:09:07 +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 634302022A for ; Wed, 16 Mar 2016 11:09:06 +0000 (UTC) Received: from localhost ([::1]:55120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag9K5-0008J7-KJ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Mar 2016 07:09:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8zP-0003bk-Ui for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag8zN-0002Fu-PH for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:43 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:35743) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8zN-0002Fo-Co for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:41 -0400 Received: by mail-wm0-x22d.google.com with SMTP id l68so183370911wml.0 for ; Wed, 16 Mar 2016 03:47:41 -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=GETPlDXR3qxLeOI7BQdU6q1iA/Y7/J9Fp0runJ6b9hc=; b=Yrkx0j4yI/fqjLp3M4lz2KTo1Jm//RZHs1/37FwBrmszxSkdLNgmTV9CnikzYNVPT6 nutFCKiknTl93LaTn3BOtvn0LZtvEYLOyrz+FzdUVACoBXA9LBJ7FtYqoigZ5YntJhWb NOSUQJsuECpCvNCytnxogdZQ1gMU9tqEVpQaW5S+qy/6tk0IPQ2TCOQSuoD8eKyGmH2x 8p+ZJ6nKoCYigG5BY4pDOANDOJeadnifshe31W4SNofOJ9d5h7fS8dsRn5+VYQBQgOnX nk1HFhYemz3+8QaIcqnjfLOOAevUMaZ3awHrd+76mjxJ49dnoJ2GixI9m9M4YuOgeR22 VKig== 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=GETPlDXR3qxLeOI7BQdU6q1iA/Y7/J9Fp0runJ6b9hc=; b=OYbyk/G7HbAv9JbTUGNQxxLDSBnCtYdQfqvyR6GLMZQ/OXzNdsyCeSDatn1+v7FVp3 sA2efWdfeeZOWraIjBjl8Q9Tnu9rHHHaFafc74Bz6kUT0j4PpTbnlwnVrJE+fpal/wVn 2b4znUeVZhp9U7m5ypJhSiYd9lJX4cZxXjjp2irW9KFsA6Othquf6nOs8LMD4fBZ+O/j W+Sb/QB3lNmGV0GUJ9wwYqvD14VDTBfb4dvPC0zl3L4EchDUZj6DrYzyk/a/uoH2hqOi /D9w1xDmMgVOgp/lnfRvwD/ANVDcowNdXVR397IizHCYcXe3s5+HS/Cq+hM/1DSgbtdK RdrQ== X-Gm-Message-State: AD7BkJK/vGQ4DASr1QeK/il+dWBaTNtNvUDVpxubCJbXikcu7srJQctrUhtQo9PSdrx3OA== X-Received: by 10.28.179.84 with SMTP id c81mr28528285wmf.13.1458125260756; Wed, 16 Mar 2016 03:47:40 -0700 (PDT) Received: from 640k.lan (94-39-161-17.adsl-ull.clienti.tiscali.it. [94.39.161.17]) by smtp.gmail.com with ESMTPSA id wr2sm2418094wjc.49.2016.03.16.03.47.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2016 03:47:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 11:46:45 +0100 Message-Id: <1458125219-131698-36-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> References: <1458125219-131698-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::22d Subject: [Qemu-devel] [PATCH 35/49] hw: cannot include hw/hw.h from user emulation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org 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 f0d1667..10408f2 100644 --- a/exec.c +++ b/exec.c @@ -25,23 +25,23 @@ #include "qemu-common.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 0f38d1e..30bf437 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -33,7 +33,6 @@ #include "qapi/visitor.h" #include "sysemu/arch_init.h" -#include "hw/hw.h" #if defined(CONFIG_KVM) #include #endif @@ -42,6 +41,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 9746b1d..2d491fb 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -29,10 +29,11 @@ #include "qemu-common.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"