From nobody Tue May 14 17:46:08 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705504494; cv=none; d=zohomail.com; s=zohoarc; b=V2SC2fxCbMM7bTwdZWfGBIsYK73pseymU2d06MAfuosACz3Qt96DCnFU7/mVIOx/vhYA9JGTrPx1t8yCEoD5g4CPeZbqVuvZn/CimGKIf8ngXlHGLwAic8Hg1V5nm03jEShTGxwcTHV2q0jwt1pNj259SuDEE8/swwawyX5QFTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705504494; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hRFIo+sANtkcthPh6i5AZChRwskxcATVI00RZjMZ6v0=; b=KqQkOmmI7yt2vK7Q+LZDPbCbu7J2IOOXYiQPzC9pWPQZbNglASaaw8g7Fdv2na8bMiTOsCOdCgr/akT3B+i2Y9Nwck8aW+HuyySQ1wgTZK6wvDFZlT+ktLwxRu+T+0uBiJEhGeA/IRABUMzoGf8IZBFaiK2ydILEecFgvV1xRx0= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705504494403902.4938134321619; Wed, 17 Jan 2024 07:14:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQ7cu-0000A3-T3; Wed, 17 Jan 2024 10:14:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQ7cr-0008Qu-QG for qemu-devel@nongnu.org; Wed, 17 Jan 2024 10:14:45 -0500 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQ7co-0005nx-Ae for qemu-devel@nongnu.org; Wed, 17 Jan 2024 10:14:44 -0500 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-559533e2503so3830541a12.1 for ; Wed, 17 Jan 2024 07:14:41 -0800 (PST) Received: from m1x-phil.lan ([176.187.212.26]) by smtp.gmail.com with ESMTPSA id b23-20020a056402139700b0055920196ddesm5111488edv.54.2024.01.17.07.14.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 Jan 2024 07:14:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705504480; x=1706109280; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hRFIo+sANtkcthPh6i5AZChRwskxcATVI00RZjMZ6v0=; b=JHIPfVcpyky+QkKsmwfyQCsEmaj2BGHQNEM4ja5ey4whywEtXxto0L8stQ4BAuyQuu mo37SlMWMVihQARDXiiYujDsMd20Qstwcecd+IrDFNGYKh8topd8QSX0HpkqLIBYjWnR o2DQHCc12+lW3VAv/t9W9z7rqCU0FJIqaArHOv+Ip6zrGJshxuuS6OK7z1X53QVR1UsT Nzu5Buzvhjl2CVxSrUcHTPslFpc/6q7ZmLZ521nv/RdFttk8RtPHaDJ4/BceVDK1YPNF QVVjnR2UJFPy8aAUVyRcFRwgyKa533NZgK0G33TwET54CWHEuTH8u9Fr9hj4vxKfQnSx ANaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705504480; x=1706109280; 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=hRFIo+sANtkcthPh6i5AZChRwskxcATVI00RZjMZ6v0=; b=RBtsh7LvIKHuzG9d1gAYQQvDXIDAgeOOcyC7Js35G3AqKcyHuVo2RGmvxuE6SX9N0M +Doo7YP+OWUJIUce+z3Z8DxDmwyZTSRk4O9++uU0hJCHEcIEahus6xB1LmobjCRBa8e8 1h247TcOoRIDkoYY6pdeo1Podo8AgY3twqyaAu0QvpvGhj2/KLbz+GwdtiD2L+E18mOc CEn/d2Hkgs+GzuZMMhZceCjgTEQ72bGO/QsIBpaFDxzv4BfZ8rGD5U2JX4iF68orpUb+ wOKvzbIhEuvcbm3v42n+Q0Bxv9xFYZR57FA1ZnHBn+KJ0AjdqGYkxlpqWA59BMbNdb/q /ddw== X-Gm-Message-State: AOJu0Yyuh2o3UJ4Zh/cM5mnCj5N7zfHoytCmJhtAeHHn20AHG2+/G3CD hg1a/Jt/jUwm+ftMjkztjPeOwkHmWyEhLMt/Oc4SqvAB5ng= X-Google-Smtp-Source: AGHT+IEXwcYUmgqXF16vOM/+/oFy9A/Ro5mBV176cwKMucJagcvWN+WBedGv8AhMkw6CHlZrfkOqNw== X-Received: by 2002:a05:6402:5241:b0:557:8a58:ebdc with SMTP id t1-20020a056402524100b005578a58ebdcmr6015904edd.9.1705504480473; Wed, 17 Jan 2024 07:14:40 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Warner Losh , Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Laurent Vivier , Hanna Reitz , Kevin Wolf , Kyle Evans , Peter Maydell , qemu-block@nongnu.org, devel@lists.libvirt.org, Laurent Vivier , Eric Blake , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/3] qapi: Remove deprecated 'singlestep' member of StatusInfo Date: Wed, 17 Jan 2024 16:14:28 +0100 Message-ID: <20240117151430.29235-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240117151430.29235-1-philmd@linaro.org> References: <20240117151430.29235-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::52d; envelope-from=philmd@linaro.org; helo=mail-ed1-x52d.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705504496723100003 This member has been deprecated before the 8.1 release, in commit 34c18203d4 ("qmp: Deprecate 'singlestep' member of StatusInfo"). Time to drop it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster --- docs/about/deprecated.rst | 14 -------------- qapi/run-state.json | 11 ----------- system/runstate.c | 8 -------- tests/qemu-iotests/183.out | 4 ++-- tests/qemu-iotests/234.out | 8 ++++---- tests/qemu-iotests/262.out | 4 ++-- tests/qemu-iotests/280.out | 2 +- 7 files changed, 9 insertions(+), 42 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 9a2c994617..25527da423 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -151,20 +151,6 @@ accepted incorrect commands will return an error. User= s should make sure that all arguments passed to ``device_add`` are consistent with the documented property types. =20 -``StatusInfo`` member ``singlestep`` (since 8.1) -'''''''''''''''''''''''''''''''''''''''''''''''' - -The ``singlestep`` member of the ``StatusInfo`` returned from the -``query-status`` command is deprecated. This member has a confusing -name and it never did what the documentation claimed or what its name -suggests. We do not believe that anybody is actually using the -information provided in this member. - -The information it reports is whether the TCG JIT is in "one -instruction per translated block" mode (which can be set on the -command line or via the HMP, but not via QMP). The information remains -available via the HMP 'info jit' command. - QEMU Machine Protocol (QMP) events ---------------------------------- =20 diff --git a/qapi/run-state.json b/qapi/run-state.json index ca05502e0a..08bc99cb85 100644 --- a/qapi/run-state.json +++ b/qapi/run-state.json @@ -106,25 +106,15 @@ # # @running: true if all VCPUs are runnable, false if not runnable # -# @singlestep: true if using TCG with one guest instruction per -# translation block -# # @status: the virtual machine @RunState # # Features: # -# @deprecated: Member 'singlestep' is deprecated (with no -# replacement). -# # Since: 0.14 # -# Notes: @singlestep is enabled on the command line with '-accel -# tcg,one-insn-per-tb=3Don', or with the HMP 'one-insn-per-tb' -# command. ## { 'struct': 'StatusInfo', 'data': {'running': 'bool', - 'singlestep': { 'type': 'bool', 'features': [ 'deprecated' ]}, 'status': 'RunState'} } =20 ## @@ -140,7 +130,6 @@ # # -> { "execute": "query-status" } # <- { "return": { "running": true, -# "singlestep": false, # "status": "running" } } ## { 'command': 'query-status', 'returns': 'StatusInfo', diff --git a/system/runstate.c b/system/runstate.c index fb07b7b71a..d6ab860eca 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -242,15 +242,7 @@ bool runstate_needs_reset(void) StatusInfo *qmp_query_status(Error **errp) { StatusInfo *info =3D g_malloc0(sizeof(*info)); - AccelState *accel =3D current_accel(); =20 - /* - * We ignore errors, which will happen if the accelerator - * is not TCG. "singlestep" is meaningless for other accelerators, - * so we will set the StatusInfo field to false for those. - */ - info->singlestep =3D object_property_get_bool(OBJECT(accel), - "one-insn-per-tb", NULL); info->running =3D runstate_is_running(); info->status =3D current_run_state; =20 diff --git a/tests/qemu-iotests/183.out b/tests/qemu-iotests/183.out index fd9c2e52a5..9277643853 100644 --- a/tests/qemu-iotests/183.out +++ b/tests/qemu-iotests/183.out @@ -30,13 +30,13 @@ read 65536/65536 bytes at offset 0 'arguments': { 'uri': 'unix:SOCK_DIR/migrate', 'blk': true } } {"return": {}} { 'execute': 'query-status' } -{"return": {"status": "postmigrate", "singlestep": false, "running": false= }} +{"return": {"status": "postmigrate", "running": false}} =20 =3D=3D=3D Do some I/O on the destination =3D=3D=3D =20 { 'execute': 'query-status' } {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "RESUME"} -{"return": {"status": "running", "singlestep": false, "running": true}} +{"return": {"status": "running", "running": true}} { 'execute': 'human-monitor-command', 'arguments': { 'command-line': 'qemu-io disk "read -P 0x55 0 64k"' } } diff --git a/tests/qemu-iotests/234.out b/tests/qemu-iotests/234.out index 692976d1c6..ac8b64350c 100644 --- a/tests/qemu-iotests/234.out +++ b/tests/qemu-iotests/234.out @@ -15,8 +15,8 @@ Starting migration to B... {"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"mic= roseconds": "USECS", "seconds": "SECS"}} completed completed -{"return": {"running": false, "singlestep": false, "status": "postmigrate"= }} -{"return": {"running": true, "singlestep": false, "status": "running"}} +{"return": {"running": false, "status": "postmigrate"}} +{"return": {"running": true, "status": "running"}} Add a second parent to drive0-file... {"return": {}} Restart A with -incoming and second parent... @@ -32,5 +32,5 @@ Starting migration back to A... {"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"mic= roseconds": "USECS", "seconds": "SECS"}} completed completed -{"return": {"running": true, "singlestep": false, "status": "running"}} -{"return": {"running": false, "singlestep": false, "status": "postmigrate"= }} +{"return": {"running": true, "status": "running"}} +{"return": {"running": false, "status": "postmigrate"}} diff --git a/tests/qemu-iotests/262.out b/tests/qemu-iotests/262.out index 8e04c496c4..b8a2d3598d 100644 --- a/tests/qemu-iotests/262.out +++ b/tests/qemu-iotests/262.out @@ -13,5 +13,5 @@ Starting migration to B... {"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"mic= roseconds": "USECS", "seconds": "SECS"}} completed completed -{"return": {"running": false, "singlestep": false, "status": "postmigrate"= }} -{"return": {"running": true, "singlestep": false, "status": "running"}} +{"return": {"running": false, "status": "postmigrate"}} +{"return": {"running": true, "status": "running"}} diff --git a/tests/qemu-iotests/280.out b/tests/qemu-iotests/280.out index c75f437c00..546dbb4a68 100644 --- a/tests/qemu-iotests/280.out +++ b/tests/qemu-iotests/280.out @@ -12,7 +12,7 @@ Enabling migration QMP events on VM... VM is now stopped: completed {"execute": "query-status", "arguments": {}} -{"return": {"running": false, "singlestep": false, "status": "postmigrate"= }} +{"return": {"running": false, "status": "postmigrate"}} =20 =3D=3D=3D Create a snapshot of the disk image =3D=3D=3D {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-top", "size": 0}}} --=20 2.41.0 From nobody Tue May 14 17:46:08 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705504512; cv=none; d=zohomail.com; s=zohoarc; b=PjhIGeUcTKyxXAwAElY92EdRt3TivB+W28YyIOqlMPFyIQI8xjrYwvEqTTv+v9gnX5UduiMluz9jmiA11k5ScDVuCqYxN3eFhZkRp90JYxdZSXv2ebjBtxCi3QqMJsAQCZMIPAVqqCVrcEX6JrrjZ+VEKwIzJZrvv6VO39XehlU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705504512; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Li9sRZN0mRf8DkyGaJQon8lVmYH2nBUS0oNdkHOoC+A=; b=ElIMHdX9hkA0FgUD6ArNRo+xf7OMmyg+rza0uunahUelyn5u866P9TB8H+R9/02saSXeFrXbHa6qklCEFg1HYqtKw/Rb/74tpoZhQ/TXT6T83kos50uTtjI1/I3ykivuXeop2NisQ6dsm8qfw2gX1ONOOxrEyACJnqlW30y6Goc= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705504512167636.896871065489; Wed, 17 Jan 2024 07:15:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQ7cz-0000w0-Ui; Wed, 17 Jan 2024 10:14:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQ7cy-0000j5-Gx for qemu-devel@nongnu.org; Wed, 17 Jan 2024 10:14:52 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQ7cu-0005p4-Ai for qemu-devel@nongnu.org; Wed, 17 Jan 2024 10:14:52 -0500 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a2e0be86878so518667366b.1 for ; Wed, 17 Jan 2024 07:14:47 -0800 (PST) Received: from m1x-phil.lan ([176.187.212.26]) by smtp.gmail.com with ESMTPSA id s6-20020a17090699c600b00a2ed222d61esm845329ejn.199.2024.01.17.07.14.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 Jan 2024 07:14:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705504486; x=1706109286; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Li9sRZN0mRf8DkyGaJQon8lVmYH2nBUS0oNdkHOoC+A=; b=z1tK+5ud7XB0ZxCEagXvc2P307RfjameKgTRtFnV5zqGhKf/Bsj1S3R7XHNac6QTGs lrqyabva1BTwU5C4nWVYavxjbsKZHxG0CRDe4khRED9IjkZfDv71X107XXn68oawgVS9 623jd8wYbjXufWKiIN4C7aXQs463yXNbhaq/UoIl45BDIjO3DPz409t4plxjkxR8B7MG pelwFxUngLkZBcErPm8ebY5ArCDQBkvDT3aDX7xAxcNAACbkE5wKBs344ioPdJ5zPPoN m3mkejZUfRoIxcF96Bv8GF/Y0dDI7eTDodwCWezEYhoEJFQfo0krSMpvGD3tCKdfNIut 3Y8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705504486; x=1706109286; 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=Li9sRZN0mRf8DkyGaJQon8lVmYH2nBUS0oNdkHOoC+A=; b=T4AEDy+26kBoXczscDaNLQeM74xLlU8smDzV0NY62pw1Rn2vRkRTAjrXg7dzOanMWd PGUhcUWIIjuKpmkvXsC7VxMOxEgTJMlf33AfiwRwu8XGfCKIm5kJs2NaZ/xHNKOluNoz fXbd7qVaoJh2zh7yJD0eJDFfmnpyAF8J922yyk0p63JwXSLdumi9JkYZM7cZ9nYPJwCr BXl7s4hOY3AFdYqVnAYbBs0sA6TeTNa9NGrh8C1+97DqOcB5Zly1yQaL6AY7EbNgvoZS imouIN+Fc5n8c+5cRBDAuGKZVRAbfTy0YJVNMtpIa/5J3/lAcBA0R/pXDMy8it6hXE3E fwEg== X-Gm-Message-State: AOJu0Yxh4igsz1SDc61jCFsCbXGKTC805e1kQYG9nkv9KvphuC1P02aZ uSiv2eGpwUqGBxgH5/CN/5mdpu4lk1bG3n3Cl8k4nFDZwhUbR9jQkPnWz7ZOAKFmp09Rx4/iVlx 6 X-Google-Smtp-Source: AGHT+IFNod80YwGzlhfG6lya+LBEAn7deDqBZ1b2vBAeQt6hezrnthyYChOftI2pwHUKy9tu1ZpW1A== X-Received: by 2002:a17:906:c317:b0:a2d:6b8e:fb17 with SMTP id s23-20020a170906c31700b00a2d6b8efb17mr1016424ejz.20.1705504486526; Wed, 17 Jan 2024 07:14:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Warner Losh , Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Laurent Vivier , Hanna Reitz , Kevin Wolf , Kyle Evans , Peter Maydell , qemu-block@nongnu.org, devel@lists.libvirt.org, Laurent Vivier , Eric Blake , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/3] hmp: Remove deprecated 'singlestep' command Date: Wed, 17 Jan 2024 16:14:29 +0100 Message-ID: <20240117151430.29235-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240117151430.29235-1-philmd@linaro.org> References: <20240117151430.29235-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::636; envelope-from=philmd@linaro.org; helo=mail-ej1-x636.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705504512719100003 This command has been deprecated before the 8.1 release, in commit e9ccfdd91d ("hmp: Add 'one-insn-per-tb' command equivalent to 'singlestep'"). Time to drop it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Markus Armbruster --- docs/about/deprecated.rst | 9 --------- docs/about/removed-features.rst | 6 ++++++ tests/qtest/test-hmp.c | 1 - hmp-commands.hx | 13 ------------- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 25527da423..316a26a82c 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -167,15 +167,6 @@ points was removed in 7.0. However QMP still exposed t= he vcpu parameter. This argument has now been deprecated and the remaining remaining trace points that used it are selected just by name. =20 -Human Monitor Protocol (HMP) commands -------------------------------------- - -``singlestep`` (since 8.1) -'''''''''''''''''''''''''' - -The ``singlestep`` command has been replaced by the ``one-insn-per-tb`` -command, which has the same behaviour but a less misleading name. - Host Architectures ------------------ =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index a8546f4787..855d788259 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -635,6 +635,12 @@ Use ``migrate-set-parameters`` instead. =20 This command didn't produce any output already. Removed with no replacemen= t. =20 +``singlestep`` (removed in 9.0) +''''''''''''''''''''''''''''''' + +The ``singlestep`` command has been replaced by the ``one-insn-per-tb`` +command, which has the same behaviour but a less misleading name. + Guest Emulator ISAs ------------------- =20 diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c index fc9125f8bb..1b2e07522f 100644 --- a/tests/qtest/test-hmp.c +++ b/tests/qtest/test-hmp.c @@ -64,7 +64,6 @@ static const char *hmp_cmds[] =3D { "qom-get /machine initrd", "screendump /dev/null", "sendkey x", - "singlestep on", "wavcapture /dev/null", "stopcapture 0", "sum 0 512", diff --git a/hmp-commands.hx b/hmp-commands.hx index 765349ed14..fc5f5c57ad 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -398,19 +398,6 @@ SRST If called with option off, the emulation returns to normal mode. ERST =20 - { - .name =3D "singlestep", - .args_type =3D "option:s?", - .params =3D "[on|off]", - .help =3D "deprecated synonym for one-insn-per-tb", - .cmd =3D hmp_one_insn_per_tb, - }, - -SRST -``singlestep [off]`` - This is a deprecated synonym for the one-insn-per-tb command. -ERST - { .name =3D "stop|s", .args_type =3D "", --=20 2.41.0 From nobody Tue May 14 17:46:08 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705504513; cv=none; d=zohomail.com; s=zohoarc; b=Vn7m//pJ0bAyvkIbcFY+lUOwb6tndP6y9m56GefvfUIv5x/7MJ+EzbUyv6HeOWBNZILksZmp0mVriigSfsoeqXEnZTwYXxKb0VoHCjn4vPXcq6b53c+bUv3oAGrX8E+9qi2rJYuHGfHl0/a0HUfN8aAC/7ujP5UZ50JFen3U1NI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705504513; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rWquZDznl8GUJLKtfThc+dkHhiP6pDWBh8dOSA7ubck=; b=I4Dj92PJ6T+Qqfyi65ZMUPhL4S27m8dcuYzLcX9OmjU4XoEzoamoMzf6vCVYlEclFrKxvnvKkH5nwhwDBuTYjauua9ubwKbiSgCwyV9tNAbhz4RDP50XwZnghmqAn8hBT1JCChc/WyAsw7bLnH+iitthNXqWx2GGYVh/TYv3Kdc= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705504513184809.8362163723134; Wed, 17 Jan 2024 07:15:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQ7d6-0001Ym-0Z; Wed, 17 Jan 2024 10:15:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQ7d3-0001M1-D7 for qemu-devel@nongnu.org; Wed, 17 Jan 2024 10:14:57 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQ7d0-0005rR-O8 for qemu-devel@nongnu.org; Wed, 17 Jan 2024 10:14:56 -0500 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a26fa294e56so1169957166b.0 for ; Wed, 17 Jan 2024 07:14:54 -0800 (PST) Received: from m1x-phil.lan ([176.187.212.26]) by smtp.gmail.com with ESMTPSA id k13-20020a1709062a4d00b00a290920c78csm7884465eje.187.2024.01.17.07.14.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 Jan 2024 07:14:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705504493; x=1706109293; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rWquZDznl8GUJLKtfThc+dkHhiP6pDWBh8dOSA7ubck=; b=BA7W7aSlFVwyLUfKSPeUtqm2dMGnrOLUFxxwOsGPvV3n/Qthligv1akbi4G7/HEAL+ 27PTVTWi9ZJ24cUfI3zDmo0HcTIIBqdqKnmNhO8meVh7OkDlJsEIc9cnUSgDq3S1hXOn QJaVMzDO+17KaokprccHGGDCZScWmBbKonuAob+o17rrskqoUkf4Jt/G0PgrQmDjcy2W 6p10THGz5uQVOEjVjZaXzHVkrofCjrzOj/7rW/n+1vSbtqO0hR8Pgc1ed55EjOe8iITe MpvQPdo0Mly1d+k87TKFnd4dFvprTqU6Fk5hUy6mjvvnP0VchlZtQ7LsKLYfiZd6yPbO kyWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705504493; x=1706109293; 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=rWquZDznl8GUJLKtfThc+dkHhiP6pDWBh8dOSA7ubck=; b=oglCrckXHUYtIRlLQyF8vbfV0D3BmzQeSmu+GRxuv9RXPXnPsI0twaMziN/pcDZsGR 4PGsS6kWI7V4XtA8fLZ0aFd4Nqmo+1SNWOdqVOaxNBRtxcM5PcMPOQqwOBW8zEnrhgn1 cqk1yhHn5vb01r71kvDWHsBdTZMFE55LlOvmHTfzhK48WYIEuOOQIo2GSFB8ykrXQzIt PJay6XEL+UXyvYOoDMGZ7VvIeZrl3sfzkMFYWuJIO6TaTOgOjykLlP0Nui3iHdoIMGGU 76aqjrduC12GIL2jB+0+mnvhHqrVKaP/hLMax4S42GO2j+NY7V9+oef8Rm/ioslZnLng v0zg== X-Gm-Message-State: AOJu0YxAlK+G7l3N+7KC0Bjd9ZM5o85okzqjZ6DD/1DtsfJUcOXsoVli SoaP4WD5A6NaKRfWvx+9f19raCg5bqllEVOAz4rFo8riQbY= X-Google-Smtp-Source: AGHT+IGQ/HV1wo5l39Tctmo9IbyX/J3h3Iace2rSTglOd8DOwD9qSFw/79GBZsy72Xt8/XopFu9zrg== X-Received: by 2002:a17:907:36c9:b0:a1d:b6b5:3416 with SMTP id bj9-20020a17090736c900b00a1db6b53416mr5053944ejc.84.1705504492834; Wed, 17 Jan 2024 07:14:52 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Warner Losh , Paolo Bonzini , "Dr. David Alan Gilbert" , Thomas Huth , Laurent Vivier , Hanna Reitz , Kevin Wolf , Kyle Evans , Peter Maydell , qemu-block@nongnu.org, devel@lists.libvirt.org, Laurent Vivier , Eric Blake , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/3] cli: Remove deprecated '-singlestep' command line option Date: Wed, 17 Jan 2024 16:14:30 +0100 Message-ID: <20240117151430.29235-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240117151430.29235-1-philmd@linaro.org> References: <20240117151430.29235-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705504514750100007 This option has been deprecated before the 8.1 release, in commit 12fd0f41d0 ("Document that -singlestep command line option is deprecated"). Time to drop it. Inspired-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster Reviewed-by: Thomas Huth --- docs/about/deprecated.rst | 17 ----------------- docs/about/removed-features.rst | 18 ++++++++++++++++++ docs/user/main.rst | 6 ------ bsd-user/main.c | 3 +-- linux-user/main.c | 2 -- system/vl.c | 18 +----------------- qemu-options.hx | 8 -------- 7 files changed, 20 insertions(+), 52 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 316a26a82c..f47446c079 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -63,23 +63,6 @@ as short-form boolean values, and passed to plugins as `= `arg_name=3Don``. However, short-form booleans are deprecated and full explicit ``arg_name= =3Don`` form is preferred. =20 -``-singlestep`` (since 8.1) -''''''''''''''''''''''''''' - -The ``-singlestep`` option has been turned into an accelerator property, -and given a name that better reflects what it actually does. -Use ``-accel tcg,one-insn-per-tb=3Don`` instead. - -User-mode emulator command line arguments ------------------------------------------ - -``-singlestep`` (since 8.1) -''''''''''''''''''''''''''' - -The ``-singlestep`` option has been given a name that better reflects -what it actually does. For both linux-user and bsd-user, use the -new ``-one-insn-per-tb`` option instead. - QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 855d788259..54081a6c19 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -482,6 +482,24 @@ Use ``-run-with async-teardown=3Don`` instead. =20 Use ``-run-with chroot=3Ddir`` instead. =20 +``-singlestep`` (removed in 9.0) +'''''''''''''''''''''''''''''''' + +The ``-singlestep`` option has been turned into an accelerator property, +and given a name that better reflects what it actually does. +Use ``-accel tcg,one-insn-per-tb=3Don`` instead. + + +User-mode emulator command line arguments +----------------------------------------- + +``-singlestep`` (removed in 9.0) +'''''''''''''''''''''''''''''''' + +The ``-singlestep`` option has been given a name that better reflects +what it actually does. For both linux-user and bsd-user, use the +``-one-insn-per-tb`` option instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/docs/user/main.rst b/docs/user/main.rst index f478635396..7e7ad07409 100644 --- a/docs/user/main.rst +++ b/docs/user/main.rst @@ -98,9 +98,6 @@ Debug options: This slows down emulation a lot, but can be useful in some situations, such as when trying to analyse the logs produced by the ``-d`` option. =20 -``-singlestep`` - This is a deprecated synonym for the ``-one-insn-per-tb`` option. - Environment variables: =20 QEMU_STRACE @@ -251,6 +248,3 @@ Debug options: Run the emulation with one guest instruction per translation block. This slows down emulation a lot, but can be useful in some situations, such as when trying to analyse the logs produced by the ``-d`` option. - -``-singlestep`` - This is a deprecated synonym for the ``-one-insn-per-tb`` option. diff --git a/bsd-user/main.c b/bsd-user/main.c index 4de226d211..e5efb7b845 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -163,7 +163,6 @@ static void usage(void) " (use '-d help' for a list of log items)\n" "-D logfile write logs to 'logfile' (default stderr)\n" "-one-insn-per-tb run with one guest instruction per emulated = TB\n" - "-singlestep deprecated synonym for -one-insn-per-tb\n" "-strace log system calls\n" "-trace [[enable=3D]][,events=3D][,fi= le=3D]\n" " specify tracing options\n" @@ -391,7 +390,7 @@ int main(int argc, char **argv) (void) envlist_unsetenv(envlist, "LD_PRELOAD"); } else if (!strcmp(r, "seed")) { seed_optarg =3D optarg; - } else if (!strcmp(r, "singlestep") || !strcmp(r, "one-insn-per-tb= ")) { + } else if (!strcmp(r, "one-insn-per-tb")) { opt_one_insn_per_tb =3D true; } else if (!strcmp(r, "strace")) { do_strace =3D 1; diff --git a/linux-user/main.c b/linux-user/main.c index 0cdaf30d34..c9470eeccf 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -500,8 +500,6 @@ static const struct qemu_argument arg_table[] =3D { {"one-insn-per-tb", "QEMU_ONE_INSN_PER_TB", false, handle_arg_one_insn_per= _tb, "", "run with one guest instruction per emulated TB"}, - {"singlestep", "QEMU_SINGLESTEP", false, handle_arg_one_insn_per_tb, - "", "deprecated synonym for -one-insn-per-tb"}, {"strace", "QEMU_STRACE", false, handle_arg_strace, "", "log system calls"}, {"seed", "QEMU_RAND_SEED", true, handle_arg_seed, diff --git a/system/vl.c b/system/vl.c index c125fb9079..809f867bcc 100644 --- a/system/vl.c +++ b/system/vl.c @@ -181,7 +181,6 @@ static const char *log_file; static bool list_data_dirs; static const char *qtest_chrdev; static const char *qtest_log; -static bool opt_one_insn_per_tb; =20 static int has_defaults =3D 1; static int default_audio =3D 1; @@ -2308,19 +2307,7 @@ static int do_configure_accelerator(void *opaque, Qe= muOpts *opts, Error **errp) qemu_opt_foreach(opts, accelerator_set_property, accel, &error_fatal); - /* - * If legacy -singlestep option is set, honour it for TCG and - * silently ignore for any other accelerator (which is how this - * option has always behaved). - */ - if (opt_one_insn_per_tb) { - /* - * This will always succeed for TCG, and we want to ignore - * the error from trying to set a nonexistent property - * on any other accelerator. - */ - object_property_set_bool(OBJECT(accel), "one-insn-per-tb", true, N= ULL); - } + ret =3D accel_init_machine(accel, current_machine); if (ret < 0) { if (!qtest_with_kvm || ret !=3D -ENOENT) { @@ -3057,9 +3044,6 @@ void qemu_init(int argc, char **argv) case QEMU_OPTION_bios: qdict_put_str(machine_opts_dict, "firmware", optarg); break; - case QEMU_OPTION_singlestep: - opt_one_insn_per_tb =3D true; - break; case QEMU_OPTION_S: autostart =3D 0; break; diff --git a/qemu-options.hx b/qemu-options.hx index 9be6beb5a0..033fa873e4 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4357,14 +4357,6 @@ SRST from a script. ERST =20 -DEF("singlestep", 0, QEMU_OPTION_singlestep, \ - "-singlestep deprecated synonym for -accel tcg,one-insn-per-tb=3Do= n\n", QEMU_ARCH_ALL) -SRST -``-singlestep`` - This is a deprecated synonym for the TCG accelerator property - ``one-insn-per-tb``. -ERST - DEF("preconfig", 0, QEMU_OPTION_preconfig, \ "--preconfig pause QEMU before machine is initialized (experimenta= l)\n", QEMU_ARCH_ALL) --=20 2.41.0