From nobody Fri May 3 06:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599725552; cv=none; d=zohomail.com; s=zohoarc; b=YcN9syWULVxXcG6MbDlrSDbq5p8rKXokmxtK25KnsXqdFHNWn9b3FE40qA9vQUr66CmH9olxNdeCJHcKq/1hIKDLjAilcyvlPpZHLzOGUUR9T5kWzKCG+vGYWCybWWziXm15KcA1+B/UgJzhYzbTA8JuEYtKH4uSv5lGoOytQCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599725552; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PzZzx9EYClg6tHCHyI0U/rPcuOuBafDXQiPAFSnNn4w=; b=CEL1fl4bUu89Snr1u1VPxomwLIwoP96DNnTnRC4BjiWQD64uEOXZ95aZ6YwOI59PRWuTZA3KOeuR/c+ObuX3f359ENpsFbm9kMbUcqtRFIoqnXIQNgAD78LG49jOik4vrcG0nHBrOFyFV6vpR0S0sezfQFinqls0567RW12JLug= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599725552548729.9202862604388; Thu, 10 Sep 2020 01:12:32 -0700 (PDT) Received: from localhost ([::1]:48698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGHh1-00030h-58 for importer@patchew.org; Thu, 10 Sep 2020 04:12:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGHfw-00020E-No for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:11:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51972 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGHfu-0002vw-FA for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:11:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-388-cnxQjRboNri7OYhh_DaFcA-1; Thu, 10 Sep 2020 04:11:18 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E53AA2FD07; Thu, 10 Sep 2020 08:11:17 +0000 (UTC) Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89BCA7E8E7; Thu, 10 Sep 2020 08:11:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599725481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PzZzx9EYClg6tHCHyI0U/rPcuOuBafDXQiPAFSnNn4w=; b=OBtxy3mfBBQTBFRoOW63A7kji6PBY3ryUY/6HhZJp/g3ksTFsTlJz8B5Axx78RPg+ftz1E KrgizcgZmyCi/uPbcgwSzQTvey82EHSjVzpWT313sLQzZ2ACAvFdDl6yqAncUdl/e8lAXA qlVV3oHge9tz788nGb0Lavgi1cOzWzg= X-MC-Unique: cnxQjRboNri7OYhh_DaFcA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL v2 1/8] softmmu: Add missing trace-events file Date: Thu, 10 Sep 2020 09:10:42 +0100 Message-Id: <20200910081049.38393-2-stefanha@redhat.com> In-Reply-To: <20200910081049.38393-1-stefanha@redhat.com> References: <20200910081049.38393-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=stefanha@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 01:23:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 Commit c7f419f584 moved softmmu-only files out of the root directory, but forgot to move the trace events, which should no longer be generated to "trace-root.h". Fix that by adding softmmu/trace-events. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Claudio Fontana Reviewed-by: Claudio Fontana Message-id: 20200805130221.24487-1-philmd@redhat.com [Rebased onto meson. --Stefan] Signed-off-by: Stefan Hajnoczi --- softmmu/trace.h | 1 + softmmu/balloon.c | 2 +- softmmu/ioport.c | 2 +- softmmu/memory.c | 2 +- softmmu/vl.c | 2 +- meson.build | 1 + softmmu/trace-events | 28 ++++++++++++++++++++++++++++ trace-events | 27 --------------------------- 8 files changed, 34 insertions(+), 31 deletions(-) create mode 100644 softmmu/trace.h create mode 100644 softmmu/trace-events diff --git a/softmmu/trace.h b/softmmu/trace.h new file mode 100644 index 0000000000..2ad1011572 --- /dev/null +++ b/softmmu/trace.h @@ -0,0 +1 @@ +#include "trace/trace-softmmu.h" diff --git a/softmmu/balloon.c b/softmmu/balloon.c index b89646f85d..23452295cd 100644 --- a/softmmu/balloon.c +++ b/softmmu/balloon.c @@ -28,10 +28,10 @@ #include "qemu/atomic.h" #include "sysemu/kvm.h" #include "sysemu/balloon.h" -#include "trace/trace-root.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qmp/qerror.h" +#include "trace.h" =20 static QEMUBalloonEvent *balloon_event_fn; static QEMUBalloonStatus *balloon_stat_fn; diff --git a/softmmu/ioport.c b/softmmu/ioport.c index a799697c5d..cb8adb0b93 100644 --- a/softmmu/ioport.c +++ b/softmmu/ioport.c @@ -28,9 +28,9 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/ioport.h" -#include "trace/trace-root.h" #include "exec/memory.h" #include "exec/address-spaces.h" +#include "trace.h" =20 typedef struct MemoryRegionPortioList { MemoryRegion mr; diff --git a/softmmu/memory.c b/softmmu/memory.c index 70b93104e8..d030eb6f7c 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -24,7 +24,7 @@ #include "qemu/main-loop.h" #include "qemu/qemu-print.h" #include "qom/object.h" -#include "trace/trace-root.h" +#include "trace.h" =20 #include "exec/memory-internal.h" #include "exec/ram_addr.h" diff --git a/softmmu/vl.c b/softmmu/vl.c index 0cc86b0766..f7b103467c 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -90,7 +90,7 @@ =20 #include "disas/disas.h" =20 -#include "trace/trace-root.h" +#include "trace.h" #include "trace/control.h" #include "qemu/plugin.h" #include "qemu/queue.h" diff --git a/meson.build b/meson.build index 5421eca66a..951c4d0ec5 100644 --- a/meson.build +++ b/meson.build @@ -776,6 +776,7 @@ if have_system 'hw/riscv', 'migration', 'net', + 'softmmu', 'ui', ] endif diff --git a/softmmu/trace-events b/softmmu/trace-events new file mode 100644 index 0000000000..b80ca042e1 --- /dev/null +++ b/softmmu/trace-events @@ -0,0 +1,28 @@ +# See docs/devel/tracing.txt for syntax documentation. + +# balloon.c +# Since requests are raised via monitor, not many tracepoints are needed. +balloon_event(void *opaque, unsigned long addr) "opaque %p addr %lu" + +# ioport.c +cpu_in(unsigned int addr, char size, unsigned int val) "addr 0x%x(%c) valu= e %u" +cpu_out(unsigned int addr, char size, unsigned int val) "addr 0x%x(%c) val= ue %u" + +# memory.c +memory_region_ops_read(int cpu_index, void *mr, uint64_t addr, uint64_t va= lue, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64" size %= u" +memory_region_ops_write(int cpu_index, void *mr, uint64_t addr, uint64_t v= alue, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64" size = %u" +memory_region_subpage_read(int cpu_index, void *mr, uint64_t offset, uint6= 4_t value, unsigned size) "cpu %d mr %p offset 0x%"PRIx64" value 0x%"PRIx64= " size %u" +memory_region_subpage_write(int cpu_index, void *mr, uint64_t offset, uint= 64_t value, unsigned size) "cpu %d mr %p offset 0x%"PRIx64" value 0x%"PRIx6= 4" size %u" +memory_region_ram_device_read(int cpu_index, void *mr, uint64_t addr, uint= 64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64"= size %u" +memory_region_ram_device_write(int cpu_index, void *mr, uint64_t addr, uin= t64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64= " size %u" +flatview_new(void *view, void *root) "%p (root %p)" +flatview_destroy(void *view, void *root) "%p (root %p)" +flatview_destroy_rcu(void *view, void *root) "%p (root %p)" + +# vl.c +vm_state_notify(int running, int reason, const char *reason_str) "running = %d reason %d (%s)" +load_file(const char *name, const char *path) "name %s location %s" +runstate_set(int current_state, const char *current_state_str, int new_sta= te, const char *new_state_str) "current_run_state %d (%s) new_state %d (%s)" +system_wakeup_request(int reason) "reason=3D%d" +qemu_system_shutdown_request(int reason) "reason=3D%d" +qemu_system_powerdown_request(void) "" diff --git a/trace-events b/trace-events index 42107ebc69..5882c2d5fc 100644 --- a/trace-events +++ b/trace-events @@ -25,22 +25,6 @@ # # The should be a sprintf()-compatible format string. =20 -# ioport.c -cpu_in(unsigned int addr, char size, unsigned int val) "addr 0x%x(%c) valu= e %u" -cpu_out(unsigned int addr, char size, unsigned int val) "addr 0x%x(%c) val= ue %u" - -# balloon.c -# Since requests are raised via monitor, not many tracepoints are needed. -balloon_event(void *opaque, unsigned long addr) "opaque %p addr %lu" - -# vl.c -vm_state_notify(int running, int reason, const char *reason_str) "running = %d reason %d (%s)" -load_file(const char *name, const char *path) "name %s location %s" -runstate_set(int current_state, const char *current_state_str, int new_sta= te, const char *new_state_str) "current_run_state %d (%s) new_state %d (%s)" -system_wakeup_request(int reason) "reason=3D%d" -qemu_system_shutdown_request(int reason) "reason=3D%d" -qemu_system_powerdown_request(void) "" - # dma-helpers.c dma_blk_io(void *dbs, void *bs, int64_t offset, bool to_dev) "dbs=3D%p bs= =3D%p offset=3D%" PRId64 " to_dev=3D%d" dma_aio_cancel(void *dbs) "dbs=3D%p" @@ -55,17 +39,6 @@ ram_block_discard_range(const char *rbname, void *hva, s= ize_t length, bool need_ memory_notdirty_write_access(uint64_t vaddr, uint64_t ram_addr, unsigned s= ize) "0x%" PRIx64 " ram_addr 0x%" PRIx64 " size %u" memory_notdirty_set_dirty(uint64_t vaddr) "0x%" PRIx64 =20 -# memory.c -memory_region_ops_read(int cpu_index, void *mr, uint64_t addr, uint64_t va= lue, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64" size %= u" -memory_region_ops_write(int cpu_index, void *mr, uint64_t addr, uint64_t v= alue, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64" size = %u" -memory_region_subpage_read(int cpu_index, void *mr, uint64_t offset, uint6= 4_t value, unsigned size) "cpu %d mr %p offset 0x%"PRIx64" value 0x%"PRIx64= " size %u" -memory_region_subpage_write(int cpu_index, void *mr, uint64_t offset, uint= 64_t value, unsigned size) "cpu %d mr %p offset 0x%"PRIx64" value 0x%"PRIx6= 4" size %u" -memory_region_ram_device_read(int cpu_index, void *mr, uint64_t addr, uint= 64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64"= size %u" -memory_region_ram_device_write(int cpu_index, void *mr, uint64_t addr, uin= t64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64= " size %u" -flatview_new(void *view, void *root) "%p (root %p)" -flatview_destroy(void *view, void *root) "%p (root %p)" -flatview_destroy_rcu(void *view, void *root) "%p (root %p)" - # gdbstub.c gdbstub_op_start(const char *device) "Starting gdbstub using device %s" gdbstub_op_exiting(uint8_t code) "notifying exit with code=3D0x%02x" --=20 2.26.2 From nobody Fri May 3 06:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599725608; cv=none; d=zohomail.com; s=zohoarc; b=LO25EcP0M0Bc26ipcC7BfepS0QlT0mCVGWmnt5A95W9ovvGOnsRLgg+om9NojNMxFlEa2oMfrNqqezxeGknhIV7EK6CkSyNv2DxoEBBqx3l+o2sMCBHQA3xRIYrcTbozF83LUu/XdRXvXlHQOoZGySKD/ZQOo2LTc946dMeDv5k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599725608; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nMrDvCPiLS3qactv2cpG6RZ0nflNlVJiAcKxN681dHU=; b=NqkQDdnwq8szArX7xO2oj+zohCC/uTLsSSMeEnANE47mJD+qoC1O1oICmFN7F+/JGWU6EtB/JeKgmKGR+Ul+QbSNMCbH2jdE6jhK8wErmVFfuylsNIxUbBCrJpErhWzn4o7gnmPf/5iMElQIR5rZ0wCOIBb9shOJS0Ey5Y2cLcE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599725608350584.5917279562639; Thu, 10 Sep 2020 01:13:28 -0700 (PDT) Received: from localhost ([::1]:53646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGHhv-0004z1-58 for importer@patchew.org; Thu, 10 Sep 2020 04:13:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGHfy-000212-FQ for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:11:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21505 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGHfw-0002w9-8g for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:11:26 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-446-DLr4MiqMMRmAe5WbZ201XA-1; Thu, 10 Sep 2020 04:11:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E34D8015A8; Thu, 10 Sep 2020 08:11:20 +0000 (UTC) Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0950610013D0; Thu, 10 Sep 2020 08:11:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599725483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nMrDvCPiLS3qactv2cpG6RZ0nflNlVJiAcKxN681dHU=; b=au/r8ub0nnrKEnDpKIlfIj1gmXR/zarqXaN2C2s5MyzTyk5Ku/6pbnclSdu/7ln3UgcvEo 7wJltCdJd9Cqxh3wEM8AppuoZFnFJ/LrlyKep4L5P/kzPU+FE2dQggmmH2kE+NUc4d1w1k C3mq9FmUySxBV6PuYcqjzTyBYAfG7F0= X-MC-Unique: DLr4MiqMMRmAe5WbZ201XA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL v2 2/8] scripts/tracetool: Fix dtrace generation for macOS Date: Thu, 10 Sep 2020 09:10:43 +0100 Message-Id: <20200910081049.38393-3-stefanha@redhat.com> In-Reply-To: <20200910081049.38393-1-stefanha@redhat.com> References: <20200910081049.38393-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=stefanha@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 01:23:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Roman Bolshakov dtrace USDT is fully supported since OS X 10.6. There are a few peculiarities compared to other dtrace flavors. 1. It doesn't accept empty files. 2. It doesn't recognize bool type but accepts C99 _Bool. 3. It converts int8_t * in probe points to char * in header files and introduces [-Wpointer-sign] warning. Cc: Cameron Esfahani Signed-off-by: Roman Bolshakov Reviewed-by: Stefan Hajnoczi Message-id: 20200717093517.73397-2-r.bolshakov@yadro.com Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/format/d.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/tracetool/format/d.py b/scripts/tracetool/format/d.py index 0afb5f3f47..353722f89c 100644 --- a/scripts/tracetool/format/d.py +++ b/scripts/tracetool/format/d.py @@ -13,6 +13,7 @@ __email__ =3D "stefanha@redhat.com" =20 =20 from tracetool import out +from sys import platform =20 =20 # Reserved keywords from @@ -34,7 +35,8 @@ def generate(events, backend, group): =20 # SystemTap's dtrace(1) warns about empty "provider qemu {}" but is ha= ppy # with an empty file. Avoid the warning. - if not events: + # But dtrace on macOS can't deal with empty files. + if not events and platform !=3D "darwin": return =20 out('/* This file is autogenerated by tracetool, do not edit. */' @@ -44,6 +46,17 @@ def generate(events, backend, group): for e in events: args =3D [] for type_, name in e.args: + if platform =3D=3D "darwin": + # macOS dtrace accepts only C99 _Bool + if type_ =3D=3D 'bool': + type_ =3D '_Bool' + if type_ =3D=3D 'bool *': + type_ =3D '_Bool *' + # It converts int8_t * in probe points to char * in header + # files and introduces [-Wpointer-sign] warning. + # Avoid it by changing probe type to signed char * beforeh= and. + if type_ =3D=3D 'int8_t *': + type_ =3D 'signed char *' if name in RESERVED_WORDS: name +=3D '_' args.append(type_ + ' ' + name) --=20 2.26.2 From nobody Fri May 3 06:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599725624; cv=none; d=zohomail.com; s=zohoarc; b=PYqWYYxa7Yd1JeaTM1R9jAnPOjFtuTBsC7U8mL7EGlTpbeMPY1T5+PHVHqkE1eJAnqyIVTz4IgZKvT9wURVnpumwG9yPELz/bx3F+zbxBhvZECfb+5prKbySGLdqz1jczyYEz5kOXJs84vmxzoPFjCLZruFNaadV3EC/dS0C71Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599725624; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=z8sS8i4kWBPQwcuMdL8VeFf0XP6UvVF/A6wBf5rP+yY=; b=YgYjt88JE99oxJDXoHp6Qn0au/3mtw9nJNNUdOwt75X7OGSPr4/bWHM839/aWWGvDh0RMi/JbMfzap31ldtYCPqULpeXP18qBJjRJLEzYIy9mcMY5S8bta+oIYOiOXUw1c5QHOw+WGG6MJPh/QsV0Mbm4YSCpPuiYIQfOs47N1c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15997256246306.050223107178226; Thu, 10 Sep 2020 01:13:44 -0700 (PDT) Received: from localhost ([::1]:55168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGHiB-0005aK-D2 for importer@patchew.org; Thu, 10 Sep 2020 04:13:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGHg3-000235-FE for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:11:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30140) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGHg0-0002wZ-Jc for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:11:31 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-128-DP4fvGB2OIiy9oea3KFIXw-1; Thu, 10 Sep 2020 04:11:23 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A21410051C3; Thu, 10 Sep 2020 08:11:23 +0000 (UTC) Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9BAB5C1CF; Thu, 10 Sep 2020 08:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599725487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z8sS8i4kWBPQwcuMdL8VeFf0XP6UvVF/A6wBf5rP+yY=; b=VPWT1xQHJETTxL/Xk/q2RVhrhx2EaBRrx/MJXWRG/3nVr68rnLEHRyvQ9A9dZ1p95FcZw0 bKzcQ036PqZ0oTJhlLmwNS21aC1zAXPrEAYASIigNPICsyo5mCZWOC5A+1F8mZVTLR9I4s KFHSTLxQPBPNC/1FODlUFJeK/A79+68= X-MC-Unique: DP4fvGB2OIiy9oea3KFIXw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL v2 3/8] scripts/tracetool: Use void pointer for vcpu Date: Thu, 10 Sep 2020 09:10:44 +0100 Message-Id: <20200910081049.38393-4-stefanha@redhat.com> In-Reply-To: <20200910081049.38393-1-stefanha@redhat.com> References: <20200910081049.38393-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 02:38:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Roman Bolshakov dtrace on macOS complains that CPUState * is used for a few probes: dtrace: failed to compile script trace-dtrace-root.dtrace: line 130: synt= ax error near "CPUState" A comment in scripts/tracetool/__init__.py mentions that: We only want to allow standard C types or fixed sized integer types. We don't want QEMU specific types as we can't assume trace backends can resolve all the typedefs Fixes: 3d211d9f4dbee ("trace: Add 'vcpu' event property to trace guest vCPU= ") Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Stefan Hajnoczi Signed-off-by: Roman Bolshakov Message-id: 20200717093517.73397-3-r.bolshakov@yadro.com Cc: Cameron Esfahani Signed-off-by: Roman Bolshakov Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/vcpu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tracetool/vcpu.py b/scripts/tracetool/vcpu.py index b54e4f4e7a..868b4cb04c 100644 --- a/scripts/tracetool/vcpu.py +++ b/scripts/tracetool/vcpu.py @@ -24,7 +24,7 @@ def transform_event(event): assert "tcg-trans" not in event.properties assert "tcg-exec" not in event.properties =20 - event.args =3D Arguments([("CPUState *", "__cpu"), event.args]) + event.args =3D Arguments([("void *", "__cpu"), event.args]) if "tcg" in event.properties: fmt =3D "\"cpu=3D%p \"" event.fmt =3D [fmt + event.fmt[0], --=20 2.26.2 From nobody Fri May 3 06:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599725709; cv=none; d=zohomail.com; s=zohoarc; b=kY7crJOuSzKI5Alea/hizGbpm1n2BjDyCEYY7reOp/ZXVVTAEQRNGA7CxQjRdSaed78Q2UwDUbXBWJG+P6r5feZSZlCi+XYCkwOi1EV8Z3vo2jgP8wq7alo7Me+GnLYd+TkJ2oVASOwnlzRiSjmwWihOjN+gSBNfAIGFhkUP0zc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599725709; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZAVjYWWvsBeAVZWLNbfusO4YBSjm/+sDD4ovgg1w2EM=; b=J9fdBZ9x7/w1WdxWFSXl7pKTAwx4IjvGPSo6veQ2dag7tIhHX8vFEG6iljIdlSx/9AyfGTWf2MkSjlpLgo2QWGtAbmd0gLDe60WoB29qTO8RxMDLIy9PUHhQnBEaVNy1TEIHS9ji1ki2crQ/5oHiELH2RxoctPqdvR8qNBv2iRI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599725709253400.20107397669494; Thu, 10 Sep 2020 01:15:09 -0700 (PDT) Received: from localhost ([::1]:59938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGHjX-0007Tm-C7 for importer@patchew.org; Thu, 10 Sep 2020 04:15:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGHgJ-0002KQ-SW for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:11:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:52729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGHgH-0002xQ-Ky for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:11:47 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-514-cr2xqXQFP9GqhqY3Q96DJg-1; Thu, 10 Sep 2020 04:11:38 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9390F1882FC1; Thu, 10 Sep 2020 08:11:37 +0000 (UTC) Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 389F57E19A; Thu, 10 Sep 2020 08:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599725504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZAVjYWWvsBeAVZWLNbfusO4YBSjm/+sDD4ovgg1w2EM=; b=Dc1ma+bRRpnE+3hqybEgFbE8ExJmTJmqecrRATUsf05DTftje6kbxeE7jdHtNwER2XU2Qf iCmF/WxGfvimR4UezsE6fs9pfK/+VJBmwj1Dh3Xc/ujGvoexi5KW6VCSZvzTK0cI2caSYT lRVVcIf1S5uLNRxBQHPfU1Nlc0OYvI0= X-MC-Unique: cr2xqXQFP9GqhqY3Q96DJg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL v2 4/8] net/colo: Match is-enabled probe to tracepoint Date: Thu, 10 Sep 2020 09:10:45 +0100 Message-Id: <20200910081049.38393-5-stefanha@redhat.com> In-Reply-To: <20200910081049.38393-1-stefanha@redhat.com> References: <20200910081049.38393-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 02:38:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Roman Bolshakov Build of QEMU with dtrace fails on macOS: LINK x86_64-softmmu/qemu-system-x86_64 error: probe colo_compare_miscompare doesn't exist error: Could not register probes ld: error creating dtrace DOF section for architecture x86_64 The reason of the error is explained by Adam Leventhal [1]: Note that is-enabled probes don't have the stability magic so I'm not sure how things would work if only is-enabled probes were used. net/colo code uses is-enabled probes to determine if other probes should be used but colo_compare_miscompare itself is not used explicitly. Linker doesn't include the symbol and build fails. The issue can be resolved if is-enabled probe matches the actual trace point that is used inside the test. Packet dump toggle is replaced with a compile-time conditional definition. 1. http://markmail.org/message/6grq2ygr5nwdwsnb Fixes: f4b618360e ("colo-compare: add TCP, UDP, ICMP packet comparison") Cc: Philippe Mathieu-Daud=C3=A9 Cc: Cameron Esfahani Signed-off-by: Roman Bolshakov Reviewed-by: Zhang Chen Message-id: 20200717093517.73397-5-r.bolshakov@yadro.com Signed-off-by: Stefan Hajnoczi --- net/colo-compare.c | 42 ++++++++++++++++++++++-------------------- net/filter-rewriter.c | 10 ++++++++-- net/trace-events | 2 -- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 2c20de1537..0b3215dee0 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -54,6 +54,8 @@ static NotifierList colo_compare_notifiers =3D #define REGULAR_PACKET_CHECK_MS 3000 #define DEFAULT_TIME_OUT_MS 3000 =20 +/* #define DEBUG_COLO_PACKETS */ + static QemuMutex colo_compare_mutex; static bool colo_compare_active; static QemuMutex event_mtx; @@ -328,7 +330,7 @@ static int colo_compare_packet_payload(Packet *ppkt, uint16_t len) =20 { - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) { + if (trace_event_get_state_backends(TRACE_COLO_COMPARE_IP_INFO)) { char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20= ]; =20 strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); @@ -493,12 +495,12 @@ sec: g_queue_push_head(&conn->primary_list, ppkt); g_queue_push_head(&conn->secondary_list, spkt); =20 - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE))= { - qemu_hexdump((char *)ppkt->data, stderr, - "colo-compare ppkt", ppkt->size); - qemu_hexdump((char *)spkt->data, stderr, - "colo-compare spkt", spkt->size); - } +#ifdef DEBUG_COLO_PACKETS + qemu_hexdump((char *)ppkt->data, stderr, + "colo-compare ppkt", ppkt->size); + qemu_hexdump((char *)spkt->data, stderr, + "colo-compare spkt", spkt->size); +#endif =20 colo_compare_inconsistency_notify(s); } @@ -534,12 +536,12 @@ static int colo_packet_compare_udp(Packet *spkt, Pack= et *ppkt) ppkt->size - offset)) { trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size); trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size= ); - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE))= { - qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt= ", - ppkt->size); - qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt= ", - spkt->size); - } +#ifdef DEBUG_COLO_PACKETS + qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt", + ppkt->size); + qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt", + spkt->size); +#endif return -1; } else { return 0; @@ -577,12 +579,12 @@ static int colo_packet_compare_icmp(Packet *spkt, Pac= ket *ppkt) ppkt->size); trace_colo_compare_icmp_miscompare("Secondary pkt size", spkt->size); - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE))= { - qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt= ", - ppkt->size); - qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt= ", - spkt->size); - } +#ifdef DEBUG_COLO_PACKETS + qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt", + ppkt->size); + qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt", + spkt->size); +#endif return -1; } else { return 0; @@ -598,7 +600,7 @@ static int colo_packet_compare_other(Packet *spkt, Pack= et *ppkt) uint16_t offset =3D ppkt->vnet_hdr_len; =20 trace_colo_compare_main("compare other"); - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) { + if (trace_event_get_state_backends(TRACE_COLO_COMPARE_IP_INFO)) { char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20= ]; =20 strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 1aaad101b6..576b019d09 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -76,11 +76,14 @@ static int handle_primary_tcp_pkt(RewriterState *rf, struct tcp_hdr *tcp_pkt; =20 tcp_pkt =3D (struct tcp_hdr *)pkt->transport_header; - if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_DEBUG)) { + if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_PKT_INFO= )) { trace_colo_filter_rewriter_pkt_info(__func__, inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst), ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack), tcp_pkt->th_flags); + } + if (trace_event_get_state_backends( + TRACE_COLO_FILTER_REWRITER_CONN_OFFSET)) { trace_colo_filter_rewriter_conn_offset(conn->offset); } =20 @@ -180,11 +183,14 @@ static int handle_secondary_tcp_pkt(RewriterState *rf, =20 tcp_pkt =3D (struct tcp_hdr *)pkt->transport_header; =20 - if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_DEBUG)) { + if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_PKT_INFO= )) { trace_colo_filter_rewriter_pkt_info(__func__, inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst), ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack), tcp_pkt->th_flags); + } + if (trace_event_get_state_backends( + TRACE_COLO_FILTER_REWRITER_CONN_OFFSET)) { trace_colo_filter_rewriter_conn_offset(conn->offset); } =20 diff --git a/net/trace-events b/net/trace-events index fa49c71533..bfaff7891d 100644 --- a/net/trace-events +++ b/net/trace-events @@ -17,10 +17,8 @@ colo_compare_udp_miscompare(const char *sta, int size) "= : %s =3D %d" colo_compare_icmp_miscompare(const char *sta, int size) ": %s =3D %d" colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssiz= e, const char *stc, const char *std) "ppkt size =3D %d, ip_src =3D %s, ip_d= st =3D %s, spkt size =3D %d, ip_src =3D %s, ip_dst =3D %s" colo_old_packet_check_found(int64_t old_time) "%" PRId64 -colo_compare_miscompare(void) "" colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int hdl= en, int pdlen, int offset, int flags) "%s: seq/ack=3D %u/%u hdlen=3D %d pdl= en=3D %d offset=3D %d flags=3D%d" =20 # filter-rewriter.c -colo_filter_rewriter_debug(void) "" colo_filter_rewriter_pkt_info(const char *func, const char *src, const cha= r *dst, uint32_t seq, uint32_t ack, uint32_t flag) "%s: src/dst: %s/%s p: s= eq/ack=3D%u/%u flags=3D0x%x" colo_filter_rewriter_conn_offset(uint32_t offset) ": offset=3D%u" --=20 2.26.2 From nobody Fri May 3 06:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599725575; cv=none; d=zohomail.com; s=zohoarc; b=YjQOOq+WUFvTrXpH0SdUITUUXQzrYBnZMO3HzvU0fdOoD3gzAplDqtEjKut+xz316U8ROzD3O1Hof99oLTbe+neoOQG/pgKlOCkXnztsdt/gbUiqzlgLEJdkxO66ZTqe5R0UkLBkkgvFpmu1ajv3+iyEuAW9ZIwzxd5RcmLMvoM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599725575; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Me4RFj/JVSZpwCThTMm0Kv88fJLMSdD2S6cQrEZLU68=; b=fWbJyRx7Pm22I40h83GyFgOo0TweUoFejhhp+WgtkN6b6AHRV3h2ZZlGt00QPk/CcZA7vgzC3CAh/JzBPrSq7YK2YrEBmYER5glLvv1wscasTeTOovzv/PEgeoxM/OQ79aYA8jRDLMzr4JHmgLio2S3LVc6N7ENkY5Zs4pBvzPM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599725575573969.3456411667032; Thu, 10 Sep 2020 01:12:55 -0700 (PDT) Received: from localhost ([::1]:50864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGHhO-0003s0-8r for importer@patchew.org; Thu, 10 Sep 2020 04:12:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGHgS-0002bP-Ul for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:11:56 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:24573 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGHgR-0002xg-Cj for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:11:56 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-470-nL1yHqsMNVWKoZxqZpKlsA-1; Thu, 10 Sep 2020 04:11:52 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 831EF18B9ED1; Thu, 10 Sep 2020 08:11:51 +0000 (UTC) Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FDF15D9EF; Thu, 10 Sep 2020 08:11:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599725514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Me4RFj/JVSZpwCThTMm0Kv88fJLMSdD2S6cQrEZLU68=; b=ZacNbd5jvbhXVkTnXcKxa3xiLADtEQ9WPdRrLYekZHkh20TaDQAhwSdGp5ZCXxKa3zH/cc enJ8/T8pfZxfRW5lO9hw0B/W7ydvJ7gJ7ge2CfYqM4ycpOlEQdZJjCd2o2Gu4lXYUw9UgY trwdo+ymSMFvaKvV+UwdUw5sjVhSUew= X-MC-Unique: nL1yHqsMNVWKoZxqZpKlsA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL v2 5/8] scripts/cleanup-trace-events: Fix for vcpu property Date: Thu, 10 Sep 2020 09:10:46 +0100 Message-Id: <20200910081049.38393-6-stefanha@redhat.com> In-Reply-To: <20200910081049.38393-1-stefanha@redhat.com> References: <20200910081049.38393-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 01:44:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Markus Armbruster Commit a44cf524f8 "scripts/cleanup-trace-events: Update for current practice" limited search to the input file's directory. That's wrong for events with the vcpu property, because these can only be defined in root directory. Signed-off-by: Markus Armbruster Message-id: 20200806141334.3646302-2-armbru@redhat.com Signed-off-by: Stefan Hajnoczi --- scripts/cleanup-trace-events.pl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/cleanup-trace-events.pl b/scripts/cleanup-trace-events= .pl index d4f0e4cab5..6c3767bd6a 100755 --- a/scripts/cleanup-trace-events.pl +++ b/scripts/cleanup-trace-events.pl @@ -31,10 +31,12 @@ open(IN, $in) or die "open $in: $!"; chdir($dir) or die "chdir $dir: $!"; =20 while () { - if (/^(disable |(tcg) |vcpu )*([a-z_0-9]+)\(/i) { - my $pat =3D "trace_$3"; - $pat .=3D '_tcg' if (defined $2); - open GREP, '-|', 'git', 'grep', '-lw', '--max-depth', '1', $pat + if (/^(disable |(tcg) |(vcpu) )*([a-z_0-9]+)\(/i) { + my $pat =3D "trace_$4"; + $pat .=3D '_tcg' if defined $2; + open GREP, '-|', 'git', 'grep', '-lw', + defined $3 ? () : ('--max-depth', '1'), + $pat or die "run git grep: $!"; while (my $fname =3D ) { chomp $fname; --=20 2.26.2 From nobody Fri May 3 06:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599725645; cv=none; d=zohomail.com; s=zohoarc; b=Se96Lle09RMF33WX6+xivokPXC31SoC9s5TRb432qN9D1inWGvSFfvqjmGqlPxWgMZ3ai7w7xN2lDUcDA922xgY21Uid3dUg93RdxsfI7EP/Dmo0Nz2pY64ATKgCaeci8EV09Wp1ymphxE7ozQ3oHVdhgefodIJp8BX5UVJKDEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599725645; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8RRjpvYPCcfDxxO0ofYqEkm/yCYLWT9vZIQ9mkRtceg=; b=dmKoyOuJCd8NqLVZJLJDT9UbEgvOvBx7J7KJIgXRxtxqPl525oTJVO9UeE3VG3DQD0/0onDVTrQqkxF6JPRGlJEIQyyxI/dspTZae6cD/IEWO5zKD1sgv28Is9BNfXGUWEBkjmVKYO6bV0g20GbXT7dqkcvuHI7tEy+sZTtD5JU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599725645810401.4398414240492; Thu, 10 Sep 2020 01:14:05 -0700 (PDT) Received: from localhost ([::1]:57150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGHiW-0006MP-Iy for importer@patchew.org; Thu, 10 Sep 2020 04:14:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGHgW-0002jV-QD for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:12:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGHgV-0002y7-4j for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:12:00 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-63-Lb2dyaXXNISYESApfU67aQ-1; Thu, 10 Sep 2020 04:11:56 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2950D1084C82; Thu, 10 Sep 2020 08:11:55 +0000 (UTC) Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id C86375C22E; Thu, 10 Sep 2020 08:11:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599725518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8RRjpvYPCcfDxxO0ofYqEkm/yCYLWT9vZIQ9mkRtceg=; b=PIt1smFKxphzF+v1fBnzJCOiHoJvgllhaTzsFQ3vm6RAZee5e928My/Kcgc9PzI8dfiqH6 X9RoAm/whNDxRQDWwTuH3iOFbaiTupnhDFgWHVPppFwTS5aSWUVIkp+a7CWi4xyRYzkjnH UfQ8IIEirtOr3r2C1u0QYduQKQFMDo0= X-MC-Unique: Lb2dyaXXNISYESApfU67aQ-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL v2 6/8] scripts/cleanup-trace-events: Emit files in alphabetical order Date: Thu, 10 Sep 2020 09:10:47 +0100 Message-Id: <20200910081049.38393-7-stefanha@redhat.com> In-Reply-To: <20200910081049.38393-1-stefanha@redhat.com> References: <20200910081049.38393-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 00:49:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Markus Armbruster Signed-off-by: Markus Armbruster Message-id: 20200806141334.3646302-3-armbru@redhat.com Signed-off-by: Stefan Hajnoczi --- scripts/cleanup-trace-events.pl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/cleanup-trace-events.pl b/scripts/cleanup-trace-events= .pl index 6c3767bd6a..c40d2fcc50 100755 --- a/scripts/cleanup-trace-events.pl +++ b/scripts/cleanup-trace-events.pl @@ -15,12 +15,15 @@ use warnings; use strict; use File::Basename; =20 -my $buf =3D ''; +my @files =3D (); +my $events =3D ''; my %seen =3D (); =20 sub out { - print $buf; - $buf =3D ''; + print sort @files; + print $events; + @files =3D (); + $events =3D ''; %seen =3D (); } =20 @@ -42,7 +45,7 @@ while () { chomp $fname; next if $seen{$fname} || $fname eq 'trace-events'; $seen{$fname} =3D 1; - $buf =3D "# $fname\n" . $buf; + push @files, "# $fname\n"; } unless (close GREP) { die "close git grep: $!" @@ -55,7 +58,7 @@ while () { } elsif (!/^#|^$/) { warn "unintelligible line"; } - $buf .=3D $_; + $events .=3D $_; } =20 out; --=20 2.26.2 From nobody Fri May 3 06:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599725730; cv=none; d=zohomail.com; s=zohoarc; b=Vzu9aJznTLxYLxOD4xjqi+8Wg7suMTC+PCjHQyrr+372UBnxuK3PvfdPBy0DEF+OzFQhu8v9thmnz5ReprKRZVj9BkMpvmv2hKwSjyfGmEVISuS3cBIuL9cuKK1L2KvCA7YFU1VaeTp1cwyB54odqkXkHM7X6E7K3cXdm4zAY6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599725730; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6FmOdnRi/7jkAIaBY1QgC1BvHthmvmPp++5ZDnguTt8=; b=YvkZ4TlXfhntQHlEKFJSAeTDoP6CJGKjCd13z78wX4Q993hVTZc4WDDdx8cIO9kp+zBMlMGfki6Z0IJD0E182BfLqAWkSiFR8PpRQso07SHGWR9i5+Zd1M3f1ZjXPszLobZCjvNZ+Z+pRM3ovIWAnf4RJyeUQP8LSPBlh+4QdvI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599725730049933.0012760702384; Thu, 10 Sep 2020 01:15:30 -0700 (PDT) Received: from localhost ([::1]:33116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGHjs-00084k-OZ for importer@patchew.org; Thu, 10 Sep 2020 04:15:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGHgZ-0002qG-PF for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:12:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26472) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGHgX-0002yM-Fe for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:12:03 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-99-ZiS3ztRhNGmy_3u770cwiw-1; Thu, 10 Sep 2020 04:11:58 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B5D26873016; Thu, 10 Sep 2020 08:11:57 +0000 (UTC) Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FAF471775; Thu, 10 Sep 2020 08:11:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599725520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6FmOdnRi/7jkAIaBY1QgC1BvHthmvmPp++5ZDnguTt8=; b=g17n5Yy5G5e5gvHLYISF8hPxZ1VxuyGAh8Zm4dmO8V0IYk4ohpwkRvwC3iUiEkdD6YwWUK JBuLIbDtrq/Dk3SSq+v6FLlcgJ4EBrKHsufOhqRoZ5OgDUMtjKMKmb4ijJu/KUP48EYu9v 4sCf0QUldwxiaRLsI0HgBlkqhYM01iw= X-MC-Unique: ZiS3ztRhNGmy_3u770cwiw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL v2 7/8] trace-events: Delete unused trace points Date: Thu, 10 Sep 2020 09:10:48 +0100 Message-Id: <20200910081049.38393-8-stefanha@redhat.com> In-Reply-To: <20200910081049.38393-1-stefanha@redhat.com> References: <20200910081049.38393-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 00:49:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Markus Armbruster Tracked down with the help of scripts/cleanup-trace-events.pl. Signed-off-by: Markus Armbruster Message-id: 20200806141334.3646302-4-armbru@redhat.com Signed-off-by: Stefan Hajnoczi --- audio/trace-events | 3 --- block/trace-events | 3 --- hw/misc/trace-events | 1 - hw/ppc/trace-events | 4 ---- hw/timer/trace-events | 1 - migration/trace-events | 1 - target/ppc/trace-events | 1 - 7 files changed, 14 deletions(-) diff --git a/audio/trace-events b/audio/trace-events index a1d1eccb8a..6aec535763 100644 --- a/audio/trace-events +++ b/audio/trace-events @@ -9,12 +9,9 @@ alsa_read_zero(long len) "Failed to read %ld frames (read = zero)" alsa_xrun_out(void) "Recovering from playback xrun" alsa_xrun_in(void) "Recovering from capture xrun" alsa_resume_out(void) "Resuming suspended output stream" -alsa_resume_in(void) "Resuming suspended input stream" -alsa_no_frames(int state) "No frames available and ALSA state is %d" =20 # ossaudio.c oss_version(int version) "OSS version =3D 0x%x" -oss_invalid_available_size(int size, int bufsize) "Invalid available size,= size=3D%d bufsize=3D%d" =20 # audio.c audio_timer_start(int interval) "interval %d ms" diff --git a/block/trace-events b/block/trace-events index e1c79a910d..6a204fa0ff 100644 --- a/block/trace-events +++ b/block/trace-events @@ -42,7 +42,6 @@ backup_do_cow_enter(void *job, int64_t start, int64_t off= set, uint64_t bytes) "j backup_do_cow_return(void *job, int64_t offset, uint64_t bytes, int ret) "= job %p offset %" PRId64 " bytes %" PRIu64 " ret %d" =20 # block-copy.c -block_copy_skip(void *bcs, int64_t start) "bcs %p start %"PRId64 block_copy_skip_range(void *bcs, int64_t start, uint64_t bytes) "bcs %p st= art %"PRId64" bytes %"PRId64 block_copy_process(void *bcs, int64_t start) "bcs %p start %"PRId64 block_copy_copy_range_fail(void *bcs, int64_t start, int ret) "bcs %p star= t %"PRId64" ret %d" @@ -200,8 +199,6 @@ curl_setup_preadv(uint64_t bytes, uint64_t start, const= char *range) "reading %" curl_close(void) "close" =20 # file-posix.c -file_xfs_write_zeroes(const char *error) "cannot write zero range (%s)" -file_xfs_discard(const char *error) "cannot punch hole (%s)" file_FindEjectableOpticalMedia(const char *media) "Matching using %s" file_setup_cdrom(const char *partition) "Using %s as optical disc" file_hdev_is_sg(int type, int version) "SG device found: type=3D%d, versio= n=3D%d" diff --git a/hw/misc/trace-events b/hw/misc/trace-events index 066752aa90..f9a0ba1a93 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -44,7 +44,6 @@ ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write d= iagnostic %"PRId64" =3D 0 ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= =3D 0x%02x" =20 # empty_slot.c -empty_slot_read(uint64_t addr, unsigned width, uint64_t value, unsigned si= ze, const char *name) "rd addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%s= ]" empty_slot_write(uint64_t addr, unsigned width, uint64_t value, unsigned s= ize, const char *name) "wr addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%= s]" =20 # slavio_misc.c diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index 7c0be4102e..ca34244e2a 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -10,7 +10,6 @@ spapr_pci_lsi_set(const char *busname, int pin, uint32_t = irq) "%s PIN%d IRQ %u" spapr_pci_msi_retry(unsigned config_addr, unsigned req_num, unsigned max_i= rqs) "Guest device at 0x%x asked %u, have only %u" =20 # spapr.c -spapr_cas_failed(unsigned long n) "DT diff buffer is too small: %ld bytes" spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" =20 # spapr_hcall.c @@ -77,9 +76,6 @@ spapr_vio_free_crq(uint32_t reg) "CRQ for dev 0x%" PRIx32= " freed" # ppc.c ppc_tb_adjust(uint64_t offs1, uint64_t offs2, int64_t diff, int64_t second= s) "adjusted from 0x%"PRIx64" to 0x%"PRIx64", diff %"PRId64" (%"PRId64"s)" =20 -# prep.c -prep_io_800_writeb(uint32_t addr, uint32_t val) "0x%08" PRIx32 " =3D> 0x%0= 2" PRIx32 -prep_io_800_readb(uint32_t addr, uint32_t retval) "0x%08" PRIx32 " <=3D 0x= %02" PRIx32 =20 # prep_systemio.c prep_systemio_read(uint32_t addr, uint32_t val) "read addr=3D0x%x val=3D0x= %x" diff --git a/hw/timer/trace-events b/hw/timer/trace-events index 447b7c405b..1537c3e6ec 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -81,7 +81,6 @@ avr_timer16_read(uint8_t addr, uint8_t value) "timer16 re= ad addr:%u value:%u" avr_timer16_read_ifr(uint8_t value) "timer16 read addr:ifr value:%u" avr_timer16_read_imsk(uint8_t value) "timer16 read addr:imsk value:%u" avr_timer16_write(uint8_t addr, uint8_t value) "timer16 write addr:%u valu= e:%u" -avr_timer16_write_ifr(uint8_t value) "timer16 write addr:ifr value:%u" avr_timer16_write_imsk(uint8_t value) "timer16 write addr:imsk value:%u" avr_timer16_interrupt_count(uint8_t cnt) "count: %u" avr_timer16_interrupt_overflow(const char *reason) "overflow: %s" diff --git a/migration/trace-events b/migration/trace-events index 4ab0a503d2..6f94106bfa 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -100,7 +100,6 @@ multifd_recv_sync_main_wait(uint8_t id) "channel %d" multifd_recv_terminate_threads(bool error) "error %d" multifd_recv_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "cha= nnel %d packets %" PRIu64 " pages %" PRIu64 multifd_recv_thread_start(uint8_t id) "%d" -multifd_save_setup_wait(uint8_t id) "%d" multifd_send(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flag= s, uint32_t next_packet_size) "channel %d packet_num %" PRIu64 " pages %d f= lags 0x%x next packet size %d" multifd_send_error(uint8_t id) "channel %d" multifd_send_sync_main(long packet_num) "packet num %ld" diff --git a/target/ppc/trace-events b/target/ppc/trace-events index 6d15aa90b4..bc0d4e6f8b 100644 --- a/target/ppc/trace-events +++ b/target/ppc/trace-events @@ -20,7 +20,6 @@ kvm_failed_dtl_set(const char *msg) "Unable to set dispat= ch trace log state to K kvm_failed_null_vpa_addr_set(const char *msg) "Unable to set VPA address t= o KVM: %s" kvm_failed_put_vpa(void) "Warning: Unable to set VPA information to KVM" kvm_failed_get_vpa(void) "Warning: Unable to get VPA information from KVM" -kvm_injected_interrupt(int irq) "injected interrupt %d" kvm_handle_dcr_write(void) "handle dcr write" kvm_handle_dcr_read(void) "handle dcr read" kvm_handle_halt(void) "handle halt" --=20 2.26.2 From nobody Fri May 3 06:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599725849; cv=none; d=zohomail.com; s=zohoarc; b=lqHFV6vA9L8wMDluZdL6MmutFKosFz2OmlMeikdQTlVOHxMvpJm4o3gOTDZOjkrDvQO8Ga5Y5QGZ3B/jwbrDWqvFAE1ZUt/Az5r5QGnRxax6Xl0jy2R0EWUsAVyiInTtWgg986Oqkqwq7IZiu75WuKApJ/8yV+lePHc2mfGEqvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599725849; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k2prxlHFuPdSRBr2HhJj2JCGk22jban+H8dcOA5x+iI=; b=Bpnt7mYMp6CVudI0ho31VfOQbmOiWWRAdxhzzi/vPuQsdY6nWQM/gyrOaLoAZ4VsPjfGSAyUUqErpWW9ycNm9tiU1qoI7RTIHabcj0GWT+5ksF8ul4qNPiJPN4ngIzbqrX4/kg/9SxrFOjRWUWHUUNTimW6OhFoJyqU2MOKwkGE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599725849587617.4545423427057; Thu, 10 Sep 2020 01:17:29 -0700 (PDT) Received: from localhost ([::1]:37194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGHlo-0001SO-65 for importer@patchew.org; Thu, 10 Sep 2020 04:17:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGHgu-0003Qc-NO for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:12:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGHgq-00035A-Ir for qemu-devel@nongnu.org; Thu, 10 Sep 2020 04:12:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-253-prq5LI4mMHa30WKsoDmhgQ-1; Thu, 10 Sep 2020 04:12:14 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6AB721007469; Thu, 10 Sep 2020 08:12:13 +0000 (UTC) Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5E477E46E; Thu, 10 Sep 2020 08:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599725539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k2prxlHFuPdSRBr2HhJj2JCGk22jban+H8dcOA5x+iI=; b=SYhlc9MHfp1s+4yI3yDA6449+vbAPPa1usfR8GYzXZKFvkkn6r1Z1x/U8MrAQSnZO3oOKJ PV4LfrjUF+3ZiKfxqULIx8d/bKNlYWDIOg19G36srJpeLA3iwGhXA8Lv9gRUmBbjiG7bIk j1vVwM85AMVS9a4ineJo99g+HNQu6Xc= X-MC-Unique: prq5LI4mMHa30WKsoDmhgQ-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL v2 8/8] trace-events: Fix attribution of trace points to source Date: Thu, 10 Sep 2020 09:10:49 +0100 Message-Id: <20200910081049.38393-9-stefanha@redhat.com> In-Reply-To: <20200910081049.38393-1-stefanha@redhat.com> References: <20200910081049.38393-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.004 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 00:49:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Markus Armbruster Some trace points are attributed to the wrong source file. Happens when we neglect to update trace-events for code motion, or add events in the wrong place, or misspell the file name. Clean up with help of scripts/cleanup-trace-events.pl. Funnies requiring manual post-processing: * accel/tcg/cputlb.c trace points are in trace-events. * block.c and blockdev.c trace points are in block/trace-events. * hw/block/nvme.c uses the preprocessor to hide its trace point use from cleanup-trace-events.pl. * hw/tpm/tpm_spapr.c uses pseudo trace point tpm_spapr_show_buffer to guard debug code. * include/hw/xen/xen_common.h trace points are in hw/xen/trace-events. * linux-user/trace-events abbreviates a tedious list of filenames to */signal.c. * net/colo-compare and net/filter-rewriter.c use pseudo trace points colo_compare_miscompare and colo_filter_rewriter_debug to guard debug code. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200806141334.3646302-5-armbru@redhat.com Signed-off-by: Stefan Hajnoczi --- block/trace-events | 5 ++--- hw/block/trace-events | 2 +- hw/char/trace-events | 2 +- hw/display/trace-events | 4 +++- hw/hyperv/trace-events | 2 +- hw/mips/trace-events | 2 +- hw/misc/trace-events | 8 +++++--- hw/ppc/trace-events | 6 ++---- hw/riscv/trace-events | 2 +- hw/rtc/trace-events | 2 +- hw/tpm/trace-events | 2 +- hw/usb/trace-events | 4 +++- hw/vfio/trace-events | 10 ++++++---- hw/virtio/trace-events | 2 +- migration/trace-events | 36 +++++++++++++++++++----------------- target/riscv/trace-events | 2 +- trace-events | 5 +++-- ui/trace-events | 6 +++--- util/trace-events | 4 +++- 19 files changed, 58 insertions(+), 48 deletions(-) diff --git a/block/trace-events b/block/trace-events index 6a204fa0ff..0e351c3fa3 100644 --- a/block/trace-events +++ b/block/trace-events @@ -58,12 +58,10 @@ qmp_block_job_finalize(void *job) "job %p" qmp_block_job_dismiss(void *job) "job %p" qmp_block_stream(void *bs) "bs %p" =20 -# file-posix.c # file-win32.c file_paio_submit(void *acb, void *opaque, int64_t offset, int count, int t= ype) "acb %p opaque %p offset %"PRId64" count %d type %d" -file_copy_file_range(void *bs, int src, int64_t src_off, int dst, int64_t = dst_off, int64_t bytes, int flags, int64_t ret) "bs %p src_fd %d offset %"P= RIu64" dst_fd %d offset %"PRIu64" bytes %"PRIu64" flags %d ret %"PRId64 =20 -#io_uring.c +# io_uring.c luring_init_state(void *s, size_t size) "s %p size %zu" luring_cleanup_state(void *s) "%p freed" luring_io_plug(void *s) "LuringState %p plug" @@ -199,6 +197,7 @@ curl_setup_preadv(uint64_t bytes, uint64_t start, const= char *range) "reading %" curl_close(void) "close" =20 # file-posix.c +file_copy_file_range(void *bs, int src, int64_t src_off, int dst, int64_t = dst_off, int64_t bytes, int flags, int64_t ret) "bs %p src_fd %d offset %"P= RIu64" dst_fd %d offset %"PRIu64" bytes %"PRIu64" flags %d ret %"PRId64 file_FindEjectableOpticalMedia(const char *media) "Matching using %s" file_setup_cdrom(const char *partition) "Using %s as optical disc" file_hdev_is_sg(int type, int version) "SG device found: type=3D%d, versio= n=3D%d" diff --git a/hw/block/trace-events b/hw/block/trace-events index 72cf2d15cb..ec94c56a41 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -4,8 +4,8 @@ fdc_ioport_read(uint8_t reg, uint8_t value) "read reg 0x%02x val 0x%02x" fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x" =20 -# pflash_cfi02.c # pflash_cfi01.c +# pflash_cfi02.c pflash_reset(void) "reset" pflash_timer_expired(uint8_t cmd) "command 0x%02x done" pflash_io_read(uint64_t offset, unsigned size, uint32_t value, uint8_t cmd= , uint8_t wcycle) "offset:0x%04"PRIx64" size:%u value:0x%04x cmd:0x%02x wcy= cle:%u" diff --git a/hw/char/trace-events b/hw/char/trace-events index d20eafd56f..2442a9f7d5 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -98,5 +98,5 @@ exynos_uart_rxsize(uint32_t channel, uint32_t size) "UART= %d: Rx FIFO size: %d" exynos_uart_channel_error(uint32_t channel) "Wrong UART channel number: %d" exynos_uart_rx_timeout(uint32_t channel, uint32_t stat, uint32_t intsp) "U= ART%d: Rx timeout stat=3D0x%x intsp=3D0x%x" =20 -# hw/char/cadence_uart.c +# cadence_uart.c cadence_uart_baudrate(unsigned baudrate) "baudrate %u" diff --git a/hw/display/trace-events b/hw/display/trace-events index 970d6bac5d..957b8ba994 100644 --- a/hw/display/trace-events +++ b/hw/display/trace-events @@ -32,9 +32,11 @@ vmware_scratch_read(uint32_t index, uint32_t value) "ind= ex %d, value 0x%x" vmware_scratch_write(uint32_t index, uint32_t value) "index %d, value 0x%x" vmware_setmode(uint32_t w, uint32_t h, uint32_t bpp) "%dx%d @ %d bpp" =20 +# virtio-gpu-base.c +virtio_gpu_features(bool virgl) "virgl %d" + # virtio-gpu-3d.c # virtio-gpu.c -virtio_gpu_features(bool virgl) "virgl %d" virtio_gpu_cmd_get_display_info(void) "" virtio_gpu_cmd_get_edid(uint32_t scanout) "scanout %d" virtio_gpu_cmd_set_scanout(uint32_t id, uint32_t res, uint32_t w, uint32_t= h, uint32_t x, uint32_t y) "id %d, res 0x%x, w %d, h %d, x %d, y %d" diff --git a/hw/hyperv/trace-events b/hw/hyperv/trace-events index ba5bd62d61..b4c35ca8e3 100644 --- a/hw/hyperv/trace-events +++ b/hw/hyperv/trace-events @@ -1,4 +1,4 @@ -# vmbus +# vmbus.c vmbus_recv_message(uint32_t type, uint32_t size) "type %d size %d" vmbus_signal_event(void) "" vmbus_channel_notify_guest(uint32_t chan_id) "channel #%d" diff --git a/hw/mips/trace-events b/hw/mips/trace-events index 321933283f..915139d981 100644 --- a/hw/mips/trace-events +++ b/hw/mips/trace-events @@ -1,4 +1,4 @@ -# gt64xxx.c +# gt64xxx_pci.c gt64120_read(const char *regname, unsigned size, uint64_t value) "gt64120 = read %s size:%u value:0x%08" PRIx64 gt64120_write(const char *regname, unsigned size, uint64_t value) "gt64120= write %s size:%u value:0x%08" PRIx64 gt64120_isd_remap(uint64_t from_length, uint64_t from_addr, uint64_t to_le= ngth, uint64_t to_addr) "ISD: 0x%08" PRIx64 "@0x%08" PRIx64 " -> 0x%08" PRI= x64 "@0x%08" PRIx64 diff --git a/hw/misc/trace-events b/hw/misc/trace-events index f9a0ba1a93..56a622d1e9 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -110,13 +110,13 @@ mos6522_set_sr_int(void) "set sr_int" mos6522_write(uint64_t addr, uint64_t val) "reg=3D0x%"PRIx64 " val=3D0x%"P= RIx64 mos6522_read(uint64_t addr, unsigned val) "reg=3D0x%"PRIx64 " val=3D0x%x" =20 -# stm32f4xx_syscfg +# stm32f4xx_syscfg.c stm32f4xx_syscfg_set_irq(int gpio, int line, int level) "Interupt: GPIO: %= d, Line: %d; Level: %d" stm32f4xx_pulse_exti(int irq) "Pulse EXTI: %d" stm32f4xx_syscfg_read(uint64_t addr) "reg read: addr: 0x%" PRIx64 " " stm32f4xx_syscfg_write(uint64_t addr, uint64_t data) "reg write: addr: 0x%= " PRIx64 " val: 0x%" PRIx64 "" =20 -# stm32f4xx_exti +# stm32f4xx_exti.c stm32f4xx_exti_set_irq(int irq, int leve) "Set EXTI: %d to %d" stm32f4xx_exti_read(uint64_t addr) "reg read: addr: 0x%" PRIx64 " " stm32f4xx_exti_write(uint64_t addr, uint64_t data) "reg write: addr: 0x%" = PRIx64 " val: 0x%" PRIx64 "" @@ -181,11 +181,13 @@ armsse_mhu_write(uint64_t offset, uint64_t data, unsi= gned size) "SSE-200 MHU wri # aspeed_xdma.c aspeed_xdma_write(uint64_t offset, uint64_t data) "XDMA write: offset 0x%"= PRIx64 " data 0x%" PRIx64 =20 +# bcm2835_property.c +bcm2835_mbox_property(uint32_t tag, uint32_t bufsize, size_t resplen) "mbo= x property tag:0x%08x in_sz:%u out_sz:%zu" + # bcm2835_mbox.c bcm2835_mbox_write(unsigned int size, uint64_t addr, uint64_t value) "mbox= write sz:%u addr:0x%"PRIx64" data:0x%"PRIx64 bcm2835_mbox_read(unsigned int size, uint64_t addr, uint64_t value) "mbox = read sz:%u addr:0x%"PRIx64" data:0x%"PRIx64 bcm2835_mbox_irq(unsigned level) "mbox irq:ARM level:%u" -bcm2835_mbox_property(uint32_t tag, uint32_t bufsize, size_t resplen) "mbo= x property tag:0x%08x in_sz:%u out_sz:%zu" =20 # mac_via.c via1_rtc_update_data_out(int count, int value) "count=3D%d value=3D0x%02x" diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index ca34244e2a..dcc06d49b5 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -9,10 +9,8 @@ spapr_pci_msi_write(uint64_t addr, uint64_t data, uint32_t= dt_irq) "@0x%"PRIx64" spapr_pci_lsi_set(const char *busname, int pin, uint32_t irq) "%s PIN%d IR= Q %u" spapr_pci_msi_retry(unsigned config_addr, unsigned req_num, unsigned max_i= rqs) "Guest device at 0x%x asked %u, have only %u" =20 -# spapr.c -spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" - # spapr_hcall.c +spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" spapr_cas_pvr(uint32_t cur_pvr, bool explicit_match, uint32_t new_pvr) "cu= rrent=3D0x%x, explicit_match=3D%u, new=3D0x%x" spapr_h_resize_hpt_prepare(uint64_t flags, uint64_t shift) "flags=3D0x%"PR= Ix64", shift=3D%"PRIu64 spapr_h_resize_hpt_commit(uint64_t flags, uint64_t shift) "flags=3D0x%"PRI= x64", shift=3D%"PRIu64 @@ -20,7 +18,7 @@ spapr_update_dt(unsigned cb) "New blob %u bytes" spapr_update_dt_failed_size(unsigned cbold, unsigned cbnew, unsigned magic= ) "Old blob %u bytes, new blob %u bytes, magic 0x%x" spapr_update_dt_failed_check(unsigned cbold, unsigned cbnew, unsigned magi= c) "Old blob %u bytes, new blob %u bytes, magic 0x%x" =20 -# spapr_hcall_tpm.c +# spapr_tpm_proxy.c spapr_h_tpm_comm(const char *device_path, uint64_t operation) "tpm_device_= path=3D%s operation=3D0x%"PRIu64 spapr_tpm_execute(uint64_t data_in, uint64_t data_in_sz, uint64_t data_out= , uint64_t data_out_sz) "data_in=3D0x%"PRIx64", data_in_sz=3D%"PRIu64", dat= a_out=3D0x%"PRIx64", data_out_sz=3D%"PRIu64 =20 diff --git a/hw/riscv/trace-events b/hw/riscv/trace-events index 6d59233e23..b819878963 100644 --- a/hw/riscv/trace-events +++ b/hw/riscv/trace-events @@ -1,6 +1,6 @@ # See docs/devel/tracing.txt for syntax documentation. =20 -# hw/gpio/sifive_gpio.c +# sifive_gpio.c sifive_gpio_read(uint64_t offset, uint64_t r) "offset 0x%" PRIx64 " value = 0x%" PRIx64 sifive_gpio_write(uint64_t offset, uint64_t value) "offset 0x%" PRIx64 " v= alue 0x%" PRIx64 sifive_gpio_set(int64_t line, int64_t value) "line %" PRIi64 " value %" PR= Ii64 diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events index 1bc7147d0e..8bdcf74264 100644 --- a/hw/rtc/trace-events +++ b/hw/rtc/trace-events @@ -18,7 +18,7 @@ pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x v= alue 0x%08x" pl031_alarm_raised(void) "alarm raised" pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks" =20 -# aspeed-rtc.c +# aspeed_rtc.c aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value= 0x%08" PRIx64 aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " valu= e 0x%08" PRIx64 =20 diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events index de9bf1e01b..266de17d38 100644 --- a/hw/tpm/trace-events +++ b/hw/tpm/trace-events @@ -4,7 +4,7 @@ tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x= %016" PRIx64 " len:%u val: 0x%" PRIx32 tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write = 0x%016" PRIx64 " len:%u val: 0x%" PRIx32 =20 -# tpm_tis.c +# tpm_tis_common.c tpm_tis_raise_irq(uint32_t irqmask) "Raising IRQ for flag 0x%08x" tpm_tis_new_active_locality(uint8_t locty) "Active locality is now %d" tpm_tis_abort(uint8_t locty) "New active locality is %d" diff --git a/hw/usb/trace-events b/hw/usb/trace-events index e9cdeeed14..72e4298780 100644 --- a/hw/usb/trace-events +++ b/hw/usb/trace-events @@ -10,6 +10,9 @@ usb_port_attach(int bus, const char *port, const char *de= vspeed, const char *por usb_port_detach(int bus, const char *port) "bus %d, port %s" usb_port_release(int bus, const char *port) "bus %d, port %s" =20 +# hcd-ohci-pci.c +usb_ohci_exit(const char *s) "%s" + # hcd-ohci.c usb_ohci_iso_td_read_failed(uint32_t addr) "ISO_TD read error at 0x%x" usb_ohci_iso_td_head(uint32_t head, uint32_t tail, uint32_t flags, uint32_= t bp, uint32_t next, uint32_t be, uint32_t framenum, uint32_t startframe, u= int32_t framecount, int rel_frame_num) "ISO_TD ED head 0x%.8x tailp 0x%.8x\= n0x%.8x 0x%.8x 0x%.8x 0x%.8x\nframe_number 0x%.8x starting_frame 0x%.8x\nfr= ame_count 0x%.8x relative %d" @@ -35,7 +38,6 @@ usb_ohci_reset(const char *s) "%s" usb_ohci_start(const char *s) "%s: USB Operational" usb_ohci_resume(const char *s) "%s: USB Resume" usb_ohci_stop(const char *s) "%s: USB Suspended" -usb_ohci_exit(const char *s) "%s" usb_ohci_set_ctl(const char *s, uint32_t new_state) "%s: new state 0x%x" usb_ohci_td_underrun(void) "" usb_ohci_td_dev_error(void) "" diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index b1ef55a33f..93a0bc2522 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -80,16 +80,18 @@ vfio_quirk_ati_bonaire_reset(const char *name) "%s" vfio_ioeventfd_exit(const char *name, uint64_t addr, unsigned size, uint64= _t data) "%s+0x%"PRIx64"[%d]:0x%"PRIx64 vfio_ioeventfd_handler(const char *name, uint64_t addr, unsigned size, uin= t64_t data) "%s+0x%"PRIx64"[%d] -> 0x%"PRIx64 vfio_ioeventfd_init(const char *name, uint64_t addr, unsigned size, uint64= _t data, bool vfio) "%s+0x%"PRIx64"[%d]:0x%"PRIx64" vfio:%d" -vfio_pci_igd_bar4_write(const char *name, uint32_t index, uint32_t data, u= int32_t base) "%s [0x%03x] 0x%08x -> 0x%08x" -vfio_pci_igd_bdsm_enabled(const char *name, int size) "%s %dMB" vfio_pci_igd_opregion_enabled(const char *name) "%s" -vfio_pci_igd_host_bridge_enabled(const char *name) "%s" -vfio_pci_igd_lpc_bridge_enabled(const char *name) "%s" =20 vfio_pci_nvidia_gpu_setup_quirk(const char *name, uint64_t tgt, uint64_t s= ize) "%s tgt=3D0x%"PRIx64" size=3D0x%"PRIx64 vfio_pci_nvlink2_setup_quirk_ssatgt(const char *name, uint64_t tgt, uint64= _t size) "%s tgt=3D0x%"PRIx64" size=3D0x%"PRIx64 vfio_pci_nvlink2_setup_quirk_lnkspd(const char *name, uint32_t link_speed)= "%s link_speed=3D0x%x" =20 +# igd.c +vfio_pci_igd_bar4_write(const char *name, uint32_t index, uint32_t data, u= int32_t base) "%s [0x%03x] 0x%08x -> 0x%08x" +vfio_pci_igd_bdsm_enabled(const char *name, int size) "%s %dMB" +vfio_pci_igd_host_bridge_enabled(const char *name) "%s" +vfio_pci_igd_lpc_bridge_enabled(const char *name) "%s" + # common.c vfio_region_write(const char *name, int index, uint64_t addr, uint64_t dat= a, unsigned size) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)" vfio_region_read(char *name, int index, uint64_t addr, unsigned size, uint= 64_t data) " (%s:region%d+0x%"PRIx64", %d) =3D 0x%"PRIx64 diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 045e89cae6..845200bf10 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -55,7 +55,7 @@ virtio_mmio_guest_page(uint64_t size, int shift) "guest p= age size 0x%" PRIx64 " virtio_mmio_queue_write(uint64_t value, int max_size) "mmio_queue write 0x= %" PRIx64 " max %d" virtio_mmio_setting_irq(int level) "virtio_mmio setting IRQ %d" =20 -# hw/virtio/virtio-iommu.c +# virtio-iommu.c virtio_iommu_device_reset(void) "reset!" virtio_iommu_get_features(uint64_t features) "device supports features=3D0= x%"PRIx64 virtio_iommu_device_status(uint8_t status) "driver status =3D %d" diff --git a/migration/trace-events b/migration/trace-events index 6f94106bfa..7ba2fa6644 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -91,23 +91,6 @@ migration_bitmap_sync_start(void) "" migration_bitmap_sync_end(uint64_t dirty_pages) "dirty_pages %" PRIu64 migration_bitmap_clear_dirty(char *str, uint64_t start, uint64_t size, uns= igned long page) "rb %s start 0x%"PRIx64" size 0x%"PRIx64" page 0x%lx" migration_throttle(void) "" -multifd_new_send_channel_async(uint8_t id) "channel %d" -multifd_recv(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flag= s, uint32_t next_packet_size) "channel %d packet_num %" PRIu64 " pages %d f= lags 0x%x next packet size %d" -multifd_recv_new_channel(uint8_t id) "channel %d" -multifd_recv_sync_main(long packet_num) "packet num %ld" -multifd_recv_sync_main_signal(uint8_t id) "channel %d" -multifd_recv_sync_main_wait(uint8_t id) "channel %d" -multifd_recv_terminate_threads(bool error) "error %d" -multifd_recv_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "cha= nnel %d packets %" PRIu64 " pages %" PRIu64 -multifd_recv_thread_start(uint8_t id) "%d" -multifd_send(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flag= s, uint32_t next_packet_size) "channel %d packet_num %" PRIu64 " pages %d f= lags 0x%x next packet size %d" -multifd_send_error(uint8_t id) "channel %d" -multifd_send_sync_main(long packet_num) "packet num %ld" -multifd_send_sync_main_signal(uint8_t id) "channel %d" -multifd_send_sync_main_wait(uint8_t id) "channel %d" -multifd_send_terminate_threads(bool error) "error %d" -multifd_send_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "cha= nnel %d packets %" PRIu64 " pages %" PRIu64 -multifd_send_thread_start(uint8_t id) "%d" ram_discard_range(const char *rbname, uint64_t start, size_t len) "%s: sta= rt: %" PRIx64 " %zx" ram_load_loop(const char *rbname, uint64_t addr, int flags, void *host) "%= s: addr: 0x%" PRIx64 " flags: 0x%x host: %p" ram_load_postcopy_loop(uint64_t addr, int flags) "@%" PRIx64 " %x" @@ -128,6 +111,25 @@ save_xbzrle_page_overflow(void) "" ram_save_iterate_big_wait(uint64_t milliconds, int iterations) "big wait: = %" PRIu64 " milliseconds, %d iterations" ram_load_complete(int ret, uint64_t seq_iter) "exit_code %d seq iteration = %" PRIu64 =20 +# multifd.c +multifd_new_send_channel_async(uint8_t id) "channel %d" +multifd_recv(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flag= s, uint32_t next_packet_size) "channel %d packet_num %" PRIu64 " pages %d f= lags 0x%x next packet size %d" +multifd_recv_new_channel(uint8_t id) "channel %d" +multifd_recv_sync_main(long packet_num) "packet num %ld" +multifd_recv_sync_main_signal(uint8_t id) "channel %d" +multifd_recv_sync_main_wait(uint8_t id) "channel %d" +multifd_recv_terminate_threads(bool error) "error %d" +multifd_recv_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "cha= nnel %d packets %" PRIu64 " pages %" PRIu64 +multifd_recv_thread_start(uint8_t id) "%d" +multifd_send(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flag= s, uint32_t next_packet_size) "channel %d packet_num %" PRIu64 " pages %d f= lags 0x%x next packet size %d" +multifd_send_error(uint8_t id) "channel %d" +multifd_send_sync_main(long packet_num) "packet num %ld" +multifd_send_sync_main_signal(uint8_t id) "channel %d" +multifd_send_sync_main_wait(uint8_t id) "channel %d" +multifd_send_terminate_threads(bool error) "error %d" +multifd_send_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "cha= nnel %d packets %" PRIu64 " pages %" PRIu64 +multifd_send_thread_start(uint8_t id) "%d" + # migration.c await_return_path_close_on_source_close(void) "" await_return_path_close_on_source_joining(void) "" diff --git a/target/riscv/trace-events b/target/riscv/trace-events index 4b6c652ae9..b7e371ee97 100644 --- a/target/riscv/trace-events +++ b/target/riscv/trace-events @@ -1,4 +1,4 @@ -# target/riscv/cpu_helper.c +# cpu_helper.c riscv_trap(uint64_t hartid, bool async, uint64_t cause, uint64_t epc, uint= 64_t tval, const char *desc) "hart:%"PRId64", async:%d, cause:%"PRId64", ep= c:0x%"PRIx64", tval:0x%"PRIx64", desc=3D%s" =20 # pmp.c diff --git a/trace-events b/trace-events index 5882c2d5fc..ac7cef9335 100644 --- a/trace-events +++ b/trace-events @@ -36,6 +36,8 @@ dma_map_wait(void *dbs) "dbs=3D%p" find_ram_offset(uint64_t size, uint64_t offset) "size: 0x%" PRIx64 " @ 0x%= " PRIx64 find_ram_offset_loop(uint64_t size, uint64_t candidate, uint64_t offset, u= int64_t next, uint64_t mingap) "trying size: 0x%" PRIx64 " @ 0x%" PRIx64 ",= offset: 0x%" PRIx64" next: 0x%" PRIx64 " mingap: 0x%" PRIx64 ram_block_discard_range(const char *rbname, void *hva, size_t length, bool= need_madvise, bool need_fallocate, int ret) "%s@%p + 0x%zx: madvise: %d fa= llocate: %d ret: %d" + +# accel/tcg/cputlb.c memory_notdirty_write_access(uint64_t vaddr, uint64_t ram_addr, unsigned s= ize) "0x%" PRIx64 " ram_addr 0x%" PRIx64 " size %u" memory_notdirty_set_dirty(uint64_t vaddr) "0x%" PRIx64 =20 @@ -134,8 +136,7 @@ vcpu guest_cpu_reset(void) # Targets: TCG(all) vcpu tcg guest_mem_before(TCGv vaddr, uint16_t info) "info=3D%d", "vaddr= =3D0x%016"PRIx64" info=3D%d" =20 -# linux-user/syscall.c -# bsd-user/syscall.c +# include/user/syscall-trace.h =20 # @num: System call number. # @arg*: System call argument value. diff --git a/ui/trace-events b/ui/trace-events index 5367fd3f16..b7d7270c02 100644 --- a/ui/trace-events +++ b/ui/trace-events @@ -17,9 +17,9 @@ displaychangelistener_register(void *dcl, const char *nam= e) "%p [ %s ]" displaychangelistener_unregister(void *dcl, const char *name) "%p [ %s ]" ppm_save(int fd, void *display_surface) "fd=3D%d surface=3D%p" =20 -# gtk.c -# gtk-gl-area.c # gtk-egl.c +# gtk-gl-area.c +# gtk.c gd_switch(const char *tab, int width, int height) "tab=3D%s, width=3D%d, h= eight=3D%d" gd_update(const char *tab, int x, int y, int w, int h) "tab=3D%s, x=3D%d, = y=3D%d, w=3D%d, h=3D%d" gd_key_event(const char *tab, int gdk_keycode, int qkeycode, const char *a= ction) "tab=3D%s, translated GDK keycode %d to QKeyCode %d (%s)" @@ -28,8 +28,8 @@ gd_ungrab(const char *tab, const char *device) "tab=3D%s,= dev=3D%s" gd_keymap_windowing(const char *name) "backend=3D%s" =20 # vnc-auth-sasl.c -# vnc-ws.c # vnc-auth-vencrypt.c +# vnc-ws.c # vnc.c vnc_key_guest_leds(bool caps, bool num, bool scroll) "caps %d, num %d, scr= oll %d" vnc_key_map_init(const char *layout) "%s" diff --git a/util/trace-events b/util/trace-events index d9a0b4f8c6..4e894aa9c3 100644 --- a/util/trace-events +++ b/util/trace-events @@ -44,8 +44,8 @@ qemu_co_mutex_lock_return(void *mutex, void *self) "mutex= %p self %p" qemu_co_mutex_unlock_entry(void *mutex, void *self) "mutex %p self %p" qemu_co_mutex_unlock_return(void *mutex, void *self) "mutex %p self %p" =20 -# oslib-win32.c # oslib-posix.c +# oslib-win32.c qemu_memalign(size_t alignment, size_t size, void *ptr) "alignment %zu siz= e %zu ptr %p" qemu_anon_ram_alloc(size_t size, void *ptr) "size %zu ptr %p" qemu_vfree(void *ptr) "ptr %p" @@ -70,6 +70,8 @@ lockcnt_futex_wake(const void *lockcnt) "lockcnt %p wakin= g up one waiter" socket_listen(int num) "backlog: %d" =20 # qemu-thread-common.h +# qemu-thread-posix.c +# qemu-thread-win32.c qemu_mutex_lock(void *mutex, const char *file, const int line) "waiting on= mutex %p (%s:%d)" qemu_mutex_locked(void *mutex, const char *file, const int line) "taken mu= tex %p (%s:%d)" qemu_mutex_unlock(void *mutex, const char *file, const int line) "released= mutex %p (%s:%d)" --=20 2.26.2