From patchwork Fri Apr 15 14:23:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 8851431 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 878AFBF29F for ; Fri, 15 Apr 2016 14:26:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C0C16202F0 for ; Fri, 15 Apr 2016 14:25:59 +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 E645F202EB for ; Fri, 15 Apr 2016 14:25:58 +0000 (UTC) Received: from localhost ([::1]:35140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar4h4-0004Nk-7c for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Apr 2016 10:25:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar4f5-0000LN-RP for qemu-devel@nongnu.org; Fri, 15 Apr 2016 10:23:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ar4f2-0007Zu-T3 for qemu-devel@nongnu.org; Fri, 15 Apr 2016 10:23:55 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:37144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar4f2-0007Z7-K0 for qemu-devel@nongnu.org; Fri, 15 Apr 2016 10:23:52 -0400 Received: by mail-wm0-x22d.google.com with SMTP id n3so35016090wmn.0 for ; Fri, 15 Apr 2016 07:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Je2Ezd0JvxN/lShoSHtMvs9hGUmyoXevAijF0BI+3WE=; b=j6zn3EUooyZr6Pk4LknucntbYI6CuB9x2tdu8CW9HmH0IWMnEORU03DX6gk0YHPavl k8Bw3tniSBIxmtw5VES+VgqRxfb15kAjFR1nDcnvgKv737hIL+YcdB5ZsxFsm9AhaO43 B0hW7iVaQ84vDo7nak7nAy3uVPzMsDY4k3+5Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Je2Ezd0JvxN/lShoSHtMvs9hGUmyoXevAijF0BI+3WE=; b=W4J6LeUZyuIvC5agKxQEKPyX5tQfc0ZFQ3G87H7oWANY2WyyBXSklpvnywLjSuIL7R sm0vfYQYnVt6+2g724eeuzRXdmnpKfBXWzxXjtLuYjXr/0nDawC+GYt0w/Tc6WRIUp1Q DGvG9vQz8KFYaZy1zBOMsYxyMyN34R2oTza9K3NeW/Hr8Az9glJzwWkU3BrpvZc2Smj5 M9f248QG3BGG0wxDhdVldiQ6jjVpHxzNzttzpZ5/osqvJsamfl/zfmEHsh4J/SX1E+DD 2+dgUd7j9x82wuog1y6I4032IaLs2wMvV4UO0x3lJZ1TLaMx9lxwBhannmTBdBMHEX7i 0Hng== X-Gm-Message-State: AOPr4FVRtqCNIbJfNCqQ0r44hjdtd9a1uq3IHgoaNgrsSNtgJzTflY92PKl7wGwT8NF8hZGn X-Received: by 10.28.129.84 with SMTP id c81mr4552708wmd.38.1460730231948; Fri, 15 Apr 2016 07:23:51 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b135sm38900140wmb.10.2016.04.15.07.23.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Apr 2016 07:23:49 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6F44D3E0521; Fri, 15 Apr 2016 15:24:04 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: mttcg@listserver.greensocs.com, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, serge.fdrv@gmail.com, cota@braap.org Date: Fri, 15 Apr 2016 15:23:40 +0100 Message-Id: <1460730231-1184-3-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1460730231-1184-1-git-send-email-alex.bennee@linaro.org> References: <1460730231-1184-1-git-send-email-alex.bennee@linaro.org> 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] [RFC v1 01/12] 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: , Cc: peter.maydell@linaro.org, claudio.fontana@huawei.com, Peter Crosthwaite , jan.kiszka@siemens.com, mark.burton@greensocs.com, qemu-devel@nongnu.org, pbonzini@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , rth@twiddle.net 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 From: Paolo Bonzini 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 5e3826c..ab08f1a 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 606426f..4948c40 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 51bbdbc..f6f6ae9 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"