From patchwork Wed Mar 16 10:46:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8597581 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 E8CF09F44D for ; Wed, 16 Mar 2016 10:47:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0540B202F0 for ; Wed, 16 Mar 2016 10:47:21 +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 2C34A20304 for ; Wed, 16 Mar 2016 10:47:20 +0000 (UTC) Received: from localhost ([::1]:54899 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8z1-0002aB-Kt for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Mar 2016 06:47:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8yp-0002Yo-BY for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag8ym-0001v5-LL for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:07 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:37710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8ym-0001up-B3 for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:04 -0400 Received: by mail-wm0-x230.google.com with SMTP id p65so66026883wmp.0 for ; Wed, 16 Mar 2016 03:47:04 -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=beYjbhj6naKcKldIch7EdQuLSwTR+KzQ+RS0W0zmbp8=; b=D3DK30NxfAYQi/tVivq5HRq/KYmHxTHkhh413CXLMauvcrVrwV0ZwDQ+JWL49SfI1C VIhecvoTb8xpIIyG4oSa1uVUCrZbeNPZxVqOy9+cV8H6Sf0oIToSL4FhbVVRtRjrj2Cr MOLPcie3BsgipZnaVitwteBfy6wn3mCmiWE3v71mBMHsIwiVv2jsoeJ3x0xl/5RRIaZe YsqAUNnNk6UFvDyIPXmb6bZkqw2f6JTmyYYWqhvIDOZOVXkiNCLyk8yjMWf82xrMMfeK uIc1SsFooRFGFLQLQo+/EY1uh8pRhQYGfg1hMhOBayB+2q6i47hcTZrvUjgJWR+KF6aI FFtw== 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=beYjbhj6naKcKldIch7EdQuLSwTR+KzQ+RS0W0zmbp8=; b=l0fUQk142oyW/fb7Rv29iA2qseYQlwsL0GnqH/CahrQGJhyLMxIHakqr62r1SlZjs8 DFOd9bET/bnBviQoTjvjom/XYhftz/oRPq6EhvyMyB3tVYufhF7R9OprmWWHutHgMIMh QX4bajrZUbzobHV07G9jOQKY8fS1Ogtq9aO7Rh32nLqlK2CBb4CD3O4dBd7EhpvB9toI f/7iiEAJa6+3IewZZDrPSfjDia3U2zl3tihGn+PdrSRHdvUDIniD4ie6ysOCF1ZvU7q2 moGXGNMTn0Kqmcu30PoO8YI5zKcXToRAObPwpK9hLgEoTesYF8KZONjYBrlQboxJ+Euy OaiQ== X-Gm-Message-State: AD7BkJIzqvZsZ6JDlWvgS9Ub8XppQdwz1uZDqzEjsTJqSQy1dA341sR+q0bVEwy3llAKow== X-Received: by 10.28.65.137 with SMTP id o131mr3767917wma.54.1458125223638; Wed, 16 Mar 2016 03:47:03 -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.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2016 03:47:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 11:46:11 +0100 Message-Id: <1458125219-131698-2-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::230 Subject: [Qemu-devel] [PATCH 01/49] include: move CPU-related definitions out of qemu-common.h 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 Signed-off-by: Paolo Bonzini --- hw/core/qdev-properties.c | 1 + include/qemu-common.h | 24 ------------------------ include/qemu/timer.h | 1 + include/qom/cpu.h | 9 +++++++++ include/sysemu/cpus.h | 13 +++++++++++++ stubs/cpu-get-icount.c | 1 + translate-common.c | 1 + vl.c | 1 + 8 files changed, 27 insertions(+), 24 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index a8c77ec..e775642 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -7,6 +7,7 @@ #include "qemu/error-report.h" #include "sysemu/block-backend.h" #include "hw/block/block.h" +#include "hw/pci/pci.h" #include "net/hub.h" #include "qapi/visitor.h" #include "sysemu/char.h" diff --git a/include/qemu-common.h b/include/qemu-common.h index bbb45b2..eccdb07 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -23,17 +23,6 @@ #include "qemu/option.h" #include "qemu/host-utils.h" -void cpu_ticks_init(void); - -/* icount */ -void configure_icount(QemuOpts *opts, Error **errp); -extern int use_icount; -extern int icount_align_option; -/* drift information for info jit command */ -extern int64_t max_delay; -extern int64_t max_advance; -void dump_drift_info(FILE *f, fprintf_function cpu_fprintf); - #include "qemu/bswap.h" /* FIXME: Remove NEED_CPU_H. */ @@ -299,19 +288,6 @@ bool tcg_enabled(void); void cpu_exec_init_all(void); -/* Unblock cpu */ -void qemu_cpu_kick_self(void); - -/* work queue */ -struct qemu_work_item { - struct qemu_work_item *next; - void (*func)(void *data); - void *data; - int done; - bool free; -}; - - /** * Sends a (part of) iovec down a socket, yielding when the socket is full, or * Receives data into a (part of) iovec from a socket, diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 59a7169..c37f74d 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -4,6 +4,7 @@ #include "qemu-common.h" #include "qemu/notify.h" #include "qemu/host-utils.h" +#include "sysemu/cpus.h" #define NANOSECONDS_PER_SECOND 1000000000LL diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 0b6fa25..bd51691 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -223,6 +223,15 @@ struct kvm_run; #define TB_JMP_CACHE_BITS 12 #define TB_JMP_CACHE_SIZE (1 << TB_JMP_CACHE_BITS) +/* work queue */ +struct qemu_work_item { + struct qemu_work_item *next; + void (*func)(void *data); + void *data; + int done; + bool free; +}; + /** * CPUState: * @cpu_index: CPU index (informative). diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index 3d1e5ba..fe992a8 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -7,6 +7,19 @@ void qemu_init_cpu_loop(void); void resume_all_vcpus(void); void pause_all_vcpus(void); void cpu_stop_current(void); +void cpu_ticks_init(void); + +void configure_icount(QemuOpts *opts, Error **errp); +extern int use_icount; +extern int icount_align_option; + +/* drift information for info jit command */ +extern int64_t max_delay; +extern int64_t max_advance; +void dump_drift_info(FILE *f, fprintf_function cpu_fprintf); + +/* Unblock cpu */ +void qemu_cpu_kick_self(void); void cpu_synchronize_all_states(void); void cpu_synchronize_all_post_reset(void); diff --git a/stubs/cpu-get-icount.c b/stubs/cpu-get-icount.c index 3a6f2ab..2e8b63b 100644 --- a/stubs/cpu-get-icount.c +++ b/stubs/cpu-get-icount.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/timer.h" +#include "sysemu/cpus.h" int use_icount; diff --git a/translate-common.c b/translate-common.c index ffbfe85..5e989cd 100644 --- a/translate-common.c +++ b/translate-common.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qom/cpu.h" +#include "sysemu/cpus.h" uintptr_t qemu_real_host_page_size; intptr_t qemu_real_host_page_mask; diff --git a/vl.c b/vl.c index 7a28982..62f9a9c 100644 --- a/vl.c +++ b/vl.c @@ -86,6 +86,7 @@ int main(int argc, char **argv) #include "sysemu/dma.h" #include "audio/audio.h" #include "migration/migration.h" +#include "sysemu/cpus.h" #include "sysemu/kvm.h" #include "qapi/qmp/qjson.h" #include "qemu/option.h"