From patchwork Fri Apr 8 20:28:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8785601 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 BE66DC0553 for ; Fri, 8 Apr 2016 20:31:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED81A2024D for ; Fri, 8 Apr 2016 20:31:53 +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 3383620204 for ; Fri, 8 Apr 2016 20:31:53 +0000 (UTC) Received: from localhost ([::1]:58057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod4K-0008Lc-Fg for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 16:31:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod1r-0003Q9-5R for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aod1o-00020M-Mj for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:19 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33051) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod1o-00020H-Db for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:16 -0400 Received: by mail-wm0-x241.google.com with SMTP id y144so6821721wmd.0 for ; Fri, 08 Apr 2016 13:29:16 -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=d6N93ovZbi83/TpKYuuEwWQyEcZkwkIQ/DJI8S63iP8=; b=l3BnBEp1ppHt1f4pzvkSyasds3IJCo4tuph8QNIQnwHA1XV2tky0flNUupnywvvmva m27Jj2k5jx3KBLwukcb7Hmlcw/M/TOcijx22TMqGUQwL91r1cj8NwV4IWVJKcipRcYh6 k36pVGFdJCECU6l5UuKjG3iU68GFzGQUB9vB3kWFq0/2sT2id7iUHqMckSTn1C9bSPHs X7NZ4xsISxh1Ps1tvYuhMl7720RJlhGKFvpM+eYwcAYxzmxDSu2cC/JI6gzpKxGuXHWA EIRveFd91Jh3Fas1CqbmOVjkjdK0102CtJR0nnDjPj822yv+xgc4SR54OEqsOIAT1YNU xpQw== 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=d6N93ovZbi83/TpKYuuEwWQyEcZkwkIQ/DJI8S63iP8=; b=Swt0risRmzxIiwCLY0RrW6ghOaxdmsZfjbU2BBOw2mn3QN1v+vJUzE/pNFKEcHvE1a R52NFrmyLQ0v1hxNwxS3X2TCzRn1CVp1bNgp210I6fsrs6w5MVKQNheqXC7L/IcLkNqR ECuDqlLPaJ6izzERyDQcRjHNB9s82QGSl4pRU7eyO5rkXYKeeDQt98J0odTwGpAEkTR3 oqcUoofAsOQnvf58UoCqQTI2rHJsjx7fWPVPfWyw5DvFPsIq9j+qTKNzroSNM8SF2YYB 1+FHWDhfBAf+3MvugoXdd2dlvQZxHJcXOgAqEdI42qcP3/ZXXx+vLt0Xnuz2dod/Hjet xpQQ== X-Gm-Message-State: AD7BkJJBqrEmUIvBnGeZZGaJXW0d5BF1WXUdo5uNRG9svzqcF7J96VuqRzwzQAtD4y/wxw== X-Received: by 10.28.54.33 with SMTP id d33mr5905094wma.63.1460147355807; Fri, 08 Apr 2016 13:29:15 -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.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Apr 2016 13:29:15 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 8 Apr 2016 22:28:22 +0200 Message-Id: <1460147350-7601-3-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::241 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 Signed-off-by: Paolo Bonzini Reviewed-by: Alex Bennée --- 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 3629336..b83d275 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"