From patchwork Mon Apr 3 14:46:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 669781 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1925305wrt; Mon, 3 Apr 2023 07:47:15 -0700 (PDT) X-Google-Smtp-Source: AKy350bZNZf1WBIqU6msZCIFOKze4AodAMJnfU+G63fW4F2Wq6rtrM+ygEP6ZS9RxEvt1eOedqGH X-Received: by 2002:a05:6214:76e:b0:5b7:f1cb:74b6 with SMTP id f14-20020a056214076e00b005b7f1cb74b6mr51156392qvz.39.1680533235487; Mon, 03 Apr 2023 07:47:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680533235; cv=none; d=google.com; s=arc-20160816; b=aqJ8xEdU73PIbXuvEgxt8jb4kE1tZwtuS/M+HD/rOP9WjR24kVKh1MThpSpuwBnAdd N8L3nO+1uPHY9dRw/UK75eAAVeu/PaEQN4AuNsskiWMhqpoKF8sF1SWxkbFmC1AC3xoh 1CDkydvyElJINdfwGVkWC8CDZDfRZ8zazMJPR2910GqOqaRF23N58yu034wR43enHPA+ yjzeT20+9kq4/EfmllA4vowva2rS23mO9oEQ8cwxMFfCD3R/2z5gTURZXrN6oeRoJsDG BJ0xEusaAkF7aWRRRz0aQYMCoRV+LBwbR3MrZa2q7Jik1ikohenFcRsZMe80Yo5yU42R jwLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tOMQqYczbQzJT4cpOfgtd59pSmpxm7+Vtg1FH5cDagc=; b=zhO3IjFTvcnZwWKjv+rTvjiy7bHlFVOEz7Pp/3g0TptG58MKCQVr3C8VsD7orvXWWy cTHYYW8AcpvYNPuZiDkLY12rog0qCtJxIkm4J4lIrPWVoFfxU/S+91UKKZLnilQAETPk 3jkRQpnsc3JlSuvV8foyCkyMXVTRbYhLnNHLUGW3Iu1bKWSM8oo5V3Jh98UEG/WuJc2n WHQjU61rQJglGfTbly/C3XyyHH2LG3m1/SmuWf2bOeMRVNJHqltq/0rIy/nk1kXl0idp XnDLWsFOHckgWH/18Q/7GnII8M2sBb60rIiktFcPVZmv6Q49px9u1qxk0g4z2bwsQ9I6 yT1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="N/GkXXgL"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gw1-20020a0562140f0100b005bff3694a54si6302166qvb.365.2023.04.03.07.47.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 07:47:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="N/GkXXgL"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjLSS-0003sg-BP; Mon, 03 Apr 2023 10:46:56 -0400 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 1pjLSN-0003rI-O6 for qemu-devel@nongnu.org; Mon, 03 Apr 2023 10:46:53 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjLSJ-0001AO-P8 for qemu-devel@nongnu.org; Mon, 03 Apr 2023 10:46:51 -0400 Received: by mail-wm1-x336.google.com with SMTP id s13so17256048wmr.4 for ; Mon, 03 Apr 2023 07:46:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680533203; 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=tOMQqYczbQzJT4cpOfgtd59pSmpxm7+Vtg1FH5cDagc=; b=N/GkXXgLNwP1pVBVS4lLVbtrzB3qKXJ0Ql8zn67MdylWVnGz2Up8fKOPaydMeWux2U Tr9xWJqm3sR4bQzqIMSwWWBg5elzwh6RTNgZ8GJXFjQN2zrfAK9QY9lX1624GYVwonEt awHsBD014OZuYKebcjT8x0YvRqGOH59FqGOq4SyoP3oj8dEMVx2y8qPSG83qzR99tcEw Q9j42B3NHYpvnk7yzMHw/6MevBNjsg4NESSjZBniSHBMP7Ctx5dwXoyQvukf9Xskm/AT Y3z+2byUfAnRq8U6SrWlAqDfiDRteu5c2HIfGaJfnFLN0UJC9CYq9dHth980c8erYD7j fyBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680533203; 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=tOMQqYczbQzJT4cpOfgtd59pSmpxm7+Vtg1FH5cDagc=; b=M8fOAYhAD0rGOdELVpP1JmHR+ZzhhWNpVfPUxeYSITskURt3qqDHwkPUjHq3YQvE3n dy6vLbI6A5APQCtcZNmO/ZXvs6SkTH9HKpihHLFD5EjAzSsu8FYqtk/YPZxk23gqbOzj GFflFqu6WtX9oiXCKUC3yy/r752/VmDDWmJf0RQBkwlGddAM1sTQIQe/sC90ygO6mW9o iEFfxZZIgmZDtKNZMH+iikCuRgvcDXItO6LUyY+3vnYC0rlWDDNy4xPJ2dIdcEDUH3WP E8pd8LWpOY97FRDGTvkm7+ob0FHjIhYJdHTLicGD91mUzORC/S1tJa4f8IYgNHgb9hAj /JJA== X-Gm-Message-State: AO0yUKVJ95VJ5K9U/bHGRaBNb/ZEX2ec4Mebi1L1KkjenQC9UNLC7E+c +8q6aamLKbypk8oC0crx48MNNhqTRyp6Ht+YSo4= X-Received: by 2002:a7b:ce16:0:b0:3ed:9b20:c7c1 with SMTP id m22-20020a7bce16000000b003ed9b20c7c1mr24843697wmc.20.1680533202768; Mon, 03 Apr 2023 07:46:42 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p4-20020a056000018400b002c56013c07fsm9786747wrx.109.2023.04.03.07.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 07:46:42 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Richard Henderson , Warner Losh , Kyle Evans , libvir-list@redhat.com, Markus Armbruster , "Dr. David Alan Gilbert" , Laurent Vivier , Eric Blake Subject: [PATCH v2 06/10] Document that -singlestep command line option is deprecated Date: Mon, 3 Apr 2023 15:46:33 +0100 Message-Id: <20230403144637.2949366-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230403144637.2949366-1-peter.maydell@linaro.org> References: <20230403144637.2949366-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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 autolearn=ham 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Document that the -singlestep command line option is now deprecated, as it is replaced by either the TCG accelerator property 'one-insn-per-tb' for system emulation or the new '-one-insn-per-tb' option for usermode emulation, and remove the only use of the deprecated syntax from a README. Signed-off-by: Peter Maydell --- docs/about/deprecated.rst | 16 ++++++++++++++++ qemu-options.hx | 5 +++-- tcg/tci/README | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 1ca9dc33d61..3c62671dac1 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -111,6 +111,22 @@ Use ``-machine acpi=off`` instead. The HAXM project has been retired (see https://github.com/intel/haxm#status). Use "whpx" (on Windows) or "hvf" (on macOS) instead. +``-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=on`` 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 ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index 1dffd36884e..6a59e997497 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4159,10 +4159,11 @@ SRST ERST DEF("singlestep", 0, QEMU_OPTION_singlestep, \ - "-singlestep always run in singlestep mode\n", QEMU_ARCH_ALL) + "-singlestep deprecated synonym for -accel tcg,one-insn-per-tb=on\n", QEMU_ARCH_ALL) SRST ``-singlestep`` - Run the emulation in single step mode. + This is a deprecated synonym for the TCG accelerator property + ``one-insn-per-tb``. ERST DEF("preconfig", 0, QEMU_OPTION_preconfig, \ diff --git a/tcg/tci/README b/tcg/tci/README index f72a40a395a..4a8b5b54018 100644 --- a/tcg/tci/README +++ b/tcg/tci/README @@ -49,7 +49,7 @@ The only difference from running QEMU with TCI to running without TCI should be speed. Especially during development of TCI, it was very useful to compare runs with and without TCI. Create /tmp/qemu.log by - qemu-system-i386 -d in_asm,op_opt,cpu -D /tmp/qemu.log -singlestep + qemu-system-i386 -d in_asm,op_opt,cpu -D /tmp/qemu.log -accel tcg,one-insn-per-tb=on once with interpreter and once without interpreter and compare the resulting qemu.log files. This is also useful to see the effects of additional