From patchwork Tue Dec 3 09:21:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13891986 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BFE1BE6C61A for ; Tue, 3 Dec 2024 09:22:10 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.847515.1262597 (Exim 4.92) (envelope-from ) id 1tIP6a-0003ST-VB; Tue, 03 Dec 2024 09:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 847515.1262597; Tue, 03 Dec 2024 09:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP6a-0003SM-SI; Tue, 03 Dec 2024 09:22:04 +0000 Received: by outflank-mailman (input) for mailman id 847515; Tue, 03 Dec 2024 09:22:04 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP6a-0003Ra-1G for xen-devel@lists.xenproject.org; Tue, 03 Dec 2024 09:22:04 +0000 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [2a00:1450:4864:20::12a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0de70a18-b158-11ef-99a3-01e77a169b0f; Tue, 03 Dec 2024 10:22:02 +0100 (CET) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-53df6322ea7so9025667e87.0 for ; Tue, 03 Dec 2024 01:22:02 -0800 (PST) Received: from localhost.localdomain ([176.187.209.146]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa599908be5sm591969266b.140.2024.12.03.01.22.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Dec 2024 01:22:00 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 0de70a18-b158-11ef-99a3-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217722; x=1733822522; darn=lists.xenproject.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=XItCJo5+ANEXJJ4rNbIonoA3BAW/mx+bgexv+wsAke8=; b=lYSS1UjsP3SYWBGfErLLhzadHBbklYQcYKcFvItkVEUX3hGMb+2E34viwr67ih07+z mipLjH5voNoB6jgTguovCh9AIewy8DV5dQxKZiVFcaL2H1EmWh/KsYukVK931etRlhyQ CREVUxIPW+FwjBpMhqDEyTnuphYzmvTBzWyPXbeH9MkPCwu/nddWGjzCDgepxSClUg2S 4T79uQbjo+4Lpc2jzIFFAGjsg5tJ+025n9fmCC+TnJ/KRd0C/mcFk7Swxz9G/4O1/fO9 30aGKHmQC21fi2UCrhutdBztO2v21vl2Ab59rdVhHHtqQy/wu0gLgtMZthbe/jv1pL9E 58tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733217722; x=1733822522; 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=XItCJo5+ANEXJJ4rNbIonoA3BAW/mx+bgexv+wsAke8=; b=m1pYas7CuNJtNzfFMeyli8csZPQUdIYrGeeisF/MocGscGWQACw2YqH7nBs1KaOx8V UoR6/8/5BL7lcxmbMWlKHvQHCy0lz3M7JrGiSR/tEve9e2r6amrcaatYC+vbYbYRPE2V K9NCYfvkRRwYGv4Tw1x/t4On10MjV2ECcrhZPWFpE/dOSQmbRY0hyvBWA/J4Q/rtcYko L+p8oN0mgDAkCcNg95iRVE/Ec5Ci8A0U1cM/nIlNGp0yzLJ8F0n4rKIaJrvvSNzHdVN8 h5Afi119v1MB06nSZt9nHgLobcW2njFv8BRZiYXsac7xa63Fucb6piIBaXeaSsLdBbW3 c7Pg== X-Forwarded-Encrypted: i=1; AJvYcCVzCBrBNPS/MzsovcnOw57EZc93PC0r6fcs8kK4rZ/tN3GQJehybU39D8NskkIYOjiOaGZrZ0jh01E=@lists.xenproject.org X-Gm-Message-State: AOJu0YwuQaE3/uYr2TkjkHsXNxXpWuyXsIgzxtjBSq3vrPsT5IUR2O2D ATxKLM6l5Eo6KG9OiVKeb4JlaINcvWFAtmiJNb5ykssZYMmwq8SdljDuqWZDWHI= X-Gm-Gg: ASbGncuIdQO8Ghk/2R/vY9gOrYVZ77PRKoxvQdP/+5kbMU4iwqaBK2hUMkHHkZsckao +kBEuDc/9mPSyginkTzJJ+yOnvUbmshhh+PQg6YaksejTqsrqIcDrz4a20OLbch0IWCADhbui1p TiC2bYgeCZUvP3wYBHWlLUfzdQR9V/dMMdMrW16XruWM0eekyiAPYci/68lTQ7l7W3Fbd3nZzOe 6bORDN0bIOmIrujvUIBCGwtveBJyj8NElp2pFdgSh2Rb9LFnOCQxQYa/VwmEqRs6WKFNqlj X-Google-Smtp-Source: AGHT+IELVm7e97U6LHV1aSNR3lGVC9QDV3n0nCKk5HiuyFOrOWNT99UW+76qnuiTrgbzvwhK7O0Rcg== X-Received: by 2002:ac2:5967:0:b0:53e:12f2:5e02 with SMTP id 2adb3069b0e04-53e12f25e19mr1049931e87.42.1733217721439; Tue, 03 Dec 2024 01:22:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, Markus Armbruster , qemu-arm@nongnu.org, Thomas Huth , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 1/7] tests/functional/test_ppc64_hv: Remove legacy '-machine foo,accel=bar' Date: Tue, 3 Dec 2024 10:21:47 +0100 Message-ID: <20241203092153.60590-2-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241203092153.60590-1-philmd@linaro.org> References: <20241203092153.60590-1-philmd@linaro.org> MIME-Version: 1.0 Since commit 6f6e1698a68 ("vl: configure accelerators from -accel options") we prefer the '-accel bar' command line option. Replace '-machine foo,accel=bar' -> '-machine foo -accel bar' in functional tests. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- tests/functional/test_ppc64_hv.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc64_hv.py index 312248bbfe4..536a433b993 100755 --- a/tests/functional/test_ppc64_hv.py +++ b/tests/functional/test_ppc64_hv.py @@ -138,7 +138,8 @@ def do_test_kvm(self, hpt=False): else: append = '' exec_command(self, 'qemu-system-ppc64 -nographic -smp 2 -m 1g ' - '-machine pseries,x-vof=on,accel=kvm ' + '-accel kvm ' + '-machine pseries,x-vof=on ' '-machine cap-cfpc=broken,cap-sbbc=broken,' 'cap-ibs=broken,cap-ccf-assist=off ' '-drive file=/dev/nvme0n1,format=raw,readonly=on ' From patchwork Tue Dec 3 09:21:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13891987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9DE3BD49797 for ; Tue, 3 Dec 2024 09:22:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.847517.1262609 (Exim 4.92) (envelope-from ) id 1tIP6g-0003lM-8x; Tue, 03 Dec 2024 09:22:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 847517.1262609; Tue, 03 Dec 2024 09:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP6g-0003lD-3u; Tue, 03 Dec 2024 09:22:10 +0000 Received: by outflank-mailman (input) for mailman id 847517; Tue, 03 Dec 2024 09:22:08 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP6e-0003Be-73 for xen-devel@lists.xenproject.org; Tue, 03 Dec 2024 09:22:08 +0000 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [2a00:1450:4864:20::52c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 10fb037f-b158-11ef-a0d3-8be0dac302b0; Tue, 03 Dec 2024 10:22:07 +0100 (CET) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-5d0be79e7e7so4771954a12.0 for ; Tue, 03 Dec 2024 01:22:07 -0800 (PST) Received: from localhost.localdomain ([176.187.209.146]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d0c8dc9b8asm3868557a12.17.2024.12.03.01.22.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Dec 2024 01:22:06 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 10fb037f-b158-11ef-a0d3-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217727; x=1733822527; darn=lists.xenproject.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=QhfmnQV2U1yeLbQ0YN69JuJChLdIfKrfDAxolXgPuaM=; b=NY2YzZpXib/9b46FQvVQ5Pa0ome/80ghyw/L1Emqfl+JAXKlIn78p1aIcwQNgxobhk tGfWaGjGcwMltnXFi5H0xspUtgKONh6Z9sCfVvth/fwv3Uc2hUKUi0m4M4G8lf5IwOvX X2DrfqG8D5A3eLhYYgyGx86ncpctJiuOFHvrZMRxsAqCJToNtuqx7uSUG2zaZ39Wq8I5 hAGY18duND5LLbQw8gMmsqhT1HjkjCG5rcgAedOzyKjy6ltocLcvQnFUz57E92DJ2wSk jUDKO54J2Iq9zYv0Yyv4rkCc+75U4iW6qyT2wMcl856mSpfIKmBPnYaGh4U4JMHB5a7H 6yJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733217727; x=1733822527; 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=QhfmnQV2U1yeLbQ0YN69JuJChLdIfKrfDAxolXgPuaM=; b=CZ+xjSpH9/MX7XbHeKYbIupPYS9+Jn1cT3zd3jdwMUkZc7ZzBETgESM6lsOsIACy+1 HVszYRn5sksxXlMdGDb7p1RCypxQ/qhOmd1N1VS/O31+NhRYSr0kZXu5tNqDco9tGUep h1G41Ckek7nS14hPHA8Xemb63WBR5Mdx4hPuNjyVzCu2tLfOg+ogwApumV8EmZlo6i2/ /V4rH1lEPofKIIvFZaCgsq3T1XCJpa4+P+Yk9Z3vNcLY5HrV1A1cEO6Ij+BBConeU2WH dSDyFh+mzasn3c6/MaeBV5jXX2MIvl9G26ySmJ63Vop2YT659QtZoqdEwfjGmfYIPjiX TNtQ== X-Forwarded-Encrypted: i=1; AJvYcCVotojgVrKTzmmAYxvUK/8U7YFrWkAf1Rs5noBfgH39j/XcOV+HzR0QU1tjsY9IytZ+4fMJEoLKHkI=@lists.xenproject.org X-Gm-Message-State: AOJu0Yzwc0borwUhKZiCJ7gSHx2fRKdOETD7ye+HId4kILoOcc+ETVTU RMkas9vaEjzMZLQ4ezJMEZzxDdqdZj8mLvP/T09a1k+pJCiifSEM3nEyU/OambI= X-Gm-Gg: ASbGncsJJAU6M5Jt0jZXN/n4UdFU2z5gyOUehi8GWKIqrfR6qVajUy8t5NuoP4W5i8i 4JwCay3bxP8WYcgtF4obyPXm9e2dycF5Bv+fWQ85e/p4BiBj0zOFP7fDV2/bE38tXFpCFfCM+xw NPt3itNUjGErBKitFCrqxnJrcrKzvMZBtHz26n8kQni1egRf/jUDiRK0DGjatJKlXmehpUw5HJ3 /RkfNQY+auESz3BV377kgLiqYPlY76SsPLdYj2ofdAFnB02t6THSjFwoMKUa02IXmlK/9aE X-Google-Smtp-Source: AGHT+IExs5Yi7XHHfGv+VoO8nUw6diCtB41A7VJ/kLqxsUAKXSiS5Jv3sEFudcXPJVh9yDPwSljpgA== X-Received: by 2002:a05:6402:518c:b0:5d0:abb8:799 with SMTP id 4fb4d7f45d1cf-5d10cb4e1ccmr1719770a12.7.1733217727075; Tue, 03 Dec 2024 01:22:07 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, Markus Armbruster , qemu-arm@nongnu.org, Thomas Huth , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 2/7] tests/functional/test_virtio_gpu: Remove legacy '-machine foo,accel=bar' Date: Tue, 3 Dec 2024 10:21:48 +0100 Message-ID: <20241203092153.60590-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241203092153.60590-1-philmd@linaro.org> References: <20241203092153.60590-1-philmd@linaro.org> MIME-Version: 1.0 Since commit 6f6e1698a68 ("vl: configure accelerators from -accel options") we prefer the '-accel bar' command line option. Replace '-machine foo,accel=bar' -> '-machine foo -accel bar' in functional tests. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- tests/functional/test_virtio_gpu.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/functional/test_virtio_gpu.py b/tests/functional/test_virtio_gpu.py index d5027487ac4..cc0ec234861 100755 --- a/tests/functional/test_virtio_gpu.py +++ b/tests/functional/test_virtio_gpu.py @@ -61,7 +61,8 @@ def test_virtio_vga_virgl(self): self.vm.set_console() self.vm.add_args("-cpu", "host") self.vm.add_args("-m", "2G") - self.vm.add_args("-machine", "pc,accel=kvm") + self.vm.add_args('-accel', 'kvm') + self.vm.add_args("-machine", "pc") self.vm.add_args("-device", "virtio-vga-gl") self.vm.add_args("-display", "egl-headless") self.vm.add_args( @@ -118,10 +119,11 @@ def test_vhost_user_vga_virgl(self): ) self.vm.set_console() + self.vm.add_args('-accel', 'kvm') self.vm.add_args("-cpu", "host") self.vm.add_args("-m", "2G") self.vm.add_args("-object", "memory-backend-memfd,id=mem,size=2G") - self.vm.add_args("-machine", "pc,memory-backend=mem,accel=kvm") + self.vm.add_args("-machine", "pc,memory-backend=mem") self.vm.add_args("-chardev", "socket,id=vug,fd=%d" % qemu_sock.fileno()) self.vm.add_args("-device", "vhost-user-vga,chardev=vug") self.vm.add_args("-display", "egl-headless") From patchwork Tue Dec 3 09:21:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13891988 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 813FDD49799 for ; Tue, 3 Dec 2024 09:22:22 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.847520.1262618 (Exim 4.92) (envelope-from ) id 1tIP6l-0004Ag-ES; Tue, 03 Dec 2024 09:22:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 847520.1262618; Tue, 03 Dec 2024 09:22:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP6l-0004AX-Bh; Tue, 03 Dec 2024 09:22:15 +0000 Received: by outflank-mailman (input) for mailman id 847520; Tue, 03 Dec 2024 09:22:13 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP6j-0003Be-MH for xen-devel@lists.xenproject.org; Tue, 03 Dec 2024 09:22:13 +0000 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [2a00:1450:4864:20::530]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 1446cfc6-b158-11ef-a0d3-8be0dac302b0; Tue, 03 Dec 2024 10:22:12 +0100 (CET) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5cf6f367f97so6273392a12.0 for ; Tue, 03 Dec 2024 01:22:13 -0800 (PST) Received: from localhost.localdomain ([176.187.209.146]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa599801591sm590543266b.91.2024.12.03.01.22.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Dec 2024 01:22:12 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1446cfc6-b158-11ef-a0d3-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217732; x=1733822532; darn=lists.xenproject.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=C/6Bk/TIHmUcRxz6rQ6nK013EsFPgzobZnpt1ORjNTg=; b=Ns0faxOLv/DHDL/hqcwnpNQ3liJ2RfEeerFr/34ttx5RJ1+/MeAKddbDKOrl2WfG6n d43uB0eBHdycZG1VAMySXGfehlWPhi9b3B9Jw4aNI/CYAuDP7ocxRYhNJnw+I5iBF/v5 1Vnp7RlQiJGH9byGA15iwLiwvBbwA8z7f9qgsRazuBWwzcsftQf6ijzIqLw3HH7ddYOC /eHicsE6K01d2pxaEg7XLMgTIa01Yn1Z2WRNkXKCAo7ViEveCgD+sq/P9qdePe9QfLsu MRTCI7nmuI8dbNweZbrgltQAToBJLa/Kk3MEh4OXoVcEij5uOKf5K19CW6ScLN+LPkW6 8hKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733217732; x=1733822532; 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=C/6Bk/TIHmUcRxz6rQ6nK013EsFPgzobZnpt1ORjNTg=; b=PRFGVfn2u4qyHzB6Psi4MS0990fQrPPSQGviSSf313HUAPpXoV5FC3GehFczY/s9k0 tHFUztD/VA/r0NO92Ix+fxutAOCbG0QSlwL2ctY/nXeNauQDXfbbAT7ILNV8Omjee5IP 6duBsqz/8ObyF5Ih44fis/zPm3fD6vgGHjNwY+dAWzFA9IFy33a9nm35vCQtYOzuylM8 oqg3lDipstHfl7yAvg+GbmY8RTuq1c5c0x5vhUHdN5KeMflx3veMzcm2ZGIF6viZab2V 7N+H5qkuNNwTrxY/bC0/0lTUgiT4foLRhGGXR4LtDj6XoLFzWA0Zj9QHVJKXbVphX26P K5gQ== X-Forwarded-Encrypted: i=1; AJvYcCXsu8lwBwrh3lfJCWWcLvoEJmJMbu4rB6iVTITibiVnbwOy67CnCmiXUgORgfMuaGhh3rgRXiFD988=@lists.xenproject.org X-Gm-Message-State: AOJu0Yxivcle1vKA+1EMRaM+Wd8KGhn5iNDQxr/COMpgey2qLNCsQcax iNaKZDSPPvb0+uLfAc0HicN/R+fte85jO3WRqdCIajM2Eyq1tgwrQUJL3bXuA08= X-Gm-Gg: ASbGncsqA/x2JjpFWittxkRGfq7wLC7nu7kpUWkfBf5eeUBCeMPKHDtSwx/WJ0i91GZ dglcSBSjRRuoC7iZLcMudnErhBy5ROGnCmJmjDoLt8JbSvQvUpuEuyFKAE3UpflH7H6SnFLIK31 J6HUUj7xSQwLvp3dNE8cEwy57rZ5oafGhXjeXH+qjTb7Ppdn+hEIwQ7Gub7sHg2FTnQxwptAJc0 t41OZ+96dMXhim9/DY44ob29jMDR6XK1RxuUOmPy8jhdYuO0pj6dudCnKfkoVcfQIbOneWG X-Google-Smtp-Source: AGHT+IHoObOZjdwlMr3aboz/4y2YVDb50eN7RHCCjr/fwpXa6yi9c/pFOSALP0ifpRtK2osZHvNbbA== X-Received: by 2002:a17:906:30cb:b0:aa5:297a:ac65 with SMTP id a640c23a62f3a-aa5f7d4ec91mr122028566b.19.1733217732604; Tue, 03 Dec 2024 01:22:12 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, Markus Armbruster , qemu-arm@nongnu.org, Thomas Huth , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 3/7] tests/qtest/fuzz: Remove legacy '-machine foo,accel=bar' Date: Tue, 3 Dec 2024 10:21:49 +0100 Message-ID: <20241203092153.60590-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241203092153.60590-1-philmd@linaro.org> References: <20241203092153.60590-1-philmd@linaro.org> MIME-Version: 1.0 Since commit 6f6e1698a68 ("vl: configure accelerators from -accel options") we prefer the '-accel bar' command line option. Replace '-machine foo,accel=bar' -> '-machine foo -accel bar' in fuzzer scripts and tests. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- tests/qtest/fuzz/generic_fuzz.c | 2 +- tests/qtest/fuzz/i440fx_fuzz.c | 2 +- tests/qtest/fuzz/qos_fuzz.c | 2 +- scripts/oss-fuzz/output_reproducer.py | 2 -- scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py | 6 +++--- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c index d107a496da6..a8737a4c463 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -919,7 +919,7 @@ static GString *generic_fuzz_cmdline(FuzzTarget *t) usage(); } g_string_append_printf(cmd_line, " -display none \ - -machine accel=qtest, \ + -accel qtest \ -m 512M %s ", getenv("QEMU_FUZZ_ARGS")); return cmd_line; } diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c index 155fe018f80..b5487996625 100644 --- a/tests/qtest/fuzz/i440fx_fuzz.c +++ b/tests/qtest/fuzz/i440fx_fuzz.c @@ -145,7 +145,7 @@ static void i440fx_fuzz_qos(QTestState *s, pciconfig_fuzz_qos(s, bus, Data, Size); } -static const char *i440fx_qtest_argv = TARGET_NAME " -machine accel=qtest" +static const char *i440fx_qtest_argv = TARGET_NAME " -accel qtest" " -m 0 -display none"; static GString *i440fx_argv(FuzzTarget *t) { diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c index d3839bf9994..9267e63889d 100644 --- a/tests/qtest/fuzz/qos_fuzz.c +++ b/tests/qtest/fuzz/qos_fuzz.c @@ -84,7 +84,7 @@ static GString *qos_build_main_args(void) } /* Prepend the arguments that we need */ g_string_prepend(cmd_line, - TARGET_NAME " -display none -machine accel=qtest -m 64 "); + TARGET_NAME " -display none -accel qtest -m 64 "); return cmd_line; } diff --git a/scripts/oss-fuzz/output_reproducer.py b/scripts/oss-fuzz/output_reproducer.py index e8ef76b3413..840da3b5a5b 100755 --- a/scripts/oss-fuzz/output_reproducer.py +++ b/scripts/oss-fuzz/output_reproducer.py @@ -64,8 +64,6 @@ def c_reproducer(name, args, trace): # libqtest will add its own qtest args, so get rid of them args = args.replace("-accel qtest","") - args = args.replace(",accel=qtest","") - args = args.replace("-machine accel=qtest","") args = args.replace("-qtest stdio","") result.append("""QTestState *s = qtest_init("{}");""".format(args)) for l in trace.splitlines(): diff --git a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py index b154a25508f..f3813944d3b 100755 --- a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py +++ b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py @@ -5,15 +5,15 @@ Use this to convert qtest log info from a generic fuzzer input into a qtest trace that you can feed into a standard qemu-system process. Example usage: -QEMU_FUZZ_ARGS="-machine q35,accel=qtest" QEMU_FUZZ_OBJECTS="*" \ +QEMU_FUZZ_ARGS="-machine q35 -accel qtest" QEMU_FUZZ_OBJECTS="*" \ ./i386-softmmu/qemu-fuzz-i386 --fuzz-target=generic-pci-fuzz # .. Finds some crash QTEST_LOG=1 FUZZ_SERIALIZE_QTEST=1 \ -QEMU_FUZZ_ARGS="-machine q35,accel=qtest" QEMU_FUZZ_OBJECTS="*" \ +QEMU_FUZZ_ARGS="-machine q35 -accel qtest" QEMU_FUZZ_OBJECTS="*" \ ./i386-softmmu/qemu-fuzz-i386 --fuzz-target=generic-pci-fuzz /path/to/crash 2> qtest_log_output scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py qtest_log_output > qtest_trace -./i386-softmmu/qemu-fuzz-i386 -machine q35,accel=qtest \ +./i386-softmmu/qemu-fuzz-i386 -machine q35 -accel qtest \ -qtest stdio < qtest_trace ### Details ### From patchwork Tue Dec 3 09:21:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13891989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4BDFBD49797 for ; Tue, 3 Dec 2024 09:22:28 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.847528.1262628 (Exim 4.92) (envelope-from ) id 1tIP6r-0004dV-LI; Tue, 03 Dec 2024 09:22:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 847528.1262628; Tue, 03 Dec 2024 09:22:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP6r-0004dO-IX; Tue, 03 Dec 2024 09:22:21 +0000 Received: by outflank-mailman (input) for mailman id 847528; Tue, 03 Dec 2024 09:22:20 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP6q-0003Ra-Tf for xen-devel@lists.xenproject.org; Tue, 03 Dec 2024 09:22:20 +0000 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [2a00:1450:4864:20::12d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 17d24f65-b158-11ef-99a3-01e77a169b0f; Tue, 03 Dec 2024 10:22:18 +0100 (CET) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-53df6322ea7so9026150e87.0 for ; Tue, 03 Dec 2024 01:22:18 -0800 (PST) Received: from localhost.localdomain ([176.187.209.146]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa5997d5625sm600599666b.63.2024.12.03.01.22.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Dec 2024 01:22:17 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 17d24f65-b158-11ef-99a3-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217738; x=1733822538; darn=lists.xenproject.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=7Z0cleQPrNy9NjZu27Yx3P0Ha1Flw6gQBqfbwRAF2Ak=; b=L+jBn8stAqUjaEbbEf4vB8yfYGzJJJVAcNXix5dEo5HGqlgHH8Jov0q896K/pozbiG l3pIYZwHkoMdDk2EIYGEgkTFArCH03SKBNsLzOXPePt9YhBU+HmezMOVF1s00Jq74aZ5 0oVPBd4EHda8EEO8DglNbbBPuLNGncVV1hqC2WwCjq7T6AHv+JMrQRkL4YGtP9ZSGBFB 5kIQo3fFN5hSc3690k46eQFbGqVxmBoyDn6ESDBTrkUfMLMM91GGJoptogzFOJKLsLyZ vzweAbPFa1ST4G52gMprYYX50l3vf6Plfufp2jJQRFHITDG0V/ld3gUZD+1axdV1ZJOy IcJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733217738; x=1733822538; 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=7Z0cleQPrNy9NjZu27Yx3P0Ha1Flw6gQBqfbwRAF2Ak=; b=qFWz0+6SSNTyuXrV99S0DTzez8pcUNC8uuYI4na/fLMOIGKM5q7TV8ox+C8N+35XHB jCf3I+viyMXdHtc1l2XjOP8cwhnuP1/mqnsihGIH/VZiSstkfOYH7JxW6q8CUr8RSuqY iQhax0jUdNy4ddLdzQ1OoXRxyG3Rh3LOwxM7elxuNr7rfyJ5abrwVaPF3nR68+ge2Z/M WOw+lK/DbI7yeic6sYmrkasqMfnUB3maLexBM+aREeZ1tYI8WPQy0RusYA46llvVZXu3 pxCLLsv8hiA4e+KElyRFJSp8yWf/NMMIwR0ea61ufHQKljofJIGtIbVg1n82WS6JGO7g pPJQ== X-Forwarded-Encrypted: i=1; AJvYcCVXrZbqTtK8KxFATaIoMCMHbgovLeNV8oTNDBXpMQ6X+evXHZxLcgVwjaa3s6HByjOQc5VFKLd6Uu8=@lists.xenproject.org X-Gm-Message-State: AOJu0YxPSTKyrjE5TvlCmi+kgRWfRnC+oL6kwVJ/8IDp7RvwtuZdgL06 RukmDuT/ehNqZcY46udklRBm2oE9Fdvy0UWy7nMBYcPtF1gyXio2SXn3uGXSkfc= X-Gm-Gg: ASbGncszaOeOErH+GiqGxySOuM3hQZqWnnY0mFSKBzsEtVyeLqQ6SzXqlq1Z37HgMcv zaF6nSCUra42sS26Ou+dd9w5v5cuYAnV5Y5z9+Zt+VF7lO17OYxth/zbjTJVNJiyi2g/ZTcpB3f kHg+iC+zAT4N3B3iwWcKCm7HzNk4vi8Et32n0PAuzh6xWaY+ek7eEgg6hhixO4hELjsNWN24AQV nNQSEQtha/X9WLCHO7/WLFhAdeggjtB9LMDDLCtkANo3jicSUafiVAujXkS6FeLIzsYT7pV X-Google-Smtp-Source: AGHT+IFKXdzCHgoYrbBgxEetwk2wWIxXomwv6Wa0ZHXf5sB1MUtHIOwB2t+dSu80nFR8vz7SoiVkxQ== X-Received: by 2002:a05:6512:124f:b0:53d:ed0a:8113 with SMTP id 2adb3069b0e04-53e129fef1amr1251543e87.14.1733217738255; Tue, 03 Dec 2024 01:22:18 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, Markus Armbruster , qemu-arm@nongnu.org, Thomas Huth , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 4/7] scripts/device-crash-test: Remove legacy '-machine foo,accel=bar' Date: Tue, 3 Dec 2024 10:21:50 +0100 Message-ID: <20241203092153.60590-5-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241203092153.60590-1-philmd@linaro.org> References: <20241203092153.60590-1-philmd@linaro.org> MIME-Version: 1.0 Since commit 6f6e1698a68 ("vl: configure accelerators from -accel options") we prefer the '-accel bar' command line option. Replace '-machine foo,accel=bar' -> '-machine foo -accel bar' in the device-crash-test script. Signed-off-by: Philippe Mathieu-Daudé --- scripts/device-crash-test | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/device-crash-test b/scripts/device-crash-test index da8b56edd99..2b139e29ba0 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -295,7 +295,10 @@ class QemuBinaryInfo(object): self._machine_info = {} dbg("devtype: %r", devtype) - args = ['-S', '-machine', 'none,accel=kvm:tcg'] + args = ['-S', + '-machine', 'none', + '-accel', 'kvm:tcg', + ] dbg("querying info for QEMU binary: %s", binary) vm = QEMUMachine(binary=binary, args=args) vm.launch() @@ -358,7 +361,9 @@ def checkOneCase(args, testcase): dbg("will test: %r", testcase) - args = ['-S', '-machine', '%s,accel=%s' % (machine, accel), + args = ['-S', + '-machine', machine, + '-accel', accel, '-device', qemuOptsEscape(device)] cmdline = ' '.join([binary] + args) dbg("will launch QEMU: %s", cmdline) From patchwork Tue Dec 3 09:21:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13891991 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 54FA3E6C61A for ; Tue, 3 Dec 2024 09:22:34 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.847534.1262647 (Exim 4.92) (envelope-from ) id 1tIP6w-0005JY-AB; Tue, 03 Dec 2024 09:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 847534.1262647; Tue, 03 Dec 2024 09:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP6w-0005Is-62; Tue, 03 Dec 2024 09:22:26 +0000 Received: by outflank-mailman (input) for mailman id 847534; Tue, 03 Dec 2024 09:22:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP6u-0003Be-Tf for xen-devel@lists.xenproject.org; Tue, 03 Dec 2024 09:22:24 +0000 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [2a00:1450:4864:20::636]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 1aff5178-b158-11ef-a0d3-8be0dac302b0; Tue, 03 Dec 2024 10:22:24 +0100 (CET) Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a9e8522445dso749760466b.1 for ; Tue, 03 Dec 2024 01:22:24 -0800 (PST) Received: from localhost.localdomain ([176.187.209.146]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa5997d5646sm594152766b.62.2024.12.03.01.22.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Dec 2024 01:22:23 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1aff5178-b158-11ef-a0d3-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217744; x=1733822544; darn=lists.xenproject.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=PERYJEjYxWhdPat57HCXQqDRHV3hL1ijs4gpAo4T2SI=; b=OAPp2F7CGPnbKaxNH77iXorhXZARMk94mid2A7Vi+u3xwQfyqnUX7yKIyiKu+WbXSV 9d2V/hZEq/uudkefH8QFhysyuA1AXMSHPU3/bKySLtlOj5psf2Zl84RXSaSM0HeRvAW9 TWqqYWaCY4o6J4xAlhCozWy/nETadKT3yw2mIdSnLueBxtFbS8Es02PzK9M+UFybAeW0 9zwbqNTTwdvpUicXWCkz5DmxjxGa2dXVbXihkpFtEjFT5kT3czax/Cy/cG1vzfDJWmav ulU3yXFDcCvecNpf5+Ey+/WSuw4MKnzUgX15oXzbbptIdrmaGrdVBp0C5Msfxae7mOGC Y/WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733217744; x=1733822544; 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=PERYJEjYxWhdPat57HCXQqDRHV3hL1ijs4gpAo4T2SI=; b=vu1sD6pMYt/bQdL4t5C5mgThgT5LUJ9JbpViHNzEDDDrENtqhzRDW7Pdmb9FxcddrS Pi7ba6Knu4ah5ZWSIHX4h9ob9dqJG3/er6zdKCe5xxtfIt8NAIRg7wOqZIyWUx0revH7 L+AZy28u7ltTMTUuAICyGiHwgRX2hQXu1FShi+bdQMjiBtO7ItrHKTFSc3u4H+G8zvhF Pw8Pp3j5bicbHays7qiK8bZVL/x9n/aZZ0NX7OD0Yty4wipb3MgmyUmfUTIU01I7Jset HgnscYvJoSPJbhqPgQcQmw3jWz183BpRTb2svl0OxiEwG4yh0K+K7eNCG5Jly5zUDm30 OHvg== X-Forwarded-Encrypted: i=1; AJvYcCUuP4SJznzeoHDM7t/PLY88junkOe4la8e4bSES/rZzXOO2PDnP9ylUM3FwllRdtOg//W5f41VUU5k=@lists.xenproject.org X-Gm-Message-State: AOJu0YzYn2fewyGqjHirBg52hbZTcrDXoP3ACsQWrLsFXrmMnq5oLKki ZZzFKwSdHaKl1ir+8kwO1cRw478r2rg3FDkaouZMzkLRU2X+UZm5IDs3qQQCxCI= X-Gm-Gg: ASbGncufnFMG9WW50iB4UNKuY0i/wAwJJPSS0g3kIwaQl7PQMRbS7xNlu2Im0/AVcpc S2W3ve9fnVWdgdzjsaGR/JB/IRjhlf0rkRu4laqXPU140f5LCJb04LarFqT2LMEBeRxPXfP9dmh u6lveScG1OStmO/Ws/1clkIbm3aAJ34CPxaV+XWinWCV5X61hocK00uNS/oR6rp/TsCa/+YNflz 5d8KA78UsStiDpMyvwkjO/wnINIuCqp9HKfgj2YQAvzWdPfNUcc+duyltMnod8YuhRS7zMa X-Google-Smtp-Source: AGHT+IG/10KRcSJmHbz27onCyU5ZPCzMEQmMKXxzXO8/y/6O5dpHc4TRW51Ux3lkFGHoBQyD1B/v6w== X-Received: by 2002:a17:907:7623:b0:a9e:26ad:d0a with SMTP id a640c23a62f3a-aa5f7f18ec8mr118492466b.58.1733217743897; Tue, 03 Dec 2024 01:22:23 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, Markus Armbruster , qemu-arm@nongnu.org, Thomas Huth , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 5/7] accel/tcg: Remove mentions of legacy '-machine foo,accel=bar' Date: Tue, 3 Dec 2024 10:21:51 +0100 Message-ID: <20241203092153.60590-6-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241203092153.60590-1-philmd@linaro.org> References: <20241203092153.60590-1-philmd@linaro.org> MIME-Version: 1.0 Since commit 6f6e1698a68 ("vl: configure accelerators from -accel options") we prefer the '-accel bar' command line option. Update the documentation when TCG is referred to. Signed-off-by: Philippe Mathieu-Daudé --- docs/about/removed-features.rst | 2 +- linux-user/s390x/target_proc.h | 2 +- accel/tcg/monitor.c | 4 ++-- system/vl.c | 2 +- tests/qtest/qmp-cmd-test.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index ee6455aeeeb..d96dc5e80bc 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -216,7 +216,7 @@ The ``enforce-config-section`` property was replaced by the ``-no-kvm`` (removed in 5.2) '''''''''''''''''''''''''''' -The ``-no-kvm`` argument was a synonym for setting ``-machine accel=tcg``. +The ``-no-kvm`` argument was a synonym for setting ``-accel tcg``. ``-realtime`` (removed in 6.0) '''''''''''''''''''''''''''''' diff --git a/linux-user/s390x/target_proc.h b/linux-user/s390x/target_proc.h index a4a4821ea5c..f443d8f8080 100644 --- a/linux-user/s390x/target_proc.h +++ b/linux-user/s390x/target_proc.h @@ -7,7 +7,7 @@ #define S390X_TARGET_PROC_H /* - * Emulate what a Linux kernel running in qemu-system-s390x -M accel=tcg would + * Emulate what a Linux kernel running in 'qemu-system-s390x -accel tcg' would * show in /proc/cpuinfo. * * Skip the following in order to match the missing support in op_ecag(): diff --git a/accel/tcg/monitor.c b/accel/tcg/monitor.c index 093efe97144..0430b6e1514 100644 --- a/accel/tcg/monitor.c +++ b/accel/tcg/monitor.c @@ -204,7 +204,7 @@ HumanReadableText *qmp_x_query_jit(Error **errp) g_autoptr(GString) buf = g_string_new(""); if (!tcg_enabled()) { - error_setg(errp, "JIT information is only available with accel=tcg"); + error_setg(errp, "JIT information is only available with TCG"); return NULL; } @@ -226,7 +226,7 @@ HumanReadableText *qmp_x_query_opcount(Error **errp) if (!tcg_enabled()) { error_setg(errp, - "Opcode count information is only available with accel=tcg"); + "Opcode count information is only available with TCG"); return NULL; } diff --git a/system/vl.c b/system/vl.c index 54998fdbc7e..c056fcb740c 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2385,7 +2385,7 @@ static void configure_accelerators(const char *progname) for (tmp = accel_list; *tmp; tmp++) { /* * Filter invalid accelerators here, to prevent obscenities - * such as "-machine accel=tcg,,thread=single". + * such as "-accel tcg,,thread=single". */ if (accel_find(*tmp)) { qemu_opts_parse_noisily(qemu_find_opts("accel"), *tmp, true); diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c index 2c15f609584..83f4a2b451b 100644 --- a/tests/qtest/qmp-cmd-test.c +++ b/tests/qtest/qmp-cmd-test.c @@ -49,7 +49,7 @@ static int query_error_class(const char *cmd) { "query-vm-generation-id", ERROR_CLASS_GENERIC_ERROR }, /* Only valid with a USB bus added */ { "x-query-usb", ERROR_CLASS_GENERIC_ERROR }, - /* Only valid with accel=tcg */ + /* Only valid with TCG */ { "x-query-jit", ERROR_CLASS_GENERIC_ERROR }, { "x-query-opcount", ERROR_CLASS_GENERIC_ERROR }, { "xen-event-list", ERROR_CLASS_GENERIC_ERROR }, From patchwork Tue Dec 3 09:21:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13891992 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CB98BD49797 for ; Tue, 3 Dec 2024 09:22:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.847540.1262658 (Exim 4.92) (envelope-from ) id 1tIP72-0005sI-Jd; Tue, 03 Dec 2024 09:22:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 847540.1262658; Tue, 03 Dec 2024 09:22:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP72-0005s1-GA; Tue, 03 Dec 2024 09:22:32 +0000 Received: by outflank-mailman (input) for mailman id 847540; Tue, 03 Dec 2024 09:22:30 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP70-0003Be-Sp for xen-devel@lists.xenproject.org; Tue, 03 Dec 2024 09:22:30 +0000 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [2a00:1450:4864:20::12c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 1e7d1ce8-b158-11ef-a0d3-8be0dac302b0; Tue, 03 Dec 2024 10:22:30 +0100 (CET) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-53dd2fdcebcso6021936e87.0 for ; Tue, 03 Dec 2024 01:22:30 -0800 (PST) Received: from localhost.localdomain ([176.187.209.146]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa5998e6a1asm591445466b.98.2024.12.03.01.22.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Dec 2024 01:22:29 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1e7d1ce8-b158-11ef-a0d3-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217750; x=1733822550; darn=lists.xenproject.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=PKNytw/ebCVRIpsQ9YAUBfkaMh3JJAq/QjBPjtgiz7g=; b=tiZQhQEIPQIT8irrTmv4wfI8mWIq+3djWnxplVzAOg6zpBud4yyMRPlW8VTWdEaQaE xCluZ4uFXLW4psMqeUZZW66Xe0y/J6SGVULHoKxELhKH05WuQrdsnDhOxImuT4EhbU6P G3cOJLE6f9L7WpoR19Ts4urCvPSjDRTFtZAl9JXdskkwoejxaU5q1ay5Tq3bIploADoI BdouQylsettHVvRk0i4IfeuqYXY4MXKDUV6Zrv2L33JfydP5/M0Y+oWBsSFzgmpBxRZX 60IquTZ4dxr4AL3s04AWovDSflkhoCZbvIyxTZ0zMnMBvOdqGw4zCja9ft6S3hfKZdHf cBUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733217750; x=1733822550; 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=PKNytw/ebCVRIpsQ9YAUBfkaMh3JJAq/QjBPjtgiz7g=; b=G/CKNF6V6+LQ464yS3FeAv/aRCxwt5OvrpaNFyxCKb/0wUg3jPbfVE1SF/8/Rbrtq9 S374FUriDeSruhe/0YOLASn0sM/DDXlcN3hd56TtQVScRnG44fUCacM8kUZiO0sOYACh N2L6/dqFeHrsSWafGt+gsMNW8two0wLjJ2tP7EWF7+lVOxs45fjTfrVYHrAdmGZL3zCb 4ohvHHDq1cVVzdZSrKRHWA1KczDalfSXd6mjtoKiVshdVGJfBG3ne5wiIzGq2R+cJtsh 28fDbarp1oYa/0qdmZK/bGDAWoljNIVgfPqva7qrUcRssusy84XX+iyb0QnHwBRqUFWU E85g== X-Forwarded-Encrypted: i=1; AJvYcCWOCclv09JOl6jLAFaZLCm8xC5Ot2mXqn+pf8Rlqpuw4zu4XFw20Ah/O9pOJHmHO48pLY2plScs0rk=@lists.xenproject.org X-Gm-Message-State: AOJu0YwfZPnS+i9dwmm06/hrtu7CAu7fxhZtb9solbK36+vNw2ZFGICx VLHEPYq4RF55KdhjJy+Vd25K0FAQiAk6K5NJPlWBn7VXaSVqwGoNpzMoDBeAEsTHi+WTPalzeR5 WrJo= X-Gm-Gg: ASbGncujykWLhJ7KdS1S6N+QVhnrNJDXAuMo70rFV/v9z1d/i+DflQEjPyVnhwxeVB6 HJzdGLY1N9ieZr9Y7ItxHseoTDmXW7vf3rLlYpYEd9KKHKtTvbD5cliph8CIgIeqAitoVILhQkS RnG8VW8o1dGHVGdEI5L+bc1fsxmQgx1Dx9wG7d2tQMiLJupn5rePgXQ+O+iWCiIdPphFUhJREBJ GMrZ7GN5W9w4wHMRdSYVqmIb//sxGsvmASFhfN46R4Nu9aXqH8Gyb8bUE/qACITg2c/MU6k X-Google-Smtp-Source: AGHT+IFcpj6QzfB53oly3i7BN3QSlvt4/aDJxnH7tiR3CcVRsSurQ5wh0JwIqkBOrHoycPMN8RfEuA== X-Received: by 2002:a05:6512:3096:b0:53d:a273:7da6 with SMTP id 2adb3069b0e04-53e12a290b4mr863155e87.57.1733217749670; Tue, 03 Dec 2024 01:22:29 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, Markus Armbruster , qemu-arm@nongnu.org, Thomas Huth , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 6/7] accel/kvm: Remove mentions of legacy '-machine foo,accel=bar' Date: Tue, 3 Dec 2024 10:21:52 +0100 Message-ID: <20241203092153.60590-7-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241203092153.60590-1-philmd@linaro.org> References: <20241203092153.60590-1-philmd@linaro.org> MIME-Version: 1.0 Since commit 6f6e1698a68 ("vl: configure accelerators from -accel options") we prefer the '-accel bar' command line option. Update the documentation when KVM is referred to. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- docs/bypass-iommu.txt | 3 ++- docs/nvdimm.txt | 2 +- docs/specs/tpm.rst | 2 +- docs/system/arm/cpu-features.rst | 2 +- docs/system/cpu-hotplug.rst | 2 +- docs/system/ppc/powernv.rst | 2 +- docs/system/ppc/pseries.rst | 4 ++-- scripts/device-crash-test | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/bypass-iommu.txt b/docs/bypass-iommu.txt index e6677bddd32..2ef0e0f6a65 100644 --- a/docs/bypass-iommu.txt +++ b/docs/bypass-iommu.txt @@ -51,7 +51,8 @@ And we got: x86 architecture: qemu-system-x86_64 \ - -machine q35,accel=kvm,default_bus_bypass_iommu=true \ + -accel kvm \ + -machine q35,default_bus_bypass_iommu=true \ -device pxb-pcie,bus_nr=0x10,id=pci.10,bus=pcie.0,addr=0x3 \ -device pxb-pcie,bus_nr=0x20,id=pci.20,bus=pcie.0,addr=0x4,bypass_iommu=true \ -device intel-iommu \ diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt index fd7773dc5ab..d589c3a9b77 100644 --- a/docs/nvdimm.txt +++ b/docs/nvdimm.txt @@ -228,7 +228,7 @@ which allows the platform to communicate what features it supports related to NVDIMM data persistence. Users can provide a persistence value to a guest via the optional "nvdimm-persistence" machine command line option: - -machine pc,accel=kvm,nvdimm,nvdimm-persistence=cpu + -machine pc,nvdimm,nvdimm-persistence=cpu There are currently two valid values for this option: diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst index 1ad36ad7099..c50bb1cec01 100644 --- a/docs/specs/tpm.rst +++ b/docs/specs/tpm.rst @@ -329,7 +329,7 @@ In case a pSeries machine is emulated, use the following command line: .. code-block:: console - qemu-system-ppc64 -display sdl -machine pseries,accel=kvm \ + qemu-system-ppc64 -display sdl -accel kvm -machine pseries \ -m 1024 -bios slof.bin -boot menu=on \ -nodefaults -device VGA -device pci-ohci -device usb-kbd \ -chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock \ diff --git a/docs/system/arm/cpu-features.rst b/docs/system/arm/cpu-features.rst index a5fb929243c..4aed91a987d 100644 --- a/docs/system/arm/cpu-features.rst +++ b/docs/system/arm/cpu-features.rst @@ -329,7 +329,7 @@ SVE CPU Property Examples 3) When KVM is enabled, implicitly enable all host CPU supported vector lengths with the ``host`` CPU type:: - $ qemu-system-aarch64 -M virt,accel=kvm -cpu host + $ qemu-system-aarch64 -M virt -accel kvm -cpu host 4) Only enable the 128-bit vector length:: diff --git a/docs/system/cpu-hotplug.rst b/docs/system/cpu-hotplug.rst index cc50937c36c..64314ccfd6f 100644 --- a/docs/system/cpu-hotplug.rst +++ b/docs/system/cpu-hotplug.rst @@ -12,7 +12,7 @@ vCPU hotplug allow vCPU hotplug):: $ qemu-system-x86_64 -display none -no-user-config -m 2048 \ - -nodefaults -monitor stdio -machine pc,accel=kvm,usb=off \ + -nodefaults -monitor stdio -accel kvm -machine pc,usb=off \ -smp 1,maxcpus=2 -cpu IvyBridge-IBRS \ -qmp unix:/tmp/qmp-sock,server=on,wait=off diff --git a/docs/system/ppc/powernv.rst b/docs/system/ppc/powernv.rst index de7a807ac76..689f9c81a02 100644 --- a/docs/system/ppc/powernv.rst +++ b/docs/system/ppc/powernv.rst @@ -63,7 +63,7 @@ powernv. kvm-pr in theory could be used as a valid accel option but this isn't supported by kvm-pr at this moment. To spare users from dealing with not so informative errors when attempting -to use accel=kvm, the powernv machine will throw an error informing that +to use '-accel kvm', the powernv machine will throw an error informing that KVM is not supported. This can be revisited in the future if kvm-pr (or any other KVM alternative) is usable as KVM accel for this machine. diff --git a/docs/system/ppc/pseries.rst b/docs/system/ppc/pseries.rst index bbc51aa7fcd..3b18d2ee1ef 100644 --- a/docs/system/ppc/pseries.rst +++ b/docs/system/ppc/pseries.rst @@ -164,9 +164,9 @@ Currently, there are two implementations of KVM on Power, ``kvm_hv.ko`` and If a host supports both KVM modes, and both KVM kernel modules are loaded, it is possible to switch between the two modes with the ``kvm-type`` parameter: -* Use ``qemu-system-ppc64 -M pseries,accel=kvm,kvm-type=PR`` to use the +* Use ``qemu-system-ppc64 -accel kvm -M pseries,kvm-type=PR`` to use the ``kvm_pr.ko`` kernel module. -* Use ``qemu-system-ppc64 -M pseries,accel=kvm,kvm-type=HV`` to use ``kvm_hv.ko`` +* Use ``qemu-system-ppc64 -accel kvm -M pseries,kvm-type=HV`` to use ``kvm_hv.ko`` instead. KVM-PR diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 2b139e29ba0..2c6fd7c6f6e 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -147,7 +147,7 @@ ERROR_RULE_LIST = [ # "spapr-cpu-core needs a pseries machine" {'machine':'(?!pseries).*', 'device':'.*-spapr-cpu-core', 'expected':True}, - # KVM-specific devices shouldn't be tried without accel=kvm: + # KVM-specific devices shouldn't be tried without '-accel kvm': {'accel':'(?!kvm).*', 'device':'kvmclock', 'expected':True}, # xen-specific machines and devices: From patchwork Tue Dec 3 09:21:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13892034 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7707FD49797 for ; Tue, 3 Dec 2024 09:30:51 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.847603.1262687 (Exim 4.92) (envelope-from ) id 1tIPEr-0001IX-T4; Tue, 03 Dec 2024 09:30:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 847603.1262687; Tue, 03 Dec 2024 09:30:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIPEr-0001IQ-QU; Tue, 03 Dec 2024 09:30:37 +0000 Received: by outflank-mailman (input) for mailman id 847603; Tue, 03 Dec 2024 09:30:36 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tIP76-0003Be-Dv for xen-devel@lists.xenproject.org; Tue, 03 Dec 2024 09:22:36 +0000 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [2a00:1450:4864:20::62a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 21da1635-b158-11ef-a0d3-8be0dac302b0; Tue, 03 Dec 2024 10:22:35 +0100 (CET) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a9a977d6cc7so314164266b.3 for ; Tue, 03 Dec 2024 01:22:35 -0800 (PST) Received: from localhost.localdomain ([176.187.209.146]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d0bfa327dcsm4180475a12.83.2024.12.03.01.22.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Dec 2024 01:22:34 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 21da1635-b158-11ef-a0d3-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217755; x=1733822555; darn=lists.xenproject.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=uLnillY0LwsA1bGIi96aGqNPMbJhHjhH+14EVXV96qM=; b=imUrguuRYGI3zY/PgAsSHrinryfCiJPIe6JSAI8oiLSlJC4i6U5ztiCxdXXQ6XziCB IVeR1KxT4Lta81ACKhd4Or0zKrVhrrDcESZFVL5iVwFoxgyBIHtrdQ8nk55LDYDws6nT t9+WRoshGfzJqOfHbO00G9Xm/ncH41f9JFeZDKWx2UIp038HBihIcig9aHCS41hxYGdW XIP/cs7Rj86WodLnZKlDX2zYGVd7gGv2jCcSjfBU+RZ1NipfsYONHLlaAv5cJ5SDqJgc hmmkC1Ondvc9mrgWEL8GbHqYjHkJj8ryboz6y7FsrMCpjXCODJA9wui1XG1D/hN3sIkK G5YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733217755; x=1733822555; 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=uLnillY0LwsA1bGIi96aGqNPMbJhHjhH+14EVXV96qM=; b=c1GzdnUDRe9OvjBVzFv4yR3KLCg4lPlSFbt8tmiRGhS9bQGHonDAWNgw8MYPdaQP6p fOknaKwztq1U9U59Q7b0Zmh3HcPVZL079NisYmWSoXFMFhSDuz9kiGXh9JCOWgNuBYHR nudvfKrYHYOAm8gAgqsX7Ooe4OTNrfdvunu7CePbvO5pZ2FF8ENWGgftWTLvW1NI+2lK MDvPQvTBf/463iwUXwhGO5SCNIgMO7YHe+qymSfA9ReIx2HWPnELU7Bzf+nmuyJ2bmSC uViTy7e/KAyChJahbHsvE1dYM6hnymk7DwcgXKJgmy4yQsGHizGns2k0qcdPkmMgyKlY 6QWw== X-Forwarded-Encrypted: i=1; AJvYcCWxoqJfyQU44bbDN4HILYiqmxj9ixm4K39M/hwARfByN/xNcfornrykPAXtTLItJqTBR434UZN+MPU=@lists.xenproject.org X-Gm-Message-State: AOJu0Yz3hsrnQpMXYX+Da6/p9FP6BMDSpoNMSIFA8juAsBiqUr/7t0ld lvvW6K6tSdxK7wqGjTaFAIQyCC9yROfWlgCCQMEYztl6h4G8aiK9wuCj40Ompmw= X-Gm-Gg: ASbGncuec356kjmDZnhHJPf2vJTR9a4BkUwcbXSMEB8Ki+Au13xDkpVNEaD6jxGpSMo cfPZg9To7o84vwLVB0vQ9A3x0cXPNLzSCq0NYpuOPUvpIiVkL28plyAD0/M54VWss24pcExdIiS 1Q2JHjIsQPG+sPnNURr5KNYdCJr27uPgGi6hbldOxE7HHjNUqqDD3Y9z+bRWBk29GhMB0dpOp7M fAmPT03hYU5tZbRWbwkoHlUI9sWb6gFcPXdxmVjCBlwrmtUHvnXYAk15+QyKA2qzihSwnUc X-Google-Smtp-Source: AGHT+IF5ZHDt63zdyXLW6Zs/Jp904vDaPlOUCO3dMRciku/OnWILf9UyYpg15w7m7vgh9JrGFnoyKA== X-Received: by 2002:a05:6402:34d5:b0:5d0:e9b7:170c with SMTP id 4fb4d7f45d1cf-5d10cb5c39fmr1604224a12.18.1733217755400; Tue, 03 Dec 2024 01:22:35 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, Markus Armbruster , qemu-arm@nongnu.org, Thomas Huth , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 7/7] qemu-options: Remove mentions of legacy '-machine foo,accel=bar' Date: Tue, 3 Dec 2024 10:21:53 +0100 Message-ID: <20241203092153.60590-8-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241203092153.60590-1-philmd@linaro.org> References: <20241203092153.60590-1-philmd@linaro.org> MIME-Version: 1.0 Since commit 6f6e1698a68 ("vl: configure accelerators from -accel options") we prefer the '-accel bar' command line option. The new form started to be documented in commit 8d4e9146b35 ("tcg: add options for enabling MTTCG"); it is safe to remove the mentions of the legacy option. Signed-off-by: Philippe Mathieu-Daudé --- qemu-options.hx | 9 --------- 1 file changed, 9 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index dacc9790a4b..11f0aab1470 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -27,8 +27,6 @@ ERST DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ "-machine [type=]name[,prop[=value][,...]]\n" " selects emulated machine ('-machine help' for list)\n" - " property accel=accel1[:accel2[:...]] selects accelerator\n" - " supported accelerators are kvm, xen, hvf, nvmm, whpx or tcg (default: tcg)\n" " vmport=on|off|auto controls emulation of vmport (default: auto)\n" " dump-guest-core=on|off include guest memory in a core dump (default=on)\n" " mem-merge=on|off controls memory merge support (default: on)\n" @@ -59,13 +57,6 @@ SRST Supported machine properties are: - ``accel=accels1[:accels2[:...]]`` - This is used to enable an accelerator. Depending on the target - architecture, kvm, xen, hvf, nvmm, whpx or tcg can be available. - By default, tcg is used. If there is more than one accelerator - specified, the next one is used if the previous one fails to - initialize. - ``vmport=on|off|auto`` Enables emulation of VMWare IO port, for vmmouse etc. auto says to select the value based on accel and i8042. For accel=xen or