From patchwork Mon May 16 15:35:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9103851 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 9F11F9F1C1 for ; Mon, 16 May 2016 15:37:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D221620274 for ; Mon, 16 May 2016 15:37:20 +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 EBD3720166 for ; Mon, 16 May 2016 15:37:19 +0000 (UTC) Received: from localhost ([::1]:44421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2Ka6-00029x-VY for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 May 2016 11:37:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KZQ-0001Na-Lt for qemu-devel@nongnu.org; Mon, 16 May 2016 11:36:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2KZK-0006VD-5G for qemu-devel@nongnu.org; Mon, 16 May 2016 11:36:35 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:36139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KZJ-0006Uz-D6 for qemu-devel@nongnu.org; Mon, 16 May 2016 11:36:30 -0400 Received: by mail-wm0-x242.google.com with SMTP id w143so18870598wmw.3 for ; Mon, 16 May 2016 08:36:29 -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 :mime-version:content-transfer-encoding; bh=xas+Z+BqeRl8FrSBKhgZLuGkBxUNsMXAHez0dh7A3Ck=; b=vCCBDBc1uzNH7ZgVfRPS/ChfDpT3IekaWGxGV0TAXzchq23m8Tj355T0esSMZa/dqv e7fwSpIoZ8rneJGx94P8+GAEZMoHmM5+l7fni3FV8HdGbUyqQ7ccjqq70tDTeyu9NdLt 5dNKf0jU9ATqZ6f/cORhaNRCPBhSnZQpW7T8UUACfMu5+atN5zstPfgpAM2ZP6BJZjnt Z6EqzMDnReTGX1SPjRtxZmvpChoNVyWb6GeZYlyE0SoBDoDaQC9evoYcQN4hok1IPE1S LUvHWlykJAJCi1iHio/f62Lbh4IxmdQf+CmkJSR/e/WNxEClEstvD1yOQABKlAikFmrq I/dA== 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:mime-version:content-transfer-encoding; bh=xas+Z+BqeRl8FrSBKhgZLuGkBxUNsMXAHez0dh7A3Ck=; b=he/bwG56YKejXnBAE85mu9nl909nfrl2pJQNIyX8h1VGzlcoTH9NkltetxLaYXsRLa BUzkYKGol4jL3PY/WNj5enYBxbk9PDiPUE9jr/Jph0afmgm6q22bVOgi312MhninS4Pf oS7OKT4+UIwYDoUYS/H2PWMF4FxnlGCXsn0OcXF/81HXYwn5VlLr4JEK3E+0gIDNwuhg WQqtLOXd4D/jW7NbTTSAPg7l2g2xLLCPUgeuTvXfEjsWLCeJdXzXfUdPMaEMDQT3aA5z eWIRXNhOOcnyQz1tjBU2h8OGs9jStBjm37zIuwFNShq0pjsNRZMqAZ19KJ9uSlhXoCYp gh6g== X-Gm-Message-State: AOPr4FV9/rZfaV8kRpVNJ0+8zGpCVeGsGxI9Rve8crL8/j2ZvbiHqfLAN4ij60etyRJjVg== X-Received: by 10.28.37.129 with SMTP id l123mr19847910wml.1.1463412988702; Mon, 16 May 2016 08:36:28 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id lf9sm34386875wjc.44.2016.05.16.08.36.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 May 2016 08:36:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 16 May 2016 17:35:34 +0200 Message-Id: <1463412982-6681-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463412982-6681-1-git-send-email-pbonzini@redhat.com> References: <1463412982-6681-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH 02/50] include: move CPU-related definitions out of qemu-common.h 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 Reviewed-by: Alex Bennée Signed-off-by: Paolo Bonzini --- 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 + 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index 163bcbb..f0d74076 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. */ @@ -100,19 +89,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 471969a..309f3d0 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 b7a10f7..ab38ce1 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -222,6 +222,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 5fd22cb..9eed187 100644 --- a/vl.c +++ b/vl.c @@ -87,6 +87,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"