From nobody Fri Nov 7 23:17:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548818656869960.1438747124914; Tue, 29 Jan 2019 19:24:16 -0800 (PST) Received: from localhost ([127.0.0.1]:59719 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gogU3-0000c4-Rk for importer@patchew.org; Tue, 29 Jan 2019 22:24:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gogPG-0005Uo-Sz for qemu-devel@nongnu.org; Tue, 29 Jan 2019 22:19:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gogPG-0006qh-6W for qemu-devel@nongnu.org; Tue, 29 Jan 2019 22:19:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40404) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gogPG-0006qR-15 for qemu-devel@nongnu.org; Tue, 29 Jan 2019 22:19:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 27C5481106; Wed, 30 Jan 2019 03:19:17 +0000 (UTC) Received: from localhost (unknown [10.64.242.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id E655460C6E; Wed, 30 Jan 2019 03:19:09 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Wed, 30 Jan 2019 11:18:16 +0800 Message-Id: <20190130031817.27780-6-stefanha@redhat.com> In-Reply-To: <20190130031817.27780-1-stefanha@redhat.com> References: <20190130031817.27780-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 30 Jan 2019 03:19:17 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 5/6] trace: improve runstate tracing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Alex Williamson , Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Trace previous state, move tracepoint to runstate_set start (to cover all cases for debugging), add string representations of traced states. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-id: 20190124125154.474650-1-vsementsov@virtuozzo.com Signed-off-by: Stefan Hajnoczi --- vl.c | 7 +++++-- trace-events | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index bc9fbec654..9cf0fbe0b8 100644 --- a/vl.c +++ b/vl.c @@ -731,6 +731,9 @@ void runstate_set(RunState new_state) { assert(new_state < RUN_STATE__MAX); =20 + trace_runstate_set(current_run_state, RunState_str(current_run_state), + new_state, RunState_str(current_run_state)); + if (current_run_state =3D=3D new_state) { return; } @@ -741,7 +744,7 @@ void runstate_set(RunState new_state) RunState_str(new_state)); abort(); } - trace_runstate_set(new_state); + current_run_state =3D new_state; } =20 @@ -1554,7 +1557,7 @@ void vm_state_notify(int running, RunState state) { VMChangeStateEntry *e, *next; =20 - trace_vm_state_notify(running, state); + trace_vm_state_notify(running, state, RunState_str(state)); =20 QLIST_FOREACH_SAFE(e, &vm_change_state_head, entries, next) { e->cb(e->opaque, running, state); diff --git a/trace-events b/trace-events index 4fd2cb4b97..e66afc59e9 100644 --- a/trace-events +++ b/trace-events @@ -34,9 +34,9 @@ cpu_out(unsigned int addr, char size, unsigned int val) "= addr 0x%x(%c) value %u" balloon_event(void *opaque, unsigned long addr) "opaque %p addr %lu" =20 # vl.c -vm_state_notify(int running, int reason) "running %d reason %d" +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 new_state) "new state %d" +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) "" --=20 2.20.1