From nobody Thu Nov 6 08:32:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497525017241534.0963816029484; Thu, 15 Jun 2017 04:10:17 -0700 (PDT) Received: from localhost ([::1]:53201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSfG-0007JJ-NW for importer@patchew.org; Thu, 15 Jun 2017 07:10:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSPA-0008IK-OU for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLSP9-0007bC-Jr for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:36 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:36125) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLSP9-0007b6-DQ for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:35 -0400 Received: by mail-wr0-x22a.google.com with SMTP id 36so16287871wry.3 for ; Thu, 15 Jun 2017 03:53:35 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id f21sm3258597wra.5.2017.06.15.03.53.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 03:53:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=CXb78HtMFYP9iOptxOh3Kbkda1YZl1+fy4SBa2PdCQI=; b=GUazZ4Bgwh4oiLk7Osq4JX+wyM66S9ItaOUp77flMbHzyHBwiyvurpqrahQbIRSKPF e3ZrKuh80LhaKuLOVN9XsFmfjO+vkKDTdBVKIYBTr1ljbxRuy6ZncqPXjZdISu2mOZcH Zbq2HbcQ5/VAb5apbKJm7zUfxFGua0JtV9VGIoIOKnYF9x84X1eIyu0QdIKNNj74zWyH EJpf4IgirvEfP+av9fvm2Qybtzr9XojYU+6+zV64HNUszL8uHdmnjkGnHG6+GXZWC9as tCq93kPxO/sGsvVI88jQMH141P4rBbbrEr+qQL6qu1JWZunEvrp/FaM+EXVDfQHDjsbb ZBqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=CXb78HtMFYP9iOptxOh3Kbkda1YZl1+fy4SBa2PdCQI=; b=ukP+UMz4xf57JemmJ6kaJgiAd4j0vBP7cjjN+uLJJK7CCNgcM+5X+esoYzBOD2MhwM GbolERhlaqwHFeh8s9owMy/hRHhSUKGoX4LA8l+kWA6jqO1hyjCinIG4NKoWChvNTSRM YjF4jYic+PT9k1tHGuO46G91mTCNc8pwb/xRhl2CtAAZJPKdBQZNRBqu9Ovg9kRXIw2R uJVpVzmmjLxYnL3qvxJW+JdJX1mIfSpNwJkf9rkFNelohrONGpf2BgJeW6DuKqb8n3LF qGIpqHbDxprtRvzp90EiOEm8tXC9WIX1y1Izm3zyQFcUF9jVkYN6XY2tRGVNKqf6ZnQQ vWpA== X-Gm-Message-State: AKS2vOzYO5Enln5EbuwRA4KBeK6DQGgYUGz9zYcL9YVgZvBHo62D+X7r YG36duoJTuZUmx6qWVQ= X-Received: by 10.28.47.79 with SMTP id v76mr3136231wmv.34.1497524013950; Thu, 15 Jun 2017 03:53:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Jun 2017 12:52:41 +0200 Message-Id: <1497523981-38449-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> References: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22a Subject: [Qemu-devel] [PULL 21/41] tcg: move tcg related files into accel/tcg/ subdirectory 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: Yang Zhong Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yang Zhong move cputlb.c, cpu-exec-common.c and cpu-exec.c related tcg exec file into accel/tcg/ subdirectory. Signed-off-by: Yang Zhong Message-Id: <1496383606-18060-3-git-send-email-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- Makefile.objs | 1 + Makefile.target | 7 +++---- accel/tcg/Makefile.objs | 2 ++ cpu-exec-common.c =3D> accel/tcg/cpu-exec-common.c | 0 cpu-exec.c =3D> accel/tcg/cpu-exec.c | 2 +- cputlb.c =3D> accel/tcg/cputlb.c | 0 accel/tcg/trace-events | 7 +++++++ trace-events | 5 ----- 8 files changed, 14 insertions(+), 10 deletions(-) rename cpu-exec-common.c =3D> accel/tcg/cpu-exec-common.c (100%) rename cpu-exec.c =3D> accel/tcg/cpu-exec.c (99%) rename cputlb.c =3D> accel/tcg/cputlb.c (100%) create mode 100644 accel/tcg/trace-events diff --git a/Makefile.objs b/Makefile.objs index d32f2db..871eca8 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -162,6 +162,7 @@ trace-events-subdirs +=3D target/ppc trace-events-subdirs +=3D qom trace-events-subdirs +=3D linux-user trace-events-subdirs +=3D qapi +trace-events-subdirs +=3D accel/tcg =20 trace-events-files =3D $(SRC_PATH)/trace-events $(trace-events-subdirs:%= =3D$(SRC_PATH)/%/trace-events) =20 diff --git a/Makefile.target b/Makefile.target index c3c08ff..18470dd 100644 --- a/Makefile.target +++ b/Makefile.target @@ -88,9 +88,9 @@ all: $(PROGS) stap =20 ######################################################### # cpu emulator library -obj-y =3D exec.o translate-all.o cpu-exec.o +obj-y =3D exec.o translate-all.o +obj-y +=3D accel/ obj-y +=3D translate-common.o -obj-y +=3D cpu-exec-common.o obj-y +=3D tcg/tcg.o tcg/tcg-op.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) +=3D tci.o obj-y +=3D tcg/tcg-common.o @@ -143,8 +143,7 @@ obj-y +=3D arch_init.o cpus.o monitor.o gdbstub.o ballo= on.o ioport.o numa.o obj-y +=3D qtest.o bootdevice.o obj-y +=3D hw/ obj-$(CONFIG_KVM) +=3D kvm-all.o -obj-y +=3D accel/ -obj-y +=3D memory.o cputlb.o +obj-y +=3D memory.o obj-y +=3D memory_mapping.o obj-y +=3D dump.o obj-y +=3D migration/ram.o diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs index 6e3211a..940379b 100644 --- a/accel/tcg/Makefile.objs +++ b/accel/tcg/Makefile.objs @@ -1 +1,3 @@ obj-$(CONFIG_SOFTMMU) +=3D tcg-all.o +obj-$(CONFIG_SOFTMMU) +=3D cputlb.o +obj-y +=3D cpu-exec.o cpu-exec-common.o diff --git a/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c similarity index 100% rename from cpu-exec-common.c rename to accel/tcg/cpu-exec-common.c diff --git a/cpu-exec.c b/accel/tcg/cpu-exec.c similarity index 99% rename from cpu-exec.c rename to accel/tcg/cpu-exec.c index 5b181c1..3581618 100644 --- a/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" #include "cpu.h" -#include "trace-root.h" +#include "trace.h" #include "disas/disas.h" #include "exec/exec-all.h" #include "tcg.h" diff --git a/cputlb.c b/accel/tcg/cputlb.c similarity index 100% rename from cputlb.c rename to accel/tcg/cputlb.c diff --git a/accel/tcg/trace-events b/accel/tcg/trace-events new file mode 100644 index 0000000..f2db388 --- /dev/null +++ b/accel/tcg/trace-events @@ -0,0 +1,7 @@ +# Trace events for debugging and performance instrumentation + +# TCG related tracing (mostly disabled by default) +# cpu-exec.c +disable exec_tb(void *tb, uintptr_t pc) "tb:%p pc=3D0x%"PRIxPTR +disable exec_tb_nocache(void *tb, uintptr_t pc) "tb:%p pc=3D0x%"PRIxPTR +disable exec_tb_exit(void *last_tb, unsigned int flags) "tb:%p flags=3D%x" diff --git a/trace-events b/trace-events index fd83087..279aede 100644 --- a/trace-events +++ b/trace-events @@ -69,11 +69,6 @@ kvm_irqchip_update_msi_route(int virq) "Updating MSI rou= te virq=3D%d" kvm_irqchip_release_virq(int virq) "virq %d" =20 # TCG related tracing (mostly disabled by default) -# cpu-exec.c -disable exec_tb(void *tb, uintptr_t pc) "tb:%p pc=3D0x%"PRIxPTR -disable exec_tb_nocache(void *tb, uintptr_t pc) "tb:%p pc=3D0x%"PRIxPTR -disable exec_tb_exit(void *last_tb, unsigned int flags) "tb:%p flags=3D%x" - # translate-all.c translate_block(void *tb, uintptr_t pc, uint8_t *tb_code) "tb:%p, pc:0x%"P= RIxPTR", tb_code:%p" =20 --=20 1.8.3.1