From patchwork Mon Apr 17 16:40:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 673835 Delivered-To: patch@linaro.org Received: by 2002:adf:fcce:0:0:0:0:0 with SMTP id f14csp1604366wrs; Mon, 17 Apr 2023 09:41:00 -0700 (PDT) X-Google-Smtp-Source: AKy350aiqP8Xlz9dBBORhQ/jsTm9pJBk2ztQwfz0iTXvTynp2R5bQXr57uZGO7/ok+Ym8X5MS7oF X-Received: by 2002:a05:622a:1a18:b0:3e1:7bb5:f0c5 with SMTP id f24-20020a05622a1a1800b003e17bb5f0c5mr23337302qtb.58.1681749660331; Mon, 17 Apr 2023 09:41:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681749660; cv=none; d=google.com; s=arc-20160816; b=XDQJwqKjZNmzwa6dcfJdLTx7PTkc1qnc0KIX5QbQyzYvJF6vgBkcbSZ5GaSVdxEGAD 9cfVrn4NCngUShEzXoWU6N2vWYoQv20g7pzyQwGM1VkHj2fMYE4gB3dAIuztlxGjpSdR MlJZc+xdSm18MoJxVZIH3bn+fXLFQny0MbNk++wcCI+GPGETJOOzUkYz71axtL/6zpOE cWe2kWoCk4Vo9uSJsI4nwgPGEl6sPedEjxPrWpQa410vFTrhoP1T9kKPer9oqN27+2wp 6AFmGl6YwzHjtxylQ3qmL0KMdr5HdHrxAYrNpS4UjgE0jeXAMUmMK+Hs0Fq5R62Rrh+o yLsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:sender:errors-to:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to:delivered-to:dkim-signature; bh=IUG+bykQ/Oriq02A76XvnJLKzQfmPW2xVt1eESF/Lno=; b=y86p/YOtkDQW33Mm3+pE7DfdkMqVuYkUNNpcipFqWBkdjyt452tsR+VpSD+R1NqYdu yATjjjskg5sDdrd8CcTPQNuQoArTRh40Ty9EcC/1HyGt5f0LQlYS7CoaQRHnf0dUWn1I PNr4w3ZH93f9I30GjqXs6ovtbr6B2NZ7l0seXC3JrVRpIhngDeKZMwiRBowRhmLYJqS7 waJ2+uzV3qix4VqAWuAoVbyFVKxrjV/Xi+6KirPIaBzuiMRkN8VGPTdJVTb7zd5bLht+ N2lGqxpj3bC9/n5m0MIcx/cin8yaozALjZZSZXMNShb/T1cms7l8ka9keVyed7aCP6m8 suhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="NYnyh/k8"; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.129.124]) by mx.google.com with ESMTPS id bm1-20020a05620a198100b007457afe9dccsi5824455qkb.465.2023.04.17.09.41.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 09:41:00 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="NYnyh/k8"; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681749659; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IUG+bykQ/Oriq02A76XvnJLKzQfmPW2xVt1eESF/Lno=; b=NYnyh/k8IE4vtpJksPGsOuj4D1isvr4SjpReWL2nnvqAnQWnGNWByUVoi/5Vm4z41d1bOB gF9ZDFtICMS711Waz0bvZgDweYuZ6fhJqAsuY9DrxTvUD8q4xl5Qfuno9dRAujeDuVWMDw OOZY1vaGSvH4gu7UbKhKYnxpfNsHL2k= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-513-WyR2ZEryNTySIU0itK4BHg-1; Mon, 17 Apr 2023 12:40:58 -0400 X-MC-Unique: WyR2ZEryNTySIU0itK4BHg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B812210334A5; Mon, 17 Apr 2023 16:40:51 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3A7340C6E6F; Mon, 17 Apr 2023 16:40:51 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 80449194658C; Mon, 17 Apr 2023 16:40:51 +0000 (UTC) X-Original-To: libvir-list@listman.corp.redhat.com Delivered-To: libvir-list@listman.corp.redhat.com Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7539F194658D for ; Mon, 17 Apr 2023 16:40:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5C621492B0F; Mon, 17 Apr 2023 16:40:50 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54F26492B03 for ; Mon, 17 Apr 2023 16:40:50 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3C1083C0F691 for ; Mon, 17 Apr 2023 16:40:50 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-272-QgyqCFd8OGasrLIbwPma5Q-1; Mon, 17 Apr 2023 12:40:48 -0400 X-MC-Unique: QgyqCFd8OGasrLIbwPma5Q-1 Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-2f87c5b4635so1471303f8f.1 for ; Mon, 17 Apr 2023 09:40:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681749647; x=1684341647; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IUG+bykQ/Oriq02A76XvnJLKzQfmPW2xVt1eESF/Lno=; b=Qu+fmdnn9fNj3fbONRQWNk56m0nKNgJ1rfLxmwxtFQywZe0Qvxn2hkkzLVr6Rngt6R HU0iYTcwOa0kci1CoGOKxF2UcRKLuZdomxQmX+mHYDd2QZgDfQ5kvdH/VAgk7jKLvOqS ahm4+VnU4def6AeFj2UDGiHXqZGIIhc2Uo52A/qm7pgb0M4MmZRwlsLvYosx5K9Aw4yY ry+qElleFeHLQRA64mJ7KfBWm/nQte7Oq/Ti4J4n9SUGpRWzxpt67I+TdYSJtMLK86d1 AliYhDSv4Oz5aymyx5xNqwjsn0xA3kwT/gr1bMiV0NcHxhRSZVcUvpeNNwNfrhWVYh8t yOFw== X-Gm-Message-State: AAQBX9eVTBR+neZAJOfRrKrus7y4iBxROClNAYADp4RyM7foOe3UVQv4 0UJ9IzjqqOy9/G06srJRWGC3Bg== X-Received: by 2002:adf:f40e:0:b0:2f4:cf53:c961 with SMTP id g14-20020adff40e000000b002f4cf53c961mr5470660wro.54.1681749646915; Mon, 17 Apr 2023 09:40:46 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id q17-20020a5d61d1000000b002faaa9a1721sm2595103wrv.58.2023.04.17.09.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 09:40:46 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v3 07/10] accel/tcg: Report one-insn-per-tb in 'info jit', not 'info status' Date: Mon, 17 Apr 2023 17:40:38 +0100 Message-Id: <20230417164041.684562-8-peter.maydell@linaro.org> In-Reply-To: <20230417164041.684562-1-peter.maydell@linaro.org> References: <20230417164041.684562-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: libvir-list@redhat.com, Kyle Evans , Richard Henderson , Markus Armbruster , Laurent Vivier , Eric Blake , Warner Losh Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: linaro.org Currently we report whether the TCG accelerator is in 'one-insn-per-tb' mode in the 'info status' output. This is a pretty minor piece of TCG specific information, and we want to deprecate the 'singlestep' field of the associated QMP command. Move the 'one-insn-per-tb' reporting to 'info jit'. We don't need a deprecate-and-drop period for this because the HMP interface has no stability guarantees. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- The new 'accelerator settings' subsection of the output currently only has one item, but it would be a place to put other stuff, eg if we wanted to mention whether split-wx is enabled. --- accel/tcg/monitor.c | 14 ++++++++++++++ softmmu/runstate-hmp-cmds.c | 5 ++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/accel/tcg/monitor.c b/accel/tcg/monitor.c index 1450e160e95..92fce580f11 100644 --- a/accel/tcg/monitor.c +++ b/accel/tcg/monitor.c @@ -7,6 +7,7 @@ */ #include "qemu/osdep.h" +#include "qemu/accel.h" #include "qapi/error.h" #include "qapi/type-helpers.h" #include "qapi/qapi-commands-machine.h" @@ -36,6 +37,18 @@ static void dump_drift_info(GString *buf) } } +static void dump_accel_info(GString *buf) +{ + AccelState *accel = current_accel(); + bool one_insn_per_tb = object_property_get_bool(OBJECT(accel), + "one-insn-per-tb", + &error_fatal); + + g_string_append_printf(buf, "Accelerator settings:\n"); + g_string_append_printf(buf, "one-insn-per-tb: %s\n\n", + one_insn_per_tb ? "on" : "off"); +} + HumanReadableText *qmp_x_query_jit(Error **errp) { g_autoptr(GString) buf = g_string_new(""); @@ -45,6 +58,7 @@ HumanReadableText *qmp_x_query_jit(Error **errp) return NULL; } + dump_accel_info(buf); dump_exec_info(buf); dump_drift_info(buf); diff --git a/softmmu/runstate-hmp-cmds.c b/softmmu/runstate-hmp-cmds.c index 127521a483a..a477838dc5a 100644 --- a/softmmu/runstate-hmp-cmds.c +++ b/softmmu/runstate-hmp-cmds.c @@ -28,9 +28,8 @@ void hmp_info_status(Monitor *mon, const QDict *qdict) info = qmp_query_status(NULL); - monitor_printf(mon, "VM status: %s%s", - info->running ? "running" : "paused", - info->singlestep ? " (single step mode)" : ""); + monitor_printf(mon, "VM status: %s", + info->running ? "running" : "paused"); if (!info->running && info->status != RUN_STATE_PAUSED) { monitor_printf(mon, " (%s)", RunState_str(info->status));