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: 846942 Delivered-To: patch@linaro.org Received: by 2002:a5d:44cd:0:b0:385:e875:8a9e with SMTP id z13csp375481wrr; Tue, 3 Dec 2024 01:22:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVqLVLCD9Tleq3kK6ssSwUXPagJ3HCGR1DWHdQHcgqcfSyf4hKIgo7qxvRH6nwSHpr2841+aA==@linaro.org X-Google-Smtp-Source: AGHT+IFrUOxmsgZicBRsDNwYIzzpVpP9I/AS1XntuyrU/ltJigziSDUHq6L31DJmPq/B0o+Y8ZOP X-Received: by 2002:a05:620a:4109:b0:7af:c60b:5acf with SMTP id af79cd13be357-7b6a5d28402mr233404785a.10.1733217750459; Tue, 03 Dec 2024 01:22:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733217750; cv=none; d=google.com; s=arc-20240605; b=TChePQ+LfqJjH7+kVcgQnsn4rGDjsUfviUIFVilVoziklH1bbHEla5IobVCE3yOfVs 7rktEYC59y2cAiVIp5qf/66QZDWrQiGPGELsqMlYLGRm5lsD45vZZByqghDxbX9UCY+s HkXzU7DIkmvEq2VvnYOdzZbcsKsI3QhO2YmfM9O+jsPKKOaN4BbKCbgeVrbxKGGV9vf+ JzQPooeZQwmVPxFAYLTVDH8PN5fJpj+bh+w0jl+KaTqIkwZafpgVz+jjWFAF47lX6Y42 /r5wfUiLSQOFZgYBNcBV3IKbk/FeRnZqdnWFpYD8lC9napRGIev4eH2k9cd+JxUwCqr6 8lTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QhfmnQV2U1yeLbQ0YN69JuJChLdIfKrfDAxolXgPuaM=; fh=K4q8LGA1dTAvVw7OHYqRwA3rKlWlusrk6TGWj+g1fmU=; b=fLgGScgyUicJUho0p5gHlubJOU11vkU2PsIhEofH+mHBMbpnN7GMzQG9CCQ8DfMc+o 5HmugKReFveOZhedKd/vE0/PwO8r+tnKRT1OpclAtAGxEVXoN3V26e8LUiJz75gvmbtl jvKMhQsF/snaxEj+hvzGDJN5xPWQWi9VeUO9L4XZB0LNx+kcA7jo+GSSXf5xRiv8hGZl Ff1euUEtuvFXYsmgJokZ6tej68j8XJ4IcsPH8aGmOAxvIOmNqlILHDoKR+OJCx9urexW gl5/X7PSbqPnu4fR6uF3319DKKfYVq1eT6q5VM/uGE+sXgoqYgdfbSv+P2QJd7gfo+Js LmYw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uRhwpA7i; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b6849e62d6si1361833085a.565.2024.12.03.01.22.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Dec 2024 01:22:30 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uRhwpA7i; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: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: 846943 Delivered-To: patch@linaro.org Received: by 2002:a5d:44cd:0:b0:385:e875:8a9e with SMTP id z13csp375570wrr; Tue, 3 Dec 2024 01:22:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWURhxwYxJWSpGkjU2KD3OlnUVSLfbGGFqChLhZXTzNkhmNok5kDv9COmJvhrS0BwCm82peeQ==@linaro.org X-Google-Smtp-Source: AGHT+IFFrWG8xmAb1V1GQOV1M6RWeCUsp9sJAW6WEeOZFm/gjuRJKMQ4kPODcnkEvnebhmL8mEe9 X-Received: by 2002:a05:622a:1302:b0:461:17e6:2650 with SMTP id d75a77b69052e-4670c08054dmr22412971cf.14.1733217766209; Tue, 03 Dec 2024 01:22:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733217766; cv=none; d=google.com; s=arc-20240605; b=DPs+Bth+asPEcbn+XZoGPPewD9pjiNtTND5shOhZAaef0aSamfwhPTi91qXMXZIGeu KOoEZTfU50n8lF/ebSpNFbYjPbOZ3cunpP/J5HWp+2vpPtEIYUg7Bb+Lwp2XzWANTwo0 ttKpEYXBtUhNLhUf5WpCxQciUbPZ0HPflUlHnPdy18QuSl0nFu8y31TnEkGJlki6pGCt Fbg0h84VzNpdS8tyCpDzVKr1GUcK+OL8DvVuzrZYdI1xSFX4Q0vv9rdn1YPLkbc6AzXZ VbHYpl60ug0zBWJFpIOMEQ0lHHOB/uSL7tUk/GOJTupwjgfqrCTVAoJr2ZLW/BBnvA5V hOhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7Z0cleQPrNy9NjZu27Yx3P0Ha1Flw6gQBqfbwRAF2Ak=; fh=K4q8LGA1dTAvVw7OHYqRwA3rKlWlusrk6TGWj+g1fmU=; b=R+cwibkJgjvHwFrnqf7sZbyjRxxYpeFDVxZ23OWupbwMkgvyl4nvKiTjCYMNPtLwRz qdYvW/tU56oJlL/3YmOYzVXpASRRUgvRtSS9zCeQLQxnQmgp21+WkzbbZ11eYaW2wfnG PNZasXWDrYXeWQ2MyVUtUtjilOKGAJhhFQeakYxwtGU5tz9k6Hegg8Efe88qC45lelpT 0pRyJYpkYiwSHfSrsR3F2Hkl3FRv9opefstsPu5Z/q1Cs1ci9ed97ciYd3LjMewm0h/7 b4sQR71m6D04ZrUqzv2n0tlXJSb0JuxCbVgRW8A6DmmXAVBixH7mSGTgZS9kBY3fG3kC xU+w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Pc4YCdmP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-466c410776bsi133519891cf.321.2024.12.03.01.22.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Dec 2024 01:22:46 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Pc4YCdmP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: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: 846944 Delivered-To: patch@linaro.org Received: by 2002:a5d:44cd:0:b0:385:e875:8a9e with SMTP id z13csp375715wrr; Tue, 3 Dec 2024 01:23:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVD7UG+RaJ0bER4RpEQaa0UF5jsVxJQaOZzHmrj6D8kJiXGWcFiFFUCmQdlV6kph+SDBqrxAg==@linaro.org X-Google-Smtp-Source: AGHT+IGWUYOLEB66a0aaidu4UE8MHrxxHs1ZTZmLo1RrjOXzaE/gOyr7Tq66uV/ZTANoRBSLQC4/ X-Received: by 2002:a05:6214:5297:b0:6d8:9be9:7d54 with SMTP id 6a1803df08f44-6d8b742d214mr24564646d6.35.1733217789840; Tue, 03 Dec 2024 01:23:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733217789; cv=none; d=google.com; s=arc-20240605; b=k6iYT0Q4dzA6RZnRJ1TIXqwKfnq93qColzpcDEUEAuwVPBjOEp5k19ktO0j6/46Tmh Y9ojY0tv7ytUZD8heJwehI3TiUHZWuqeYiLv3jWq8P3nRkrvCVJ++VaRTy7jLT/x8pxk +/ilH98BsKMwspGXfsXRYYcbtH0OYcIC45LCfidOglKMrrfgVCRDfpRy2xGohydjaT/F SsTz1ZidTVu8mfx378BcNUxve4XCzh6fusJzzjgJ/lujLft/ZqW+Lv+gAydMbIhgfBxl WiJW6ZNSpitTNaL9s9lf0rY+o81OqYmd/aBYWH2ATMhhdx7vZ/SykcJ0Q2M3FaI8eZyO zHWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PKNytw/ebCVRIpsQ9YAUBfkaMh3JJAq/QjBPjtgiz7g=; fh=K4q8LGA1dTAvVw7OHYqRwA3rKlWlusrk6TGWj+g1fmU=; b=lX5lyvGKVgyw8t4u/Kh6CbMCPjuEX8N2dADWkZqHDcnWApBQ1AE7gydkhUJdrwKKB8 W5/EDxBSLpaxdSrAvy7oY/RvjxEFzjCxMcRdNuPmMOhG278ioU2GyFdJZeLiAMeklttr 6lg/I0eInbxonssZelUGtNtF2+GioQC7QJ4k8Wvr7nqs5viQauK4Qt1OS+rtLdkr+dsm pVS1uhoyfPWjM45N4Mh7vRF/wBNTy6DDjIa2b0jZr/bCbyTHr47O6ULNUTuoN5MizG/V 3IfE603W2w7HKRC9/+IWOdwFGPCVMF3/3scPDXF23byGVeoJdRdO79oDaospc5LoUpi7 IOtA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="C4ES/bYd"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b6849b1d48si1343034485a.270.2024.12.03.01.23.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Dec 2024 01:23:09 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="C4ES/bYd"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: 846945 Delivered-To: patch@linaro.org Received: by 2002:a5d:44cd:0:b0:385:e875:8a9e with SMTP id z13csp375968wrr; Tue, 3 Dec 2024 01:23:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVav3xCwRaENlck6+0aYqsrk85jaofRRbUZmrR8Ix9WOInbjjfSwTYn0SgTbtLksz7kNAT/IQ==@linaro.org X-Google-Smtp-Source: AGHT+IHGky0nMSZ24sd33CoGsmvF498p/+lvg2PXlNCIbYSaalOFjnfkrLtd44KQZhswEVaeSiL4 X-Received: by 2002:a05:620a:d89:b0:7a9:b268:3655 with SMTP id af79cd13be357-7b6a61c84a0mr213009085a.43.1733217836436; Tue, 03 Dec 2024 01:23:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733217836; cv=none; d=google.com; s=arc-20240605; b=b5Nl51sr+/0BaiRzDXLVTNAO0IphpZq8yX/jkGRYDv9+qTNCARSn2iu5577HHMrjcl Nd/K5QnXHNR8TiwUHSBlZ5PqRV1menHjGW/WSJnGy/F3qvig0R8Vk92nVCjGRReDbNgL D83fgsW5bqEmhUrtpBaWGxXXJ5HkElF7YZCnrWM35FdkYRQNNt9nG2lld6Qph/dELsSz S+O5bADVct4AtH/zsPwmwVS0LaxFEtSJOf1rCcX0npfmkABRW42xj6kSHmYD/AlEMfHL Q8syFEBDkgdsrCSaZP3cxmtccabaxKz4GOUGvRT2s/IpoGDpazuZ4JbF7GrtsLcjr6zX Eb4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uLnillY0LwsA1bGIi96aGqNPMbJhHjhH+14EVXV96qM=; fh=K4q8LGA1dTAvVw7OHYqRwA3rKlWlusrk6TGWj+g1fmU=; b=SDevF8VJnUWdmmOTab8+jCIxWzE1vEu+8fun5qexaQn8SgWu8JSJ07Ev36x7pLBcDz ogm5LmvT0yoE7m1JxE+ABGLm8A7OBNpBR/R+GDigwTtL9mhv+5YA4g26x86hWr/OsVpc 1hM4zDOUTBC8FP8b4tm5HJqncG+l/cp0y1ZgPkWoyYsGSqpLVDn3b1M1YU2TZr+pRlBp UpPntO6FjgZtTsPjsgbHH3egR6/CCsKDj45nsmiDBcbsEDDxVB9imQsuC/7A8KUXv7Yc 1OuVF448RLy2vjgRVxHJv4s9o80F2fPyy4VLUqq2QJ5oUmsvrHIWmfRxSdujuZHDLLQ9 BWJw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BUFd7peR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b6849c445asi1424441885a.450.2024.12.03.01.23.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Dec 2024 01:23:56 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BUFd7peR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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