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: 13892009 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 C0B76D49797 for ; Tue, 3 Dec 2024 09:24:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIP6d-0005XE-7k; Tue, 03 Dec 2024 04:22:07 -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 1tIP6b-0005Wh-VL for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:05 -0500 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIP6Z-0002eH-So for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:05 -0500 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-53de579f775so7337200e87.2 for ; Tue, 03 Dec 2024 01:22:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217721; x=1733822521; 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=XItCJo5+ANEXJJ4rNbIonoA3BAW/mx+bgexv+wsAke8=; b=N2xN9whegwIDXlZKttTtXksIKYzczI+I0Jmbv7nVZBIyuGBVcN7Tmi2O6VJLLfQDPh zEwYO/9i7jtMznAmW945cLWGk/eYXQUool/0nd3Ym7fkNyUTcaDWU21ZAPitgPzbBhoU O5anoe34/euS1/kX6P3978Yzr5GSNSnwqzBYEgeUc1qhTg0+jDu3e2I5UmLY0lWORPb8 tjSJvn6jThaGJrrGVmjleLfJfO3uzsHCmI6rIndJOTPbUA7NGq0xg5gZ91j/e084ntoF 1LraiKSjsNzYfDh5EMwmrntHuYz8no3BRRBJ7b/juhHcUlEOWjK0/k3BXXg0Pgj3grHv sOmQ== 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=f6Sh2JkAk1VdnTVrnsqrNFHd4rYATa+/Khj5sQEjs0ZhgzP6L3k921dgjReWmgO90+ 97XS7/mCZ6i303Q25Ak0PSaf+Z5xftYYr4q6RQL7n5K33yTj0ZzzTlh1UiVdx95v6IlN 47XsYg2Xu0Gt/8EvPW3AlsOE0QXhrx1jKmlIXnjBqWTJ/9vzEZsjsi4RMlfVOg+ERkQe ozyVuZXiRAXj2xWzvfH+lhiMOpdrEOC1YLRKFKF5JjDo9KoedncpL5D6ZEkAexNUWFuV wcTCdTV1tFXOwDQ1srE3agOT5/SY8dOD6ec3jrj/BJcUMqkz1+KmtPF45K+VK2MfWbxh NxfA== X-Gm-Message-State: AOJu0YyJm4WOUiSRDlX0Pc8NnxC3sGRyx9RTtmIAH3qzGPqJ8hywJnZT QPoOVoN3XGnBPinpBPSyJbds27gJe/WQBW1wq2dYN+6rL5AtEGJ3F0Hubdac7xHz9xN0lm9uAmz l09s= X-Gm-Gg: ASbGncvpI7IrfVtLW0SIgkp+iu1fsxKIGn0SPf0ZgUfYjR0csEok718SL8YQSyCdBsk tZlorppWawcuwgKZ3kIIelLKG7wAxACdzBr76+0wKtvXugURZovZooloS90Xv+s50S13IdeZziE uFONN6cuSL35OP2fK8tlWCTUlOiM7mNIPii6arJNQnhAQEDSJKAiE5A5Hdk31AYzvpIvnsjqvNU /jFTp4MOgNn5AzBEP1fZjxH7HD/VOkNsM0gxXP1tt9268+wAw/WrsIMWWj+UjnlI0lOxElI 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) 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) 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 Received-SPF: pass client-ip=2a00:1450:4864:20::12b; envelope-from=philmd@linaro.org; helo=mail-lf1-x12b.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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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: 13892004 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 9EEEBE6C61A for ; Tue, 3 Dec 2024 09:22:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIP6j-0005ZH-Vi; Tue, 03 Dec 2024 04:22:14 -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 1tIP6h-0005YL-9c for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:11 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIP6e-0002ev-Q6 for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:11 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5d0bf77af4dso4365781a12.3 for ; Tue, 03 Dec 2024 01:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217727; x=1733822527; 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=QhfmnQV2U1yeLbQ0YN69JuJChLdIfKrfDAxolXgPuaM=; b=uRhwpA7ilvMbYlQdYPP3UH4zf3LyoyZavwMwXOKCx733SvjQ5oKsp0f4ft1R7kRJUh OzMKbxbK7IxOga66hne5FwGPk2/57EhqMa/FArcpdAl2nSMvIx0RO6HF50+TVUmFPt/L SjH+42QnHnIrAZmNzsUJryRd8z3uy6Wt2tjzgbRnHyDVWSxTji/Ab4x04RpkUbzQwi26 y9CFkwidMQae0toyegW5X7x6RIcyuup9LGdEWAoZwfNhfWLyTX+8iDPsdK0qqQJSCxmT VZgGbI9brR78ZOx/JvckZaIgxYBzDj44uYCHOYwEO7uo8PAJNKJ5uoKrTKuFVbkhiDis k+6w== 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=BbDgDp7P5zVhg3rlGXDrpxXaPsayT1hYbm2YDbbYym8cEP3WSLUqq5sqxKhdqZ0fUX WJDb5Hz/eoxZY61ZigD3X8enpWW/KVnl+Z7u+l/Yu3yxngUgJugyDWdlFE0ZCjdU5n9a x50iJhkdAi0RQWTH6DOBo9IUnV6dguer9n1cT88ayTJY2NNW5SwVKn76p1Bfwy2JUA7O TclVfmFCuLudzHbf3e1+SxvMr1NFCFLtSOT0r6nQ5ivMkLHliFm8mORS4EMjGnuESJTw 7kJ1diMeTmp0I6mmSOksBDAfxDzGpHKZpC/be/Slitpcucvdzghr4oFlNHTkj7TEGVBm 3maA== X-Gm-Message-State: AOJu0YwgHjIdqCJxHZ/9fUsagn30FG0hln4XgKt1eaqymCBYUE07xXGJ egjOTCLemNUjmdb8mablphc15TkuGcM2OFyzkRiO1H4aoL0BAEWOuK1tIHjm/u7IqMM+6UCJnjN 5Ous= X-Gm-Gg: ASbGnctlAoIRoF48uqVXa9T6FN4++TIeEuy9nWU/5Zq3yWqOJA/ZYafhPbBegp2SNMx Wjrz1l4Fivl1siYgU7+Z4EWhd+ZKjY5cvOvzbys5sFmoeQE9xcvVwpeUys6E0QWW/eDpw6bXCo5 YbzK9G+KdBOqF+XZ3O4PXZAsUToCqnRSWL5I3x7mezWs8WSVi9mTySOePhiODRKccyPoFPAVemv SozBlmWphyMKqST6WfWaWP6a3JTEhXfAyXSHd+YzYDabkcOAvfCMSBVqr6tHX6YNghmqaZK 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) 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) 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 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=philmd@linaro.org; helo=mail-ed1-x533.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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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: 13892008 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 C3BECD49797 for ; Tue, 3 Dec 2024 09:24:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIP6o-0005ae-QJ; Tue, 03 Dec 2024 04:22:18 -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 1tIP6n-0005a0-4m for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:17 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIP6k-0002ff-Gy for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:16 -0500 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-5d0c8ba475bso3826688a12.1 for ; Tue, 03 Dec 2024 01:22:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217732; x=1733822532; 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=C/6Bk/TIHmUcRxz6rQ6nK013EsFPgzobZnpt1ORjNTg=; b=cYaHDsbdPt5Aii7fBNAv+qewQZs6lj/bKjf9ZbvTCnjOvFFDIDWBMZ+iixq+eeXA9t MPt9jb9ewjWfcUrza/Dod4CWlPLl8geOPCn0vtOloqImT8LJHyJxLf41TYlU5RxPpuuH EWh3dW8dS0TqtWkIKw84b/ywc502ZOfImz4CB8DX9dQt3ZffGfkHUfLfHKWSGAk4UT2y 5SoG4lUdoqDdqsbXkBtQWAuljz01MpGfLC8LZ3KyX4nZFQC6qD9o8jYbXxO4zvMaFazZ qHBbsB2mxPefq6+RbxJYongeKnW52AmZFK9SNHpZ3diC5MHEAaMJn9Yuv3AApJwuOhS1 NAZA== 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=G2jDAjXJadQ3nSuPqZU9+iy7gk7Jw3YTottlI3/SAbq4u5qg8OfVG8uUhNZQTXS18+ Q+HO144djj5gHlG1DeJ+WAOiEt2XbjGbx+tp9nwSb92vT/BQKkPdEbXDN8SJPBheGwef EsoOtWoWX54URR0qlMCix8CRegyW6+Hd0sZUnYfaWxUKJDdSd1XVpGnCaAm8E7FQoal7 5wY3eIX/luyfNAI2VPxJGDDJ99/4BrybfemBSbftUsu/aeHQeRVCWUJWyy66PGv2r1JH EvSpyWpXf1ulMRfyUDl7IOXTG07TbMwJKH+c0XrWcjVUTqIUICsOs6EvvQ0v/06E7Nbd QAYQ== X-Gm-Message-State: AOJu0Yyl5zpvgrH/KKKnO9hHlcz7dodDkbEt+bJiMDxRf7FOyGLAwdCV NoXYJHGgA3PLK98gBEetHsIElHZGH442WUdZ5DF4YMUj5KDtjICIlu+0w7YQjSjySPqLRmfYI8n Mt/c= X-Gm-Gg: ASbGncvcNUR0C8UfbXdKR+hlL3tatWk4NjrPqfmZKKEj3xeDSsyROxxQSaSGxUKArdX +2je87Tw8L8pZaACwMc4P6RdhyvM6LKKnT4r0eF5P5UT1RwFl9yHvWMi27RpYHNR1temGS2AeXi yjPcqDB4qU5HZZWyzQJvuAhCiVRHMH2AUXjcLQtckEgyW4w9PvnkDBBXuaux5CKvzaqNklPzKt8 rGl7g1ubYyTkf+w1nHqAzC+u3ZYDpBJ8mzz/0ezop1dIpXFoy7Dy3/baciWti63u6PwEtgJ 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) 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) 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 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=philmd@linaro.org; helo=mail-ed1-x52c.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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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: 13892005 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 5C671E6C61A for ; Tue, 3 Dec 2024 09:22:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIP6x-0005fs-AZ; Tue, 03 Dec 2024 04:22:27 -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 1tIP6s-0005eR-Pb for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:22 -0500 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIP6r-0002gR-8i for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:22 -0500 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-53de92be287so7765032e87.1 for ; Tue, 03 Dec 2024 01:22:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217738; x=1733822538; 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=7Z0cleQPrNy9NjZu27Yx3P0Ha1Flw6gQBqfbwRAF2Ak=; b=Pc4YCdmPZUhHTeD1/Km4Uw7qWk2LiwV/pRWaVuzftMIiyyV6jPshU9VzHM1sB27s+M pvDDdsENBb9xrMuRdaJBp4kSsdKrpjozJC2rZTN+HV192ThE8aSxb+m9nkfOIh1Q50Ck zA+PuMZJoeVNf96jk4fbBSXgBZhW0VOQbn03s1aKCr2Cs82BiuEV//6RkeYlCM+E8Kxb ziqZrlCqejENofkhyUJqPhhXeSg2ElhLT2KoaBlrJK4MXgnCn5geBnGSSFWdjABV1U9h umWNFheXy6xv3Elwacy35DhqTAKBJck+9t2VtEgrFCUbIN7sNbc5+o6EdK1ah7XfBPgd HDow== 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=riSl0sINd1TfHipVo+1PmFCZrQQJ0nUL1ei+yk0wTo+n5nFGbp9UekWokQKSTYtmzI KJ+5dubeR3s5WEHl2jtLNQipGOPmQ8ZX3dfAeD7P8i3o0hpTph6bTkZEw2hshcu5aFCK v27oSife/WleuIL08bUTw4exHz5vje8l3e8o0+JP85hcemjRMzT0Pdvi0eabui0USWW3 ER4MHiI99QiK/Gbj+YdPzvAbL7dybf5CJ9lOW+C+e36yUZ2VwrngatK3UWG/PJVrqSZB ryBkmT/a43ybhIDDMfs41lMRfHru2gevfJ+3i78YvXQIy2EhXKO2401M2YehoATDEQWf JcZg== X-Gm-Message-State: AOJu0YySavVTg2eUAxI9ErKI014n3hWDco233HCzqstmQaWGnpT4/iBn W+erGawdfDYCWo3Np20lcJHQOjYEDLOcecqSOq/4wgWUfamJPs6oB4KtfCuz/1RBWHHNYnBH3zJ 4Jyo= X-Gm-Gg: ASbGncuLyXND1jbESm3z9WLKL/97TLOqRb3XR6oVOci1lMGy6WYjEvwAL7yMhHmHULI R7lRSnyAqPTyzOYbmrfThnpFeb3HeiFXfWYhWc54fXN3E8hn0DYqTspoH2tJdwibE6RhaRKS3yi mUB24PWssnVnTWZ61srkc41Q11BsXH/DEpoM02btAwAsjwMSwpMtDogn4YpCutliORNj/7NwCJO /UwYwOHBVWXBs5ZFaBwO11RtAD8ewO5WWyKLuzgX9Akm69NVWYtAfEsuy5TjkP4o7RxOuwR 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) 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) 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 Received-SPF: pass client-ip=2a00:1450:4864:20::136; envelope-from=philmd@linaro.org; helo=mail-lf1-x136.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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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: 13892010 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 B2A28E6C61A for ; Tue, 3 Dec 2024 09:24:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIP70-0005io-8z; Tue, 03 Dec 2024 04:22:30 -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 1tIP6y-0005gQ-Lf for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:28 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIP6v-0002hC-Rk for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:28 -0500 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a9e8522445dso749761566b.1 for ; Tue, 03 Dec 2024 01:22:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217744; x=1733822544; 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=PERYJEjYxWhdPat57HCXQqDRHV3hL1ijs4gpAo4T2SI=; b=NmzR3xqCApj5XI6D4BnGs+0oazOQGo81AygrtsTJBFLdjtW1Ekkz1sb5lL3IfVDX4p vXXN3gUKc006cBAyloSHuaL8alRSmKHve39lgF0FSoWljzc1zUqIyu0nZXCry98RZsPx gSBI1uWqBaiWKzZtU/KtGZC+KhWrB8TgqpvE7khFkZq9iscO9hlpHkD2mup3dSWo01y2 zrCcbUZ6LdAOyEt8Q6Wk4bL5/qKaT0flnAlpJd8oUiWzlc43ca2AGYWk92f7wSnhGhwr Udw9DE+yhST/VvgRMpJtqkGMTt28suxNlc5t30FBJBYcsSM83D9hzcJ/YaCRl9cI1X56 SN2Q== 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=wO1bSEVsRB0IsYNmTJOr7efx8ITdUGdTkyusbmfHMNnFMkKM+VJFbdzTtOeTZS0O0+ USwBvyepgucuDrqysxZD22xDQMBePQ20/yaV4XsVFL8+bPyMgDclkXkc3bLDuzQDfJRn CCgeoyI/JuHZXw5wGvudEsh76bYYRx9cjCMrq3JUs+1AHFIoGfdlmOcV+1PJ5b6iPmBn 8yPy+osA3RyTVSfGXF3zFiflKECa7QkLf/18VHV4RltIuPXR3lqnr9459Wtvk9R1lftr E2yAHHQ0IX5bkG02OyLyus/xRUCNSgmhSimSxVmWyc5WzSHf4c4lzl94QzcSuzmrsqvu /2TQ== X-Gm-Message-State: AOJu0Yzw5wGnZLguQt37oegAqUeAH956n15NoWBlj4qsgDX2b3aYkXK6 xVNfBdIqJsrZKEg8UaXzjTLIPGTqpPe20X6dBfGUhPBYdHj/t1KLeiL3/k5ZU6qIablt4tL024J iPJs= X-Gm-Gg: ASbGnctJwAC9uCCL2p19fasvYudsCvC2LGPT8Id5oAh7mI7kyCnTLSXij3BwfqMZqU0 xAoY4e6FCQhJMpIOUzVnmbiq9riDTv0+qLPKAksY1LjMw9IznhZSHHr7OoMiOxiAjErXn71M42+ uZN35BX0PpsoaCemAyAesdp554weBjMhutiqyxZ4WNcdvsRRInfTqdqA0R3cjlyjf1oB9232WF1 thm0VT0Gd/oYXgF08qryVR+rhHr0wJl4KIHpCcecuBEEwKIouWV04/AO7U2r6ZYmj1trAO0 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) 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) 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 Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=philmd@linaro.org; helo=mail-ej1-x62b.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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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: 13892006 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 04EEBE6C61A for ; Tue, 3 Dec 2024 09:23:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIP76-0005o4-8b; Tue, 03 Dec 2024 04:22:36 -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 1tIP74-0005nV-FF for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:34 -0500 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIP71-0002hv-Nf for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:34 -0500 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-53dd8b7796dso5610668e87.1 for ; Tue, 03 Dec 2024 01:22:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217750; x=1733822550; 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=PKNytw/ebCVRIpsQ9YAUBfkaMh3JJAq/QjBPjtgiz7g=; b=C4ES/bYd6CIO8uWhG9jWpVePaXTZZq2eN9nOGUP8DL/8HnrM+Wj9fCOsfBiIzZsKE8 GB1J3Aem2YBIPebnZUlMENgLt+HMgSpTVk2q3SDW8In3QMI7xV0+gdFJOsdQ6uw0+WcX y2Qp5MUddxt7+LSsEftfszqEH3k5bOWm59hyCWR5sppvy6+KmwQ1Fz573LWT9O1AQOrZ XGhMJ5Lj96HRdS8pk/0xGGgGN2klsK7VR41jKSuxbdda31ZPLBtqwLeWIT2AGl3qBZJf qveoX0NKHtFowIeLcCGApOQrodsDZ/Xvou1wpjMrQpFjyZfLGBjRhtWcxyOYOKfQqmEW Zosg== 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=uIuFiAHO6NAU56guFW4rba27OXOKguySnzrMcHo/H2D/x9Pid2L4a6K77EA4ekyibq ZQovNjKXSBBWZfk0zSjWiNizwXY3ydaetoWvF19Tk3NkGvXNhQ/JGDzJLfUNq5ct2AXs GYrXehenvGYeOmclrFWqKUr/ruslGylx4ppxZc/TobewEg8EnuQ3UQ5rcZatpNFSJnST mTSDiQvXJ5hwN6HeCKUmkAVpIyav+1hfCXlhj8VxpPc2c0QNcK9dwM/PTzDTQ/azZAaa R/LGCEkkQ3jlw6jmwwSZDs/KJa5Lu77BLRZmFVA7EAklPEXTcmYHUzpNw91zV+XhNvYH o1XQ== X-Gm-Message-State: AOJu0YzkHjb9aBrpOHmDfjQG5+R8O/U3xCjA2yr6tvvvx12xS4oiVE9i nN1MQn6dGHsa+x9ijLQmeuLYfuivtf77tI5bQxTXNWThxmGh56hDQpg2qNwNMZIB9qsIZsIziTW /HGU= X-Gm-Gg: ASbGncu0RvfdHJEfvcpzAPSh/cwtNMnI6aE3kGrSEUpSHSxk6ZdYPe1+HToLRlzTTlk u/gmMnjEhSTmmuBz8WRP9xWYSp3si32QUPAWSj7NRSXVL8QcsUcB5a9SJPTTBw/pByN7a/FAYOT 6R9eGJ/7DXMVaTA75frdCHcyTWm1f9ry2YrlIYqjpd+uSuyah8owt8DQFIzGlLveqCk5sB6fsPf Lztm/BVTfOSAAurXdOei4upzrFdaMQOXWacmm4tzH2ckYisW8PzWcAR+olDiA6YQMfzaWQ0 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) 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) 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 Received-SPF: pass client-ip=2a00:1450:4864:20::130; envelope-from=philmd@linaro.org; helo=mail-lf1-x130.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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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: 13892007 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 9281DD49797 for ; Tue, 3 Dec 2024 09:23:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIP7B-0005pl-EG; Tue, 03 Dec 2024 04:22:41 -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 1tIP79-0005oy-ML for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:39 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIP77-0002iY-3y for qemu-devel@nongnu.org; Tue, 03 Dec 2024 04:22:39 -0500 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-5d0bd12374cso2494964a12.3 for ; Tue, 03 Dec 2024 01:22:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733217755; x=1733822555; 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=uLnillY0LwsA1bGIi96aGqNPMbJhHjhH+14EVXV96qM=; b=BUFd7peRHkHPYt2kSwzpNFdFK0XR/pcaoCQJDxZLDQZEG0rikY7aWkKwGjZY5TuMsj jniqcUlGzNaw/mnG79PiC1kaenfa5Oc6GxfxSAWox+7zrqDQ4NKbdgwKz5oINwgyt9bo Vn1cNz5ie7sf+uLQheZMjnaQvCPcTbKYnx9lY84/DEzpXBHRc3pOkEkzEmtUSpclaSrP 9OtZJ9XKmQ0ZghPhXFI2HdXAC76/o4CBfkvi6Aolvu6H+6hVXqnphroXkjzALJGbLRJB CkkqKbdL+eGhCmYigaZT7VvvwR/0y9ihBPPPPvtQzFWV1m2dFJZ5Ex0EK1ZQensWTLJN oPYQ== 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=lfdUJD3ahDACPPcR3TdJP3C82ohPubHI1G6UuAEfXuucqiuoSVhxpS+gUu7p9MtxX8 XAY7yqmHD9p5Fv3T/qClPVz0ibGyAIuPMISPV/aI9Ce73oLd/6pcf1nlixNsxXBedp3c VSx8HGpWetY6BNCc9py6pGPG1Ee8qqjkPieGQZC0+Z1HBjPCO0NPWxU4MEl0iif1FBPe YRJ9Ad7bLnUBD+OICYs2IfYX7goFxO/M5cUptVmAkKnNeDI6fEnYGpKotIlpP1sf2vKO 8XHeY0SInQngIoKjIyhYnnuv6ZHzIdLWWPFloKO2a9RZrbIQbNjpFYeuN5H7Lm0ArNJ6 2FYQ== X-Gm-Message-State: AOJu0YwnTQMAzZlgg5sJA6ImRWvla6UbP0hur9vnU+Cc1VmFlR+NPswZ /kuZIXIsSczfcgUoENGR67AY82SH6mTPymuiNVE0Wp83f3SJai5+CdjvWY5s2ZiCBAmDJ0HaZNX Ra6I= X-Gm-Gg: ASbGnct3neuxADZ+ACS0yF+TY72UD8LcybkpRKFV2FtUNiLqiz+4Py2KpvFgLGUfcR4 GWSc+R5fSvM3AVoWeCdcVHNyjKHQ4OsmlLmQbHQYBIye55/YezQW4tOP7czUV18Cus191K6OnMv 1xfza7spWCs84cswoF26k0wnFAYc8VeMGmENpGFoW7BxiJfb+HyGI09Z8Op8+x2GeBBq5FpDYsc fRVHug7V2gak+wBD5PoMtbVEOozSlgsEYrLAXAgFe4QxjPrnR9WNEvpJsVoJJEaUcTgQ0ZH 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) 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) 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 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=philmd@linaro.org; helo=mail-ed1-x52e.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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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