From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614326930; cv=none; d=zohomail.com; s=zohoarc; b=f9F7Snhvr0lwn1MRTSLWf2UVeEqtKxAC9IeywO8hKVS7K09MyWDOZ6sBBxZqxdrblAOHrv167gAdnTgzxKf27cNCkMzcMjPn4mCcPJWRsoa3Y4JPnA5+ys2pN+ZbIFQP5m6Q6jIR5VDzErMMSqD9RkWA3Zgw03DIb/DhvaJlefY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614326930; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LM0ymEIO4brC99ZcR5LN3FimbR1Szcx2N+OesKrDNJk=; b=oLpuFmeKXPGCoy1LIGifrmR2pOOPFhkDP+koGt3mkU6WRipZQ6+tWNRPG0f4ZoHrYnEI9Vs7ZLltYkN1oO3SjFJR+IJA/beuaWOSZkVrVd1+eFxQLMM1H5HybBFcnWd8DmeTBZIspTUsY/yVIe+7V/T2mSAaWyZhDlmqqg7iYV0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614326930055128.06612564366276; Fri, 26 Feb 2021 00:08:50 -0800 (PST) Received: from localhost ([::1]:33236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYB5-0003ht-U7 for importer@patchew.org; Fri, 26 Feb 2021 03:08:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY7y-0001j3-AO for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:35 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:41618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY7v-00042l-6w for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:34 -0500 Received: by mail-wr1-x42d.google.com with SMTP id f12so3867921wrx.8 for ; Fri, 26 Feb 2021 00:05:29 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LM0ymEIO4brC99ZcR5LN3FimbR1Szcx2N+OesKrDNJk=; b=p84LHiWxmsg3tT8wdnrBhXCWjyZbF94l8havhoWrrj7I2ECMMopsm8WOvViTt4h+u8 10EdQE4LihnNLryQ8ikyvX6vhKHQgQiFTL3bgLqSmRupktFePu5bdGEE/VNJyqK4Ba6O 2mb2G3gBJntfWuhMbtE7K9yMQAHH4bql3BKAovLNWiynxWQcaeUEEe4WU+lmYYEuClJu 3t8ryZQggwUAdgwo+ExN8TUrhZhEm0186H/jc06+lAkAJlIR6EaObrEScw5q2ns3kjvg GToArweie4UzT9bbA9lQMqnLaZPpI/8Wa072cIALEPD3QUyWwyclnMO/6GjElUDugJsk KNvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LM0ymEIO4brC99ZcR5LN3FimbR1Szcx2N+OesKrDNJk=; b=WCuvwX4c7PweByjH1SHMCzPdZ4okHrfcS3BWTvvQIOLn8Un3y/+rJcXnGqKZhZZtEO tB6+i7Zzwkg3quKnZJ5Rwgj97KCZ0SwuPOonPLaCECU2NSjUcFlGoNozSuaeEE04AwVF 2YSDJE8zO0wib8JTJx8+xK9Qvt3hiJg8Gyo7DGqgGKMCFG66vn7pXRcz4/FNPYS/x8Sh fTsWUCvUxVB/90zFF1Zx7qpIieEp3i5lukpoh6NV/jAmye/D3Mi7NW8DuuYF/p6MY/1n UNxRfCY3AncVO9/PFxU4r00Vr0QRgDeBzbA6kIYHd1mqlsBzAfnArixJtyU8qPe8iBKv gX3A== X-Gm-Message-State: AOAM533A6/0xVcrF3hmHgPHnzCvggMt4qh7Kmv+Q2+Ss7jI2zm91LN/m bQRi+alIXAW7zzbVUVc5khe1sJczoi0= X-Google-Smtp-Source: ABdhPJygRcpCTXHRBFDR48RfCfPs2rW2nbOxvGSgArtsuJ7b0SViHe2UCETTRcA3HutMCcNAjzNKJQ== X-Received: by 2002:adf:fbce:: with SMTP id d14mr1779207wrs.44.1614326728538; Fri, 26 Feb 2021 00:05:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/29] hvf: Sign the code after installation Date: Fri, 26 Feb 2021 09:04:58 +0100 Message-Id: <20210226080526.651705-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Akihiko Odaki Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki Before this change, the code signed during the build was installed directly. However, the signature gets invalidated because meson modifies the code to fix dynamic library install names during the install process. It also prevents meson to strip the code because the pre-signed file is not marked as an executable (although it is somehow able to perform the modification described above). With this change, the unsigned code will be installed and modified by meson first, and a script signs it later. Signed-off-by: Akihiko Odaki Message-Id: <20210225000614.46919-1-akihiko.odaki@gmail.com> Signed-off-by: Paolo Bonzini --- meson.build | 9 ++++++--- scripts/entitlement.sh | 19 +++++++++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 05a67c20d9..c79cb20993 100644 --- a/meson.build +++ b/meson.build @@ -2224,7 +2224,7 @@ foreach target : target_dirs endif =20 emulator =3D executable(exe_name, exe['sources'], - install: not exe_sign, + install: true, c_args: c_args, dependencies: arch_deps + deps + exe['dependencies'], objects: lib.extract_all_objects(recursive: true), @@ -2235,8 +2235,6 @@ foreach target : target_dirs =20 if exe_sign emulators +=3D {exe['name'] : custom_target(exe['name'], - install: true, - install_dir: get_option('bindir'), depends: emulator, output: exe['name'], command: [ @@ -2246,6 +2244,11 @@ foreach target : target_dirs meson.current_source_dir() / 'accel/hvf/entitlements.= plist' ]) } + + meson.add_install_script('scripts/entitlement.sh', '--install', + get_option('bindir') / exe_name, + get_option('bindir') / exe['name'], + meson.current_source_dir() / 'accel/hvf/ent= itlements.plist') else emulators +=3D {exe['name']: emulator} endif diff --git a/scripts/entitlement.sh b/scripts/entitlement.sh index c540fa6435..0f61d15376 100755 --- a/scripts/entitlement.sh +++ b/scripts/entitlement.sh @@ -2,12 +2,23 @@ # # Helper script for the build process to apply entitlements =20 +copy=3D: +if [ "$1" =3D --install ]; then + shift + copy=3Dfalse + cd "$MESON_INSTALL_DESTDIR_PREFIX" +fi + SRC=3D"$1" DST=3D"$2" ENTITLEMENT=3D"$3" =20 -trap 'rm "$DST.tmp"' exit -cp -af "$SRC" "$DST.tmp" -codesign --entitlements "$ENTITLEMENT" --force -s - "$DST.tmp" -mv "$DST.tmp" "$DST" +if $copy; then + trap 'rm "$DST.tmp"' exit + cp -af "$SRC" "$DST.tmp" + SRC=3D"$DST.tmp" +fi + +codesign --entitlements "$ENTITLEMENT" --force -s - "$SRC" +mv -f "$SRC" "$DST" trap '' exit --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614326931; cv=none; d=zohomail.com; s=zohoarc; b=hdqBnuBrtUlhf1sobb1HIvmXK+TVNcS4T+7fKjFzaDDzubXKMSBIYqjqSNAWEf403qYFPpFlDFF+vAusGv2zrzmoNQMPp+iQeAjspHEDI0gMYV3FoIMeVolIfvXjRqYhGK73Bey2PaNn6b9da967jOOx+l0h322Mof4cox6JNTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614326931; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yXIWvdB/EerYRecTTmg1n1mknTNJJTJWRa3KyltqPKU=; b=UKapWglmqUNkXhKqvIarYobDV6ok9Z96AgxIjKSoQ7iaTMJQM7vFEPg8XFp6OQM52hEEm9U3LF7LNExFVtAoHw2e4tlIToClD0ijO1MYzADW+ueZ7h8wG/36BCbBMhoFI25rABPy2pRb9Dt5iui++VA64rMXVz6Cj04g/ITc5MM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614326931522618.6870913216545; Fri, 26 Feb 2021 00:08:51 -0800 (PST) Received: from localhost ([::1]:33350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYB8-0003l1-60 for importer@patchew.org; Fri, 26 Feb 2021 03:08:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY7x-0001ia-4l for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:33 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:35836) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY7v-00042s-7q for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:32 -0500 Received: by mail-wm1-x332.google.com with SMTP id o16so6955218wmh.0 for ; Fri, 26 Feb 2021 00:05:30 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yXIWvdB/EerYRecTTmg1n1mknTNJJTJWRa3KyltqPKU=; b=Qmi+NZjWS8ZZ+NLakI5UbC+nGTeVkQ2moF7KPSTytSwsS7/uXMs5fcg8X4E6Uh/KTb nz+2br67AOi/DgA8NAuABXVYT/+UklYA4Z027U52R1uv+mwcflWq/TpI1GUq+RWuE7A6 AtkfY8AN6Rrvf3N7uBYLpGQh7I17ubXGGOTWgkD37lT7JlzFnKLnrMn/RtQCRjPo00Sb CEHRPkH4e9OJ6eCGExdWfTYvfHenq5IhTA2qg62EwOMhuJ6PiQ5A6vcF2br3IvqrCIEW 9qkR+ve7Oev0Vn2Fna6UJdS4zHhl9CvQ+TdF9C4iAu++49deCbCj0euMHSmFcQV6nR4n 5ytQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=yXIWvdB/EerYRecTTmg1n1mknTNJJTJWRa3KyltqPKU=; b=LDKABeT82RnEB+IqwHI45XB9+DLbKRbKlis5ZeqWrQgiGxP4lOGUpewvvpbNQ+/FR8 A6bD16mpZ/WFQOrr4RRzoOhNSnjw9lANzeeZiULMJPWI5N2Ep2F4qGukwAZY1fu7xv8V yyM66E0VjfDxe71bad36OkpPxGugSJbpjKeQ2E6XlqIZgRyuiK6aiIH9Zh6KRrjlSnNd YCXecD+c8xSK0ktLgzcPQiGb9YCbiHgV4H3nPqJVw4siqn39OdOsS2QCxNPTy8fBRGou cOy9HEY1I1DubLMaVZtV3xbNtGWiAjR5ok73V4GGVUMriMSqZRJI7xiA4jWbVKunr0hr ygaw== X-Gm-Message-State: AOAM533Hq2LQNwif/mttmvfxYcxFHxNITs2QoGDHcKd5OuVHV8utJOri +NhCIOSjACzjxHaEUR0gaZ+hiEcuWd8= X-Google-Smtp-Source: ABdhPJw8cIKjCSZ4BafE+4vnmU/Osfg9nhJIyF9PkOXQTfCL81iideiRsYSk4ogGWEKMVPlgjTJbTQ== X-Received: by 2002:a7b:c5c7:: with SMTP id n7mr1534632wmk.63.1614326729156; Fri, 26 Feb 2021 00:05:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/29] configure: fix --enable-fuzzing linker failures Date: Fri, 26 Feb 2021 09:04:59 +0100 Message-Id: <20210226080526.651705-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Bulekov , Li Qiang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Alexander Bulekov With --enable-fuzzing, QEMU_CFLAGS include -fsanitize=3Dfuzzer-no-link. This should allow us to build non-fuzzer binaries using objects instrumented for fuzzing. However, to do that, we also need to link with -fsanitize=3Dfuzzer-no-link. We were not doing that. Reported-by: Li Qiang , Signed-off-by: Alexander Bulekov Message-Id: <20210221174510.22542-1-alxndr@bu.edu> Signed-off-by: Paolo Bonzini --- configure | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configure b/configure index a79b3746d4..19f2b88589 100755 --- a/configure +++ b/configure @@ -6096,7 +6096,17 @@ if test "$fuzzing" =3D "yes" ; then # If LIB_FUZZING_ENGINE is set, assume we are running on OSS-Fuzz, and t= he # needed CFLAGS have already been provided if test -z "${LIB_FUZZING_ENGINE+xxx}" ; then + # Add CFLAGS to tell clang to add fuzzer-related instrumentation to al= l the + # compiled code. QEMU_CFLAGS=3D"$QEMU_CFLAGS -fsanitize=3Dfuzzer-no-link" + # To build non-fuzzer binaries with --enable-fuzzing, link everything = with + # fsanitize=3Dfuzzer-no-link. Otherwise, the linker will be unable to = bind + # the fuzzer-related callbacks added by instrumentation. + QEMU_LDFLAGS=3D"$QEMU_LDFLAGS -fsanitize=3Dfuzzer-no-link" + # For the actual fuzzer binaries, we need to link against the libfuzzer + # library. Provide the flags for doing this in FUZZ_EXE_LDFLAGS. The m= eson + # rule for the fuzzer adds these to the link_args. They need to be + # configurable, to support OSS-Fuzz FUZZ_EXE_LDFLAGS=3D"-fsanitize=3Dfuzzer" else FUZZ_EXE_LDFLAGS=3D"$LIB_FUZZING_ENGINE" --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327144; cv=none; d=zohomail.com; s=zohoarc; b=UMpENZvkKutWTX2NRW82uu5pgMdUoZfrspqM/XgShCC7jWY0Jgs5n+1w+7c3ypgR3W3DBRR+pDwmSpxznX5nO2zQTC0QxhUfPXG9a2wndIzjq7gCoh89qE5AlGoqQwMqUyYt+p43hXPTxG0qLvge+Fd40WYuJ+uHktfevBgcWLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327144; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Zf6sj2dDUp/4RFddGmN+eDdQt1nkcibDS28wiVKpr60=; b=lskvo6fE4pFkrZ+eoJo6tYoTnKEK6B/CH1cO+ZIUqfudLxJUmkuwX5UDgzdFK0aVCMID9HrlOJQiPmeUzCIZnRzRyTpcwqH3uwsmoYQPRGbike3ngXaJFwin9YEU+b9oDJmbwhb5yME2W2xWVz0Kpx8A3gsARPTpBRsc2sDqqSE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327144905454.46399352689855; Fri, 26 Feb 2021 00:12:24 -0800 (PST) Received: from localhost ([::1]:42058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYEU-0007VQ-P2 for importer@patchew.org; Fri, 26 Feb 2021 03:12:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY7y-0001j7-Ng for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:35 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:33703) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY7v-00043O-Lo for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:34 -0500 Received: by mail-wr1-x42e.google.com with SMTP id 7so7679308wrz.0 for ; Fri, 26 Feb 2021 00:05:30 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zf6sj2dDUp/4RFddGmN+eDdQt1nkcibDS28wiVKpr60=; b=ngcKks9oldaZKqxw82Jy8UQJwGR58tgut4jYvoXmG07kgVp61yTSEoZrBwNU1N4QJ+ 1EXJwtH9qd4YS0/J/jj+T/GHRpNxmH0WR9s/ecPZULKSYxZh0sXQwBDKlRNjnIUKDLRZ M98K2eJQpNiSUgbcVSTLadXUrw7ayh37vn3BVKHu5I/23kfKbLD0qgutnEBVs2kMeh5s OVVINlUnOcJ8Kh2CFsv66EUHAJ5MHNCacRe7mkHFeXJsABy9DAmdDpJNSBBenwGiVGQR mnFt2WU2iKPyAVHjtaGViiCgznAgSV5CCRdcjYAWmdZ5/WAm4zaEpVH9faun7dDyb/4I 57xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Zf6sj2dDUp/4RFddGmN+eDdQt1nkcibDS28wiVKpr60=; b=UFz2H56LeUgNDEu6ZJbkvG+J2sRVQH7CY8lb+S7/F04/xq+28eqJDHvLobbOaEOiFQ FSxa/u/LttnMSBItH5mfXHSFVGJ2RcPVJGtob2rE4jLJ1MJnABbW4o3QmzMmfhq+clDG H044WV/xfJ2R2JDUwqkgRkkGj1nOE3jf2MJ39nTqZYeJ7gdrEIL//tIC5F0SsDDmz6EU q0c20xDJF3FO2sB6vTrkM+B2kM4OGh5Ao7cYedGcK/keKZipHPb8VdP3q9K+Juif0jjZ qLF1RiITLvPC7yiJFdEHOSzEVof8KPrXxkg467jYIVgVn+5fvjGkNJIg0rY0aSFhGH3P q6qQ== X-Gm-Message-State: AOAM532WVBRJfa++fNpEB906DxodYgA0HbnAAa3UClhoSVj4MzJLHFyr 4MtzUqXwh/oCtO36Tqb6eaYeXi9MMvU= X-Google-Smtp-Source: ABdhPJygowwDNW1sDhuiFXZ3xD1f3Vx+Mv4wgtQLC4xmbws+kdDnmTlMj2Hbqla/dSE/jHoqUHrCiA== X-Received: by 2002:a5d:452e:: with SMTP id j14mr1983087wra.244.1614326729880; Fri, 26 Feb 2021 00:05:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/29] multiprocess: move feature to meson_options.txt Date: Fri, 26 Feb 2021 09:05:00 +0100 Message-Id: <20210226080526.651705-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" While at it, improve the description of the feature in the summary and help message. Signed-off-by: Paolo Bonzini --- configure | 14 +++++--------- meson.build | 9 +++++++-- meson_options.txt | 2 ++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 19f2b88589..cc435e2503 100755 --- a/configure +++ b/configure @@ -463,7 +463,7 @@ skip_meson=3Dno gettext=3D"auto" fuse=3D"auto" fuse_lseek=3D"auto" -multiprocess=3D"no" +multiprocess=3D"auto" =20 malloc_trim=3D"auto" =20 @@ -798,7 +798,6 @@ Linux) linux=3D"yes" linux_user=3D"yes" vhost_user=3D${default_feature:-yes} - multiprocess=3D${default_feature:-yes} ;; esac =20 @@ -1558,9 +1557,9 @@ for opt do ;; --disable-fuse-lseek) fuse_lseek=3D"disabled" ;; - --enable-multiprocess) multiprocess=3D"yes" + --enable-multiprocess) multiprocess=3D"enabled" ;; - --disable-multiprocess) multiprocess=3D"no" + --disable-multiprocess) multiprocess=3D"disabled" ;; *) echo "ERROR: unknown option $opt" @@ -1914,7 +1913,7 @@ disabled with --disable-FEATURE, default is enabled i= f available libdaxctl libdaxctl support fuse FUSE block device export fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports - multiprocess Multiprocess QEMU support + multiprocess Out of process device emulation support =20 NOTE: The object files are built at the place where configure is launched EOF @@ -6089,9 +6088,6 @@ fi if test "$have_mlockall" =3D "yes" ; then echo "HAVE_MLOCKALL=3Dy" >> $config_host_mak fi -if test "$multiprocess" =3D "yes" ; then - echo "CONFIG_MULTIPROCESS_ALLOWED=3Dy" >> $config_host_mak -fi if test "$fuzzing" =3D "yes" ; then # If LIB_FUZZING_ENGINE is set, assume we are running on OSS-Fuzz, and t= he # needed CFLAGS have already been provided @@ -6434,7 +6430,7 @@ NINJA=3D$ninja $meson setup \ -Dzstd=3D$zstd -Dseccomp=3D$seccomp -Dvirtfs=3D$virtfs -Dcap_ng=3D= $cap_ng \ -Dattr=3D$attr -Ddefault_devices=3D$default_devices \ -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build -Dinstall_blobs=3D$b= lobs \ - -Dvhost_user_blk_server=3D$vhost_user_blk_server \ + -Dvhost_user_blk_server=3D$vhost_user_blk_server -Dmultiprocess=3D= $multiprocess \ -Dfuse=3D$fuse -Dfuse_lseek=3D$fuse_lseek -Dguest_agent_msi=3D$gue= st_agent_msi \ $(if test "$default_features" =3D no; then echo "-Dauto_features= =3Ddisabled"; fi) \ -Dtcg_interpreter=3D$tcg_interpreter \ diff --git a/meson.build b/meson.build index c79cb20993..d38620d3be 100644 --- a/meson.build +++ b/meson.build @@ -157,6 +157,11 @@ if targetos !=3D 'linux' and get_option('mpath').enabl= ed() error('Multipath is supported only on Linux') endif =20 +if targetos !=3D 'linux' and get_option('multiprocess').enabled() + error('Multiprocess QEMU is supported only on Linux') +endif +multiprocess_allowed =3D targetos =3D=3D 'linux' and not get_option('multi= process').disabled() + m =3D cc.find_library('m', required: false) util =3D cc.find_library('util', required: false) winmm =3D [] @@ -1228,7 +1233,7 @@ host_kconfig =3D \ (have_virtfs ? ['CONFIG_VIRTFS=3Dy'] : []) + \ ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=3Dy'] : []) + \ ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=3Dy'] : []) + \ - ('CONFIG_MULTIPROCESS_ALLOWED' in config_host ? ['CONFIG_MULTIPROCESS_AL= LOWED=3Dy'] : []) + (multiprocess_allowed ? ['CONFIG_MULTIPROCESS_ALLOWED=3Dy'] : []) =20 ignored =3D [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] =20 @@ -2538,6 +2543,7 @@ endif summary_info +=3D {'target list': ' '.join(target_dirs)} if have_system summary_info +=3D {'default devices': get_option('default_devices')} + summary_info +=3D {'out of process emulation': multiprocess_allowed} endif summary(summary_info, bool_yn: true, section: 'Targets and accelerators') =20 @@ -2658,7 +2664,6 @@ summary_info +=3D {'libpmem support': config_host.h= as_key('CONFIG_LIBPMEM')} summary_info +=3D {'libdaxctl support': config_host.has_key('CONFIG_LIBDAX= CTL')} summary_info +=3D {'libudev': libudev.found()} summary_info +=3D {'FUSE lseek': fuse_lseek.found()} -summary_info +=3D {'Multiprocess QEMU': config_host.has_key('CONFIG_MULTIP= ROCESS_ALLOWED')} summary(summary_info, bool_yn: true, section: 'Dependencies') =20 if not supported_cpus.contains(cpu) diff --git a/meson_options.txt b/meson_options.txt index 675a9c500a..9734019995 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -45,6 +45,8 @@ option('cfi', type: 'boolean', value: 'false', description: 'Control-Flow Integrity (CFI)') option('cfi_debug', type: 'boolean', value: 'false', description: 'Verbose errors in case of CFI violation') +option('multiprocess', type: 'feature', value: 'auto', + description: 'Out of process device emulation support') =20 option('attr', type : 'feature', value : 'auto', description: 'attr/xattr support') --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327182; cv=none; d=zohomail.com; s=zohoarc; b=d+r7lmKHEq78DiBkgRhjcSy38i8x9bUOQ3BCFpoqk7Efjt2mqnSOHQRbdY4fnVNT5bvlxvRg3R7IyGl1Yd2AN5Hqn7aEE17lJHy7vHPA8Xnw6NX6bGGUqlaLJTHeZSMjW3SvNLiekeqnKwHnFcNF7N6vW9ukARCwCrHXJLW5gMQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327182; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BMASOml+kxNutO8/WiL39JF9IgvMS60IQP441O4IM/U=; b=iW+7UOTJqySN/OqbF7BWc1UI4aNZiXFmB6/v9u8dZHlY55WGrKao7b+5P06GC96ge2u6mDGqZIJsUBN6e7ai2YHdolNrOC/kLthLCyeeNeR0Rq1plp/T7TzLIPcrMgWqJ3GfZ3iZCwejWfpoLPF3RrETq6b4fmib0Rpc286APM0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327182401541.5062665530093; Fri, 26 Feb 2021 00:13:02 -0800 (PST) Received: from localhost ([::1]:45028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYFB-0000Hh-Bt for importer@patchew.org; Fri, 26 Feb 2021 03:13:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY7y-0001j8-Ps for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:35 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:43394) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY7v-00043m-O3 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:34 -0500 Received: by mail-wr1-x42c.google.com with SMTP id w11so7649063wrr.10 for ; Fri, 26 Feb 2021 00:05:31 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BMASOml+kxNutO8/WiL39JF9IgvMS60IQP441O4IM/U=; b=iPIz0Wu4j1NMyX0yLSOJ8JLL0aY94pIho5rBq5m3xp6Ljxy4twWvxed4c6eual1KAe p5nmyN6fFapggvrUn5y6kS5t9+WuRs7Bn/GRwzVD+JRCwyDGpcqHPnDlPABSK/DKtU8a CjNOSDBSgTIX7sQAVexS+isOJgm0kd+RyddCCcEkZAT5R0ZGzjhBODzaOa2+g3qrUuOS BZ2gNsks3j5v8ad+V9FBo+Q0aqrKnf9NFtaXLUe7pQ41s3k7147aftIBZkawXNH4LaM6 AwVgxmMQMlNHonuM2CGQxBq7/zWPTdwsswpaYDdK7mi3s9IDrOUF0IzIAS412i1On8/C luRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BMASOml+kxNutO8/WiL39JF9IgvMS60IQP441O4IM/U=; b=iqWGQ10hlfOU6TVQLiGgqtOMhvKxVc9MTrIchxVaNZyxxIA5sPhFGvnUUzhiZp8FBN 0xwWujHt59q3CGHDHx2DXq/SqACV53/iifeZNCzXjP6Q82aiolSYg+oe0u5qIa5PclqN NSCoh+nfTNOUEzLsqGFVUwZ+bv4KT0MMo4mSzix3Zy8hAAH5mKXieK5HNZQ8MGtjfvkN LnpxgKPj9feWasL6GS4FEycFr0Bn1aVK0jMZ9U145HQ1G6+cAHTLHWznxZclrbOYfoFm 6F9F5NUif5QEaLe4aWIBHcpviOjNmNKU5552LSFmcSgW6LHT/MKb95e9ShRrF5UqYe4V rHcQ== X-Gm-Message-State: AOAM531r22jj38X7U2rgfS0uRoZylb5p2JqA7G4z8VaKZWb4VP7etYHC z6WyOdHf6B+sfcoGyR1fy9mmg/yYx/E= X-Google-Smtp-Source: ABdhPJyeIg9h+N5rf9wdGQ6OanMhsGko8OtPfQYMv27cvccXWmZYDBP8bicyip/etc9Ucs9aNPb0nQ== X-Received: by 2002:a5d:4ac4:: with SMTP id y4mr1844685wrs.86.1614326730498; Fri, 26 Feb 2021 00:05:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/29] scsi: make io_timeout configurable Date: Fri, 26 Feb 2021 09:05:01 +0100 Message-Id: <20210226080526.651705-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hannes Reinecke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Hannes Reinecke The current code sets an infinite timeout on SG_IO requests, causing the guest to stall if the host experiences a frame loss. This patch adds an 'io_timeout' parameter for SCSIDevice to make the SG_IO timeout configurable, and also shortens the default timeout to 30 seconds to avoid infinite stalls. Signed-off-by: Hannes Reinecke Message-Id: <20201116183114.55703-3-hare@suse.de> Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 6 ++++-- hw/scsi/scsi-generic.c | 17 +++++++++++------ include/hw/scsi/scsi.h | 4 +++- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index ed52fcd49f..c4016d1cfc 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2624,7 +2624,7 @@ static int get_device_type(SCSIDiskState *s) cmd[4] =3D sizeof(buf); =20 ret =3D scsi_SG_IO_FROM_DEV(s->qdev.conf.blk, cmd, sizeof(cmd), - buf, sizeof(buf)); + buf, sizeof(buf), s->qdev.io_timeout); if (ret < 0) { return -1; } @@ -2785,7 +2785,7 @@ static BlockAIOCB *scsi_block_do_sgio(SCSIBlockReq *r= eq, /* The rest is as in scsi-generic.c. */ io_header->mx_sb_len =3D sizeof(r->req.sense); io_header->sbp =3D r->req.sense; - io_header->timeout =3D UINT_MAX; + io_header->timeout =3D s->qdev.io_timeout * 1000; io_header->usr_ptr =3D r; io_header->flags |=3D SG_FLAG_DIRECT_IO; =20 @@ -3103,6 +3103,8 @@ static Property scsi_block_properties[] =3D { DEFAULT_MAX_IO_SIZE), DEFINE_PROP_INT32("scsi_version", SCSIDiskState, qdev.default_scsi_ver= sion, -1), + DEFINE_PROP_UINT32("io_timeout", SCSIDiskState, qdev.io_timeout, + DEFAULT_IO_TIMEOUT), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index ab220141f5..3dd3ccd097 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -115,6 +115,8 @@ static int execute_command(BlockBackend *blk, SCSIGenericReq *r, int direction, BlockCompletionFunc *complete) { + SCSIDevice *s =3D r->req.dev; + r->io_header.interface_id =3D 'S'; r->io_header.dxfer_direction =3D direction; r->io_header.dxferp =3D r->buf; @@ -123,7 +125,7 @@ static int execute_command(BlockBackend *blk, r->io_header.cmd_len =3D r->req.cmd.len; r->io_header.mx_sb_len =3D sizeof(r->req.sense); r->io_header.sbp =3D r->req.sense; - r->io_header.timeout =3D MAX_UINT; + r->io_header.timeout =3D s->io_timeout * 1000; r->io_header.usr_ptr =3D r; r->io_header.flags |=3D SG_FLAG_DIRECT_IO; =20 @@ -506,7 +508,7 @@ static int read_naa_id(const uint8_t *p, uint64_t *p_ww= n) } =20 int scsi_SG_IO_FROM_DEV(BlockBackend *blk, uint8_t *cmd, uint8_t cmd_size, - uint8_t *buf, uint8_t buf_size) + uint8_t *buf, uint8_t buf_size, uint32_t timeout) { sg_io_hdr_t io_header; uint8_t sensebuf[8]; @@ -521,7 +523,7 @@ int scsi_SG_IO_FROM_DEV(BlockBackend *blk, uint8_t *cmd= , uint8_t cmd_size, io_header.cmd_len =3D cmd_size; io_header.mx_sb_len =3D sizeof(sensebuf); io_header.sbp =3D sensebuf; - io_header.timeout =3D 6000; /* XXX */ + io_header.timeout =3D timeout * 1000; =20 ret =3D blk_ioctl(blk, SG_IO, &io_header); if (ret < 0 || io_header.driver_status || io_header.host_status) { @@ -551,7 +553,7 @@ static void scsi_generic_set_vpd_bl_emulation(SCSIDevic= e *s) cmd[4] =3D sizeof(buf); =20 ret =3D scsi_SG_IO_FROM_DEV(s->conf.blk, cmd, sizeof(cmd), - buf, sizeof(buf)); + buf, sizeof(buf), s->io_timeout); if (ret < 0) { /* * Do not assume anything if we can't retrieve the @@ -587,7 +589,7 @@ static void scsi_generic_read_device_identification(SCS= IDevice *s) cmd[4] =3D sizeof(buf); =20 ret =3D scsi_SG_IO_FROM_DEV(s->conf.blk, cmd, sizeof(cmd), - buf, sizeof(buf)); + buf, sizeof(buf), s->io_timeout); if (ret < 0) { return; } @@ -638,7 +640,7 @@ static int get_stream_blocksize(BlockBackend *blk) cmd[0] =3D MODE_SENSE; cmd[4] =3D sizeof(buf); =20 - ret =3D scsi_SG_IO_FROM_DEV(blk, cmd, sizeof(cmd), buf, sizeof(buf)); + ret =3D scsi_SG_IO_FROM_DEV(blk, cmd, sizeof(cmd), buf, sizeof(buf), 6= ); if (ret < 0) { return -1; } @@ -728,6 +730,7 @@ static void scsi_generic_realize(SCSIDevice *s, Error *= *errp) =20 /* Only used by scsi-block, but initialize it nevertheless to be clean= . */ s->default_scsi_version =3D -1; + s->io_timeout =3D DEFAULT_IO_TIMEOUT; scsi_generic_read_device_inquiry(s); } =20 @@ -751,6 +754,8 @@ static SCSIRequest *scsi_new_request(SCSIDevice *d, uin= t32_t tag, uint32_t lun, static Property scsi_generic_properties[] =3D { DEFINE_PROP_DRIVE("drive", SCSIDevice, conf.blk), DEFINE_PROP_BOOL("share-rw", SCSIDevice, conf.share_rw, false), + DEFINE_PROP_UINT32("io_timeout", SCSIDevice, io_timeout, + DEFAULT_IO_TIMEOUT), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 09fa5c9d2a..a8ef59c0f4 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -18,6 +18,7 @@ typedef struct SCSIReqOps SCSIReqOps; =20 #define SCSI_SENSE_BUF_SIZE_OLD 96 #define SCSI_SENSE_BUF_SIZE 252 +#define DEFAULT_IO_TIMEOUT 30 =20 struct SCSIRequest { SCSIBus *bus; @@ -84,6 +85,7 @@ struct SCSIDevice uint64_t port_wwn; int scsi_version; int default_scsi_version; + uint32_t io_timeout; bool needs_vpd_bl_emulation; bool hba_supports_iothread; }; @@ -188,7 +190,7 @@ void scsi_device_unit_attention_reported(SCSIDevice *de= v); void scsi_generic_read_device_inquiry(SCSIDevice *dev); int scsi_device_get_sense(SCSIDevice *dev, uint8_t *buf, int len, bool fix= ed); int scsi_SG_IO_FROM_DEV(BlockBackend *blk, uint8_t *cmd, uint8_t cmd_size, - uint8_t *buf, uint8_t buf_size); + uint8_t *buf, uint8_t buf_size, uint32_t timeout); SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int target, int lu= n); SCSIDevice *scsi_device_get(SCSIBus *bus, int channel, int target, int lun= ); =20 --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327666; cv=none; d=zohomail.com; s=zohoarc; b=lPmExmRxqE5y9SWLMVO3ZQsDG4y/VguNi0AEdCXzgp8WYN8UtN8Wdk+TzH92BjLyonMfPdr9a0Cm6Qfyg8rrjK4HbVA6D7X7LAtFKVl2GBXPQrC+ziaHCFlKaSTa7xmDZF9HyYfyLldxqomXlMVXKNSy1yaVLytpJR4S3xXB3Z4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327666; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+ZErRFnPH+j+hn2Ng7+u1Gir1Cs5JNk/Mv6ocOR4JYs=; b=PRahH87pr1ttE96vZvCcjwY3U58fbO176vj/Ih9TZ+yC4HyiPELZhglVsVOE2s/O0OrJhF8wp3tRHyIO8J6OkJ/oPp4HXvD95Fbxk09JOAAsHZOJZv29ohLYG/ixfBvcvxuOIWCGRHpRv+iXvitYPyYvwOr01czRVzDjfECQOF4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327666357608.2735809903302; Fri, 26 Feb 2021 00:21:06 -0800 (PST) Received: from localhost ([::1]:37136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYMw-0000R3-Go for importer@patchew.org; Fri, 26 Feb 2021 03:21:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY80-0001jr-Dq for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:37 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:36137) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY7w-00043w-9o for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:35 -0500 Received: by mail-wm1-x32a.google.com with SMTP id k66so6964392wmf.1 for ; Fri, 26 Feb 2021 00:05:31 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+ZErRFnPH+j+hn2Ng7+u1Gir1Cs5JNk/Mv6ocOR4JYs=; b=Pvg+l3gcdHJ4KfLNCv7lNVMde+IRn4u430ZT99YYNQhY5H6rb5PoPdDhFrBruLRo8d nCyyoH2lF5iY2Tad+I3ypwiBSijf6d6Cul0/EW+Uk+msB5VJwhE3d0Ry1izAed5GFVXo Xwpg3/YKwCQVtP6Ve6gEG7+7tPCCOxYrlygyPylyNeM9uyWbZoPRV0XqJwgdH3yXXJLp gihB1QhPVa89CPspsUoXGh19T0e9QE9VWD7SDTirXfyWomFJgY5qIH/tQG+Td8IPfV0C 7OCl0qYFsTbw103RuQs/ob41lD8fsVxvj6Fqe+3scpfuroke6AB4T46TB/IdNw6/3Gpo bleA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+ZErRFnPH+j+hn2Ng7+u1Gir1Cs5JNk/Mv6ocOR4JYs=; b=khxphEoxQPYQ+BruZt/8kM+lZURwLJfpcRuYN3lu8grVFPBbJoiWVJ1fEOQCZeZ5zt HNEKJVOUyljItJ7fqCeCzl1j+ddY3V84iTQTtraADagh2jyGtbhmbsbv4K3pEz0nGavc ytvsEo2OguDrbyRARjcosfHtektFdnxuX66g4t+qvdIsqIr4i+S4Im0UStdKqvP9/RF4 ukkFPwZA5ZdWdC1xzfy69pfZks/jisRvCcCloDSGsfVwXd4r7M8/RnlH/wcv66r19Xr0 btIV72zSM5wGjWZ4iPuzOVmr5F0ClZoL8RltVMqxpH6WQgxMNXJ4oRA+OQ4awOXyUNYy 2m4Q== X-Gm-Message-State: AOAM533jtLLb8HqH+a/83byHFr/lmotBrcmoj9CVT3/cpjHXcyI9R9cz LCEVSr8I4YeZmKBrsw1HtvzcoFSGHnU= X-Google-Smtp-Source: ABdhPJzgALtm32YmunbsJfriz2pC4RX+/ADXibgYWsDzpwTlYS+zID/AXEBU8UQVChcMMS/Mymo1Xw== X-Received: by 2002:a1c:f20f:: with SMTP id s15mr1504642wmc.35.1614326731101; Fri, 26 Feb 2021 00:05:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/29] scsi: add tracing for SG_IO commands Date: Fri, 26 Feb 2021 09:05:02 +0100 Message-Id: <20210226080526.651705-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hannes Reinecke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Hannes Reinecke Add tracepoints for SG_IO commands to allow for debugging of SG_IO commands. Signed-off-by: Hannes Reinecke Message-Id: <20201116183114.55703-4-hare@suse.de> Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 3 ++- hw/scsi/scsi-generic.c | 8 +++++++- hw/scsi/trace-events | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index c4016d1cfc..a2716b26b4 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2788,7 +2788,8 @@ static BlockAIOCB *scsi_block_do_sgio(SCSIBlockReq *r= eq, io_header->timeout =3D s->qdev.io_timeout * 1000; io_header->usr_ptr =3D r; io_header->flags |=3D SG_FLAG_DIRECT_IO; - + trace_scsi_disk_aio_sgio_command(r->req.tag, req->cdb[0], lba, + nb_logical_blocks, io_header->timeout= ); aiocb =3D blk_aio_ioctl(s->qdev.conf.blk, SG_IO, io_header, cb, opaque= ); assert(aiocb !=3D NULL); return aiocb; diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 3dd3ccd097..176a72951c 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -129,6 +129,8 @@ static int execute_command(BlockBackend *blk, r->io_header.usr_ptr =3D r; r->io_header.flags |=3D SG_FLAG_DIRECT_IO; =20 + trace_scsi_generic_aio_sgio_command(r->req.tag, r->req.cmd.buf[0], + r->io_header.timeout); r->req.aiocb =3D blk_aio_ioctl(blk, SG_IO, &r->io_header, complete, r); if (r->req.aiocb =3D=3D NULL) { return -EIO; @@ -525,8 +527,12 @@ int scsi_SG_IO_FROM_DEV(BlockBackend *blk, uint8_t *cm= d, uint8_t cmd_size, io_header.sbp =3D sensebuf; io_header.timeout =3D timeout * 1000; =20 + trace_scsi_generic_ioctl_sgio_command(cmd[0], io_header.timeout); ret =3D blk_ioctl(blk, SG_IO, &io_header); - if (ret < 0 || io_header.driver_status || io_header.host_status) { + if (ret < 0 || io_header.status || + io_header.driver_status || io_header.host_status) { + trace_scsi_generic_ioctl_sgio_done(cmd[0], ret, io_header.status, + io_header.host_status); return -1; } return 0; diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events index 0e0aa9847d..9788661bfd 100644 --- a/hw/scsi/trace-events +++ b/hw/scsi/trace-events @@ -331,6 +331,7 @@ scsi_disk_emulate_command_UNKNOWN(int cmd, const char *= name) "Unknown SCSI comma scsi_disk_dma_command_READ(uint64_t lba, uint32_t len) "Read (sector %" PR= Id64 ", count %u)" scsi_disk_dma_command_WRITE(const char *cmd, uint64_t lba, int len) "Write= %s(sector %" PRId64 ", count %u)" scsi_disk_new_request(uint32_t lun, uint32_t tag, const char *line) "Comma= nd: lun=3D%d tag=3D0x%x data=3D%s" +scsi_disk_aio_sgio_command(uint32_t tag, uint8_t cmd, uint64_t lba, int le= n, uint32_t timeout) "disk aio sgio: tag=3D0x%x cmd=3D0x%x (sector %" PRId6= 4 ", count %d) timeout=3D%u" =20 # scsi-generic.c scsi_generic_command_complete_noio(void *req, uint32_t tag, int statuc) "C= ommand complete %p tag=3D0x%x status=3D%d" @@ -342,3 +343,6 @@ scsi_generic_write_data(uint32_t tag) "scsi_write_data = tag=3D0x%x" scsi_generic_send_command(const char *line) "Command: data=3D%s" scsi_generic_realize_type(int type) "device type %d" scsi_generic_realize_blocksize(int blocksize) "block size %d" +scsi_generic_aio_sgio_command(uint32_t tag, uint8_t cmd, uint32_t timeout)= "generic aio sgio: tag=3D0x%x cmd=3D0x%x timeout=3D%u" +scsi_generic_ioctl_sgio_command(uint8_t cmd, uint32_t timeout) "generic io= ctl sgio: cmd=3D0x%x timeout=3D%u" +scsi_generic_ioctl_sgio_done(uint8_t cmd, int ret, uint8_t status, uint8_t= host_status) "generic ioctl sgio: cmd=3D0x%x ret=3D%d status=3D0x%x host_s= tatus=3D0x%x" --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327516; cv=none; d=zohomail.com; s=zohoarc; b=eZTZZlnGs89KdGJN6u0PKsfqqrrZbV0CSgpEr+2L3+DV5fhbk2ESzk6By8moHBk1fm0Nm+BY3KO4q1eJ24eaEqwBkg3b0TbQTy7xEYlU2W4iZct0kL1vVG5oNlH3ZuPOk756/0i2rw2BqXbNBgtiU3jl94nsu02Dycwpai+K5Vw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327516; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=54CLPfv727tDDEzkZUVZZm7JwSzL5y7iMO0EvhdL5P8=; b=K0BAqqAoMZDqCfeN2YfvE/i9gcY7oHh0XkV/NDje/QrFs9GLCM/RqZfCmxPDn0swBht/BnfLTFBCeETKxBQCOv8fEINwrzumVX3OqenBDEt4BNhdpXYttuzSFbEL3Y0+iNooOWllwFLxe0sFMGX9dG/KiCVlvylVoUlonJpXoCI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327516495938.671552367713; Fri, 26 Feb 2021 00:18:36 -0800 (PST) Received: from localhost ([::1]:59146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYKZ-0006CV-Be for importer@patchew.org; Fri, 26 Feb 2021 03:18:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY80-0001jq-D3 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:37 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:36517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY7x-000453-GO for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:35 -0500 Received: by mail-wr1-x42f.google.com with SMTP id u14so7678774wri.3 for ; Fri, 26 Feb 2021 00:05:33 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=54CLPfv727tDDEzkZUVZZm7JwSzL5y7iMO0EvhdL5P8=; b=GqI44uY1ZDUJh5GQFhIRcBP78NplQiCfxvN72rapuTL7B6pGPv5D3HQ1k5U9OJbit2 RwxC23OfqXNx7mXuxvOCetT6arCQnf2M9a71T+kojgkqHzq9T/81YGXx2UPQuEcIrB3z lUCl0O5A3uT9dpshXtHQCOLnut3LIfDOzDu/pYfpAyJv/tLCAvIf3wagGp1QXE2st0DC 3Sln2L8ito9O7MSuSiSuE3TbJ7A+0FjopFmmse930AhJzTORSwRki9DNpA9yPybU1XEV uUT+1IRafeL8RScCD/ggW74ySJYXAq2O9cgFbPbFx+s50HDsTgcDwSi6jY/XyKJQ3rBA Lv1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=54CLPfv727tDDEzkZUVZZm7JwSzL5y7iMO0EvhdL5P8=; b=fqnIxhJBozxAF5g9txcF+mNEs10KIW9JEtLMWiUcZsGc5OI3d8QRvXhRJv+RbT7zgz Lae7DyvFCq5+5vehl+0ltz+XAGXVhulu/29vEOXyo1W7mKL3QAGlPLBrNgZ4+kMDzpuo RroTW5ipBhDBmUhIcs69dpOiwRbYI8N5kPP0O532cqz9c7khntg4RGz3D0giWZKMb/lV XZnlfj3KJizfXS7UsKxsvRgy3+MGUJiidx08jEexPxMPysgPtTDwZioLa4zf3gFNjJtv Sf0nMiKPNDrqbk3DkXU6HV4/XDXoi+T6tikR0ciZae4ubkiZ5Vd2sxw8s+XcQ4XJBnRw oetg== X-Gm-Message-State: AOAM533PH3m7N30vF/QsD9/GtoTuAiCcXOZDDook7nrPdSLAb1RAo46d PZYdNhS3OcFf2xNHCKBvuFr7nvRKrwI= X-Google-Smtp-Source: ABdhPJwG840UrJMT/kpxHrsXHEQgpCALLzfyZWQ8ZwjPHPy7S1P0lfbxpUaEey7BF4S7FScxdymnGg== X-Received: by 2002:a5d:6d0c:: with SMTP id e12mr1795296wrq.136.1614326731715; Fri, 26 Feb 2021 00:05:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/29] scsi: allow user to set werror as report Date: Fri, 26 Feb 2021 09:05:03 +0100 Message-Id: <20210226080526.651705-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Zihao Chang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Zihao Chang 'enospc' is the default for -drive, but qemu allows user to set drive option werror. If werror of scsi-generic is set to 'report' by user, qemu will not allow vm to start. This patch allow user to set werror as 'report' for scsi-generic. Signed-off-by: Zihao Chang Reviewed-by: Fam Zheng Message-Id: <20201103061240.1364-1-changzihao1@huawei.com> Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-generic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 176a72951c..cf7e11cf44 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -673,7 +673,8 @@ static void scsi_generic_realize(SCSIDevice *s, Error *= *errp) return; } =20 - if (blk_get_on_error(s->conf.blk, 0) !=3D BLOCKDEV_ON_ERROR_ENOSPC) { + if (blk_get_on_error(s->conf.blk, 0) !=3D BLOCKDEV_ON_ERROR_ENOSPC && + blk_get_on_error(s->conf.blk, 0) !=3D BLOCKDEV_ON_ERROR_REPORT) { error_setg(errp, "Device doesn't support drive option werror"); return; } --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614326934; cv=none; d=zohomail.com; s=zohoarc; b=GEZVU4cQuihV2DOSJ0gDLLUIwf5ySFtA48zwkMAvmWwd8Uke9+sFHnRSk1XTcyl3FwXxvXfZCx8eeB7Mwq4GufeFmXhC1QzQGlGRiMnPJNaYFMM19Atngf6b7DURVwxADgjIXDFWZtu+ZBYlJ40cJw7DqiRMdnVwt/dn21rD3VE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614326934; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=64+qLzbR7jvwBqNVOtzEvyCauEYMhO+b3frI3ilwn84=; b=MZvdHwxWG0zjuFRF0B5Dn5noq3vTKDJEdgvt7Kkn6qnaT38xJD+WQ0m+4DRmg6yfKLfCM+l4ND4R1NrA8EqzRu8bG4Z6zqZMgCupxSOLIc0hhhXbQCgovmaBBE9FDRR7rxJCNNW8u82PqMDKmTKypqVVlJaFoxAHR9Utbsg6vJw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614326934768745.0968541507344; Fri, 26 Feb 2021 00:08:54 -0800 (PST) Received: from localhost ([::1]:33340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYBA-0003kl-26 for importer@patchew.org; Fri, 26 Feb 2021 03:08:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY80-0001jt-Sw for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:37 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:55835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY7x-00045V-N0 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:36 -0500 Received: by mail-wm1-x32c.google.com with SMTP id w7so6658473wmb.5 for ; Fri, 26 Feb 2021 00:05:33 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=64+qLzbR7jvwBqNVOtzEvyCauEYMhO+b3frI3ilwn84=; b=Lr3PLcIDK4+efv4NC0MloF6vce/Op6UaZAULpSt/zMr3h1ZvzjkqRcrVbhOAXUeC6x VPLv3JR8kfBZURa9Rs0eF121QNvxxoFcN4XCi8WNiX3znPOxXQaSevfoMJ/NK6XsuJsV YJMIB9giIC7zOYTnbeJMAMCQX6CYJXKFK4Y6rWsnoBfAIrMpaZE2OaE832Ku+91dOkod NNiDsgkCzCld0dZS+/S0MNi2ITx3Vz3wk+/JmNWcbqDGZG3N7cs4DfAMTeRk6raAiogM 7s0tjkAPRwH5/s0MRqUfhIdVpOuqqnaBZC1eEFFxMFtsZyYSgWl0pMHbvCc/9RyYbYLI ZgGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=64+qLzbR7jvwBqNVOtzEvyCauEYMhO+b3frI3ilwn84=; b=F8jPoJo1zCeC33wyYm2geOa36+nl3Yk0GuhBAgeTgx3woMTavMqP4UGqcqA+7TQ3Jv H5pzpduDL9pjNjecMoLOMcHkvBl+IWqN+FuvNyH0F7SKcMy0Hrzyux/x7iDDjo7p8rtr uzA0l8cnxXsRtpUUNfs1wHKZh0uQC5UYuhgGf59JHeAi89xrXVt+ou9g1JMQg1xRO1d8 9ImFYGYmIMRLOoUuRCD0UMPjifCYLHNyrgFXORiGfq2XirnmFavx07u4Fun/XGxaUQ14 QwFDhymsQ/yFkE3zBfd43/L/MPmtrPuCWVAylzqogt860zQ9CVflgdb3TS93PMjGK5UV EfZw== X-Gm-Message-State: AOAM533aZF/mPKGZsfvj9XW292uVGGM6fa7EWrB9LTOWuNa8jQz0bm8c Be9kajrBr5ECAG4TButOTvcIFjv4mjs= X-Google-Smtp-Source: ABdhPJzjeUsOJaIDQs9LPdcyB32UhjimXVWHZVNfpT0I85huldhYiGizV+06GZNKyE3EC9DFdXLuBQ== X-Received: by 2002:a1c:1bc4:: with SMTP id b187mr1530061wmb.18.1614326732464; Fri, 26 Feb 2021 00:05:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/29] virtio-scsi: don't process IO on fenced dataplane Date: Fri, 26 Feb 2021 09:05:04 +0100 Message-Id: <20210226080526.651705-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Maxim Levitsky If virtio_scsi_dataplane_start fails, there is a small window when it drops= the aio lock (in aio_wait_bh_oneshot) and the dataplane's AIO handler can still run during that window. This is done after the dataplane was marked as fenced, thus we use this flag to avoid it doing any IO. Signed-off-by: Maxim Levitsky Message-Id: <20201217150040.906961-2-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini --- hw/scsi/virtio-scsi-dataplane.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplan= e.c index 2c83a0ab1f..4ad8793406 100644 --- a/hw/scsi/virtio-scsi-dataplane.c +++ b/hw/scsi/virtio-scsi-dataplane.c @@ -52,12 +52,14 @@ void virtio_scsi_dataplane_setup(VirtIOSCSI *s, Error *= *errp) static bool virtio_scsi_data_plane_handle_cmd(VirtIODevice *vdev, VirtQueue *vq) { - bool progress; + bool progress =3D false; VirtIOSCSI *s =3D VIRTIO_SCSI(vdev); =20 virtio_scsi_acquire(s); - assert(s->ctx && s->dataplane_started); - progress =3D virtio_scsi_handle_cmd_vq(s, vq); + if (!s->dataplane_fenced) { + assert(s->ctx && s->dataplane_started); + progress =3D virtio_scsi_handle_cmd_vq(s, vq); + } virtio_scsi_release(s); return progress; } @@ -65,12 +67,14 @@ static bool virtio_scsi_data_plane_handle_cmd(VirtIODev= ice *vdev, static bool virtio_scsi_data_plane_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) { - bool progress; + bool progress =3D false; VirtIOSCSI *s =3D VIRTIO_SCSI(vdev); =20 virtio_scsi_acquire(s); - assert(s->ctx && s->dataplane_started); - progress =3D virtio_scsi_handle_ctrl_vq(s, vq); + if (!s->dataplane_fenced) { + assert(s->ctx && s->dataplane_started); + progress =3D virtio_scsi_handle_ctrl_vq(s, vq); + } virtio_scsi_release(s); return progress; } @@ -78,12 +82,14 @@ static bool virtio_scsi_data_plane_handle_ctrl(VirtIODe= vice *vdev, static bool virtio_scsi_data_plane_handle_event(VirtIODevice *vdev, VirtQueue *vq) { - bool progress; + bool progress =3D false; VirtIOSCSI *s =3D VIRTIO_SCSI(vdev); =20 virtio_scsi_acquire(s); - assert(s->ctx && s->dataplane_started); - progress =3D virtio_scsi_handle_event_vq(s, vq); + if (!s->dataplane_fenced) { + assert(s->ctx && s->dataplane_started); + progress =3D virtio_scsi_handle_event_vq(s, vq); + } virtio_scsi_release(s); return progress; } --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327278; cv=none; d=zohomail.com; s=zohoarc; b=aDTzar9MW8uZf5bzdji2GFfXgKOqzJpAbvdjVdUrLua11KOkCU3685S0iE6ojaeJX9qJQWR44d3sLNCKKsHev+fPjUHz5nUbMtSRYj869blDf/OWxCvNlumGa/nZLFTVvH4KwADfqx3UzmaVMpvMvO64RwARiW7CKlZTxvkzJ0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327278; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dmPfvXeQvEn+5queRrC9faXjWtuXEijScy1bn7bFvN8=; b=ZUDNGle4B73bWCgcV5cjl+Qvmfq+9dZsFuGQtKYg5LdDKNqrYRHn3mN9ThA8ltZ/YhvQao2qFd5VO5t3lQtLOsk1NzDfPj2JU68eLxk6yoIBu4weObj3WYoYKSVXHgSr0jc5vyh9/sqFeEuS9k+hg73+Ukwdh2jOphpOWz7V9ms= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327278247287.526359599242; Fri, 26 Feb 2021 00:14:38 -0800 (PST) Received: from localhost ([::1]:50618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYGi-0002Wb-PR for importer@patchew.org; Fri, 26 Feb 2021 03:14:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY80-0001js-FQ for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:37 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:51133) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY7y-00046J-Gh for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:36 -0500 Received: by mail-wm1-x333.google.com with SMTP id i9so6355361wml.0 for ; Fri, 26 Feb 2021 00:05:34 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dmPfvXeQvEn+5queRrC9faXjWtuXEijScy1bn7bFvN8=; b=Doe0ThXHC4JBU5JJX0hBmD6jrqjqpv6noG46HODqxYm1xgqzms/ke4UUdDdVG1GG2y Tl84TanQghkjwobSHi1ER4JwQ9WArsORH39i94VEVwP7uD+eCiYsLZ3sJNc+Wf0yAWk+ ATq9arhsqQDdhjApiaDnHhLhqC+jkaGuST2ICSMcJaL41Qn5Wi5/ADwblG/l/GIR3X56 mh3KfewMeLmmelWRgphFKpaT3EcT51TO5zHX7xhwu7ifJl83ZudQzjAyCReomhncNWVS Lz7a79nnosok/cUrz9a0tt7oB/rkRsiWWoaq99fyWFxo3VnBUb+SwmFUG9Oixp7u9693 J6FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dmPfvXeQvEn+5queRrC9faXjWtuXEijScy1bn7bFvN8=; b=W6ZT5JeEhKMIqR9QlarfLUIMcixqVXmZ4IaFqfJDZ6hEn4cr2jA9Dsoau4JUtzBsTu cBYAbWHZ532PRO41UA23tyBmymPMnJyC4OCLPTHfNpROYZQ/91yTkC5NXa0UMhYtOeCX igvu840EX+AmUnNJcmMYNvPiVobghp06Re32dp8NgBWsDVf/aK5G0EfFVJkpkH8Y6uMe 9sECLc4ccQzA5X/EY8VCgn1nFa59Rw08Wt6QyrBg7hTS4GJYvbE9GbF/RH07Qw6CSLsO 1z0kUMyf0c2jXmRxOIBrR3aMMMZPsn6XrG6ChBuSo+BsLrwWb3fenhSifzWZxdSeBNq0 swfg== X-Gm-Message-State: AOAM530WGXs6Nfxzpb5GsqFnYpCflKttRCPV+RCo2pK8uAE+wb8/u4NK VkvAOFOf7G92XUs+vtiVdsZkIOf6Meo= X-Google-Smtp-Source: ABdhPJwUtBFY3qr5Yz7esyRFig/42b+OEXVUNVvzkW+jHrfulKIUugpahwAk02p5fnq0X6Q6gz0PzQ== X-Received: by 2002:a7b:c922:: with SMTP id h2mr1552945wml.44.1614326733059; Fri, 26 Feb 2021 00:05:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/29] scsi-disk: move scsi_handle_rw_error earlier Date: Fri, 26 Feb 2021 09:05:05 +0100 Message-Id: <20210226080526.651705-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x333.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Remove the forward declaration. Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 168 ++++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 85 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index a2716b26b4..18ab777017 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -111,8 +111,6 @@ struct SCSIDiskState { uint16_t rotation_rate; }; =20 -static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_fail= ed); - static void scsi_free_request(SCSIRequest *req) { SCSIDiskReq *r =3D DO_UPCAST(SCSIDiskReq, req, req); @@ -182,6 +180,89 @@ static void scsi_disk_load_request(QEMUFile *f, SCSIRe= quest *req) qemu_iovec_init_external(&r->qiov, &r->iov, 1); } =20 +/* + * scsi_handle_rw_error has two return values. False means that the error + * must be ignored, true means that the error has been processed and the + * caller should not do anything else for this request. Note that + * scsi_handle_rw_error always manages its reference counts, independent + * of the return value. + */ +static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_fail= ed) +{ + bool is_read =3D (r->req.cmd.mode =3D=3D SCSI_XFER_FROM_DEV); + SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + SCSIDiskClass *sdc =3D (SCSIDiskClass *) object_get_class(OBJECT(s)); + BlockErrorAction action =3D blk_get_error_action(s->qdev.conf.blk, + is_read, error); + + if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { + if (acct_failed) { + block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct); + } + switch (error) { + case 0: + /* A passthrough command has run and has produced sense data; = check + * whether the error has to be handled by the guest or should = rather + * pause the host. + */ + assert(r->status && *r->status); + if (scsi_sense_buf_is_guest_recoverable(r->req.sense, sizeof(r= ->req.sense))) { + /* These errors are handled by guest. */ + sdc->update_sense(&r->req); + scsi_req_complete(&r->req, *r->status); + return true; + } + error =3D scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.= sense)); + break; +#ifdef CONFIG_LINUX + /* These errno mapping are specific to Linux. For more inform= ation: + * - scsi_decide_disposition in drivers/scsi/scsi_error.c + * - scsi_result_to_blk_status in drivers/scsi/scsi_lib.c + * - blk_errors[] in block/blk-core.c + */ + case EBADE: + /* DID_NEXUS_FAILURE -> BLK_STS_NEXUS. */ + scsi_req_complete(&r->req, RESERVATION_CONFLICT); + break; + case ENODATA: + /* DID_MEDIUM_ERROR -> BLK_STS_MEDIUM. */ + scsi_check_condition(r, SENSE_CODE(READ_ERROR)); + break; + case EREMOTEIO: + /* DID_TARGET_FAILURE -> BLK_STS_TARGET. */ + scsi_req_complete(&r->req, HARDWARE_ERROR); + break; +#endif + case ENOMEDIUM: + scsi_check_condition(r, SENSE_CODE(NO_MEDIUM)); + break; + case ENOMEM: + scsi_check_condition(r, SENSE_CODE(TARGET_FAILURE)); + break; + case EINVAL: + scsi_check_condition(r, SENSE_CODE(INVALID_FIELD)); + break; + case ENOSPC: + scsi_check_condition(r, SENSE_CODE(SPACE_ALLOC_FAILED)); + break; + default: + scsi_check_condition(r, SENSE_CODE(IO_ERROR)); + break; + } + } + + blk_error_action(s->qdev.conf.blk, action, is_read, error); + if (action =3D=3D BLOCK_ERROR_ACTION_IGNORE) { + scsi_req_complete(&r->req, 0); + return true; + } + + if (action =3D=3D BLOCK_ERROR_ACTION_STOP) { + scsi_req_retry(&r->req); + } + return true; +} + static bool scsi_disk_req_check_error(SCSIDiskReq *r, int ret, bool acct_f= ailed) { if (r->req.io_canceled) { @@ -428,89 +509,6 @@ static void scsi_read_data(SCSIRequest *req) } } =20 -/* - * scsi_handle_rw_error has two return values. False means that the error - * must be ignored, true means that the error has been processed and the - * caller should not do anything else for this request. Note that - * scsi_handle_rw_error always manages its reference counts, independent - * of the return value. - */ -static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_fail= ed) -{ - bool is_read =3D (r->req.cmd.mode =3D=3D SCSI_XFER_FROM_DEV); - SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - SCSIDiskClass *sdc =3D (SCSIDiskClass *) object_get_class(OBJECT(s)); - BlockErrorAction action =3D blk_get_error_action(s->qdev.conf.blk, - is_read, error); - - if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { - if (acct_failed) { - block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct); - } - switch (error) { - case 0: - /* A passthrough command has run and has produced sense data; = check - * whether the error has to be handled by the guest or should = rather - * pause the host. - */ - assert(r->status && *r->status); - if (scsi_sense_buf_is_guest_recoverable(r->req.sense, sizeof(r= ->req.sense))) { - /* These errors are handled by guest. */ - sdc->update_sense(&r->req); - scsi_req_complete(&r->req, *r->status); - return true; - } - error =3D scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.= sense)); - break; -#ifdef CONFIG_LINUX - /* These errno mapping are specific to Linux. For more inform= ation: - * - scsi_decide_disposition in drivers/scsi/scsi_error.c - * - scsi_result_to_blk_status in drivers/scsi/scsi_lib.c - * - blk_errors[] in block/blk-core.c - */ - case EBADE: - /* DID_NEXUS_FAILURE -> BLK_STS_NEXUS. */ - scsi_req_complete(&r->req, RESERVATION_CONFLICT); - break; - case ENODATA: - /* DID_MEDIUM_ERROR -> BLK_STS_MEDIUM. */ - scsi_check_condition(r, SENSE_CODE(READ_ERROR)); - break; - case EREMOTEIO: - /* DID_TARGET_FAILURE -> BLK_STS_TARGET. */ - scsi_req_complete(&r->req, HARDWARE_ERROR); - break; -#endif - case ENOMEDIUM: - scsi_check_condition(r, SENSE_CODE(NO_MEDIUM)); - break; - case ENOMEM: - scsi_check_condition(r, SENSE_CODE(TARGET_FAILURE)); - break; - case EINVAL: - scsi_check_condition(r, SENSE_CODE(INVALID_FIELD)); - break; - case ENOSPC: - scsi_check_condition(r, SENSE_CODE(SPACE_ALLOC_FAILED)); - break; - default: - scsi_check_condition(r, SENSE_CODE(IO_ERROR)); - break; - } - } - - blk_error_action(s->qdev.conf.blk, action, is_read, error); - if (action =3D=3D BLOCK_ERROR_ACTION_IGNORE) { - scsi_req_complete(&r->req, 0); - return true; - } - - if (action =3D=3D BLOCK_ERROR_ACTION_STOP) { - scsi_req_retry(&r->req); - } - return true; -} - static void scsi_write_complete_noio(SCSIDiskReq *r, int ret) { uint32_t n; --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327135; cv=none; d=zohomail.com; s=zohoarc; b=jRZeCfcTEutseTt0I7VzQOTHgTAQ/rjIaBHEDyhHEcmRc1WQjk2ysEXDjaqOgQmpE5BosjOApH49an6nUgNQqhy0XUkDFeJ2OD2bw52Xg8kBFqf4kLamoA2EqggxLBPDWwI8Go6uJ+Kf46in2w11gSQ3WEPQs5XW+dUW4IyWvUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327135; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QvpruKzy7iRxPp+WZJ5J+qLhT0FlaXM1xbg2aJJPmEw=; b=NxeF+zADScLX0sI2DZWeziRNknMBpo1wa4A1IyXeqBvoDJAr//2ecpyXIybayWi5/HoGUGYbIc4algfT220olMWUmjVtYnxnDlJJXHic3wR76kXWWf08i+igXIewCyG3qG0j5++d/5nx8YdqxD3HbbUfq+iEVjRNbdjyA6NSYnQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327135593282.99346846931803; Fri, 26 Feb 2021 00:12:15 -0800 (PST) Received: from localhost ([::1]:41970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYEO-0007TK-W0 for importer@patchew.org; Fri, 26 Feb 2021 03:12:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY81-0001kE-AR for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:39 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:35821) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY7z-00046O-6D for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:36 -0500 Received: by mail-wr1-x42e.google.com with SMTP id l12so7666997wry.2 for ; Fri, 26 Feb 2021 00:05:34 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QvpruKzy7iRxPp+WZJ5J+qLhT0FlaXM1xbg2aJJPmEw=; b=nxyyN2v+QLCKsraT2/E3LPLe71TivsOK9VppdfpUoxeNE0nnqOgpI79qZaN3dSBLUa RsZ4xFvg7ZsYMzroS8jaqspNpfwFODOPIEFiRwMtxf8dL8dzBxtPgBaEp1Onlaco9xYe 4eJT3JmQ9jVlfHdDQIRm1hrkemrAauxTQFnFsqw6jQLXtkl1zzEGIuZh7bZUpRKEkjLk qFogatc7Acrzc+hZYwKgHTvkrnAp5SphKKG2NeNrZ8lSMTJ9DAsy5zoeFeGrl9AztCc+ 9ar/8lHweNeiqlAeq5ShkZDv4d8GhV3Yt4f0WaeyJxDbpEWUyLdwd8BWJ98diC7DhOf6 0qJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QvpruKzy7iRxPp+WZJ5J+qLhT0FlaXM1xbg2aJJPmEw=; b=fbbsQo0L5bLidrxaMjTitvXjpNZ9x5wneaRN86Fq5+0GnezJdnPVQe5h/kfwaVMWWz zMfruWZZJGf2ClsuZgdWsYDYohEz/7w+lSSpbDP3nFLuw0pGkTSMKNiCTyZ0FF6PIp8H DsfZvhUgr/y+b88x0YWs9bqQIhmlJaacGJIhm0tkU9OIHm06zuVvhaGnMk9/TNONzAwW uXz1QWcXk0ZEu0qx2BvYE/kn9w8/Qsm8zoejb7lDpl255B3xBRbAjDENIqhUxwI3/4SV 39iKGkwB6og3HH+3iW7Zf9pbCyYvATAIVj/RiIPDflxQfFlNfwqYEyETCgyFR2FfuroO OiRg== X-Gm-Message-State: AOAM530hWIt2kvyoTFVSg/qrEVQAgUKVi57l7YY3VIZD2PQhZIX+zm3W XPPnKLfu0BjNKRFekZL2/BjoexqgpMY= X-Google-Smtp-Source: ABdhPJxZ2KzNvpnX8F9XH+fwf2Ync52jwOuZ/7bDzRCNPI+Fw6QTolVBTYxG6wzxa+nfu1mkB4YegQ== X-Received: by 2002:adf:aa08:: with SMTP id p8mr1829595wrd.232.1614326733735; Fri, 26 Feb 2021 00:05:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/29] scsi-disk: do not complete requests early for rerror/werror=ignore Date: Fri, 26 Feb 2021 09:05:06 +0100 Message-Id: <20210226080526.651705-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When requested to ignore errors, just do nothing and let the request complete normally. This means that the request will be accounted correctly. This is what commit 40dce4ee61 ("scsi-disk: fix rerror/werror=3Dignore", 2018-10-19) was supposed to do: Fixes: 40dce4ee61 ("scsi-disk: fix rerror/werror=3Dignore", 2018-10-19) Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 18ab777017..36aa872445 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -253,8 +253,7 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int er= ror, bool acct_failed) =20 blk_error_action(s->qdev.conf.blk, action, is_read, error); if (action =3D=3D BLOCK_ERROR_ACTION_IGNORE) { - scsi_req_complete(&r->req, 0); - return true; + return false; } =20 if (action =3D=3D BLOCK_ERROR_ACTION_STOP) { --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327816; cv=none; d=zohomail.com; s=zohoarc; b=AjRBkH3/5q2ljeCkqmZuOcPWQhrGpviT3zgnC1reeRUjL6vsUgF5X6biz13b0ral62caB+maubE4e0E60RYgQS8aD8WlNITdE5O2xk6nMyUzpRxnPmVidTeR5ycQpAL07nuXV18oo2Pq3JsFoLhGcDsw9CK1+6o8/7UD5s3glXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327816; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uBJ4xrj+hJEP+gaoUps5rPIqMrLdZuVboWYAHOTV5sw=; b=FJ+kKHOX+Z4vey0iVawAWBKyZEJPAPrDolAf5O7a6+sBSQh2nxVxzhOBREiUaIKx5zYxF76HUNbfZLKllXdXyaHqR7fITLhE+DBilpEwpX5oBOMxSgFEkoaxoRQkh6VhSNamj2ZIV7q5DHERJVNKsdOciO2nSxOmB38wG4R0fyQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161432781681126.5749807457247; Fri, 26 Feb 2021 00:23:36 -0800 (PST) Received: from localhost ([::1]:42100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYPP-0002ZH-Ps for importer@patchew.org; Fri, 26 Feb 2021 03:23:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY82-0001kl-33 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:39 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:45654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY80-00046h-7P for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:37 -0500 Received: by mail-wr1-x431.google.com with SMTP id e10so7439256wro.12 for ; Fri, 26 Feb 2021 00:05:35 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uBJ4xrj+hJEP+gaoUps5rPIqMrLdZuVboWYAHOTV5sw=; b=j0IytxnOK1Utkoxhzidy9e3opkT+0djxBcPsE8dDk289h9NzzxmG4lfIioh/pP5uhl n3AYRc1eZAbU+lniyLmyDStg1ZzZw/wf7CPILmu0W3hJDOVSs1tN84CIzoWmoZ9dGJvt FTgrQ9IlkfytGszsbLGFy9DyilJcQip75aI2QgJ1UDFD3mHxtn5usC1a0wCRA2DP9mvN i5+hhxfc3f0HOVSkCzmCAzBa91QQ6e7yq7XzlNxXQpKd3uF7gEwzwm1XbONmk3RaRbp1 vGlljKJpRQTybbQP5igDEyHBYtynf5blvfb+mEjfnK92VJ49MOfB7IH+rzvm52Z+KV1j t/5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uBJ4xrj+hJEP+gaoUps5rPIqMrLdZuVboWYAHOTV5sw=; b=rxxZGdXJOIJxb80WBFfAOjFhaU9zrQq5UGIY5eoalSqWihcGSIU1s7eFSDI2/dshQa 4g0hdYTzjx0hSgpmwUpCO9IbprsHRA7qu7I2RjHIN0W70LGb/wQsrKRYXdkx9/gJTmqe CCo4mVCu5DklGxa85nF9FT3fCxndvdcvU+VkJnQ1rWsanSsPI8SZ09J8zLmUG6RnRKm3 9TVoFSKDJtqebPxTWwqkccK/sZ8T49f7zBCa3i3sZGcekE2JwNG3eTCQjHiUcxZVsR3D AhicDJhet+r1aQTRgqlJtmlkyOjJm3q2eQBLc6p+Z3pw4Ft9NjbwwbKVa2y+v9vPR0PY hLRw== X-Gm-Message-State: AOAM533M3beyWDsMLhe3CaVOpQYkEpCQ7czx4YkHC1c3oDrE/Q8HFUrh WN5XZK8VnZAMFecrYMD0dQIHEm45IQo= X-Google-Smtp-Source: ABdhPJwwGfswJPmKYDgOZStzGE0aGcbqpKVF7vlIhWKatEwCpqIJwpAmxabq+dcZEEz2HlqB6PBmNw== X-Received: by 2002:a05:6000:18a3:: with SMTP id b3mr1835269wri.373.1614326734366; Fri, 26 Feb 2021 00:05:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/29] scsi: introduce scsi_sense_from_errno() Date: Fri, 26 Feb 2021 09:05:07 +0100 Message-Id: <20210226080526.651705-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The new function is an extension of the switch statement in scsi-disk.c which also includes the errno cases only found in sg_io_sense_from_errno. This allows us to consolidate the errno handling. Extracted from a patch by Hannes Reinecke . Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 45 +++++++------------------------------- include/scsi/utils.h | 2 ++ scsi/utils.c | 51 +++++++++++++++++++++++++++++++++++--------- 3 files changed, 51 insertions(+), 47 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 36aa872445..9c6099ffc4 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -194,13 +194,13 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int = error, bool acct_failed) SCSIDiskClass *sdc =3D (SCSIDiskClass *) object_get_class(OBJECT(s)); BlockErrorAction action =3D blk_get_error_action(s->qdev.conf.blk, is_read, error); + SCSISense sense; =20 if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { if (acct_failed) { block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct); } - switch (error) { - case 0: + if (error =3D=3D 0) { /* A passthrough command has run and has produced sense data; = check * whether the error has to be handled by the guest or should = rather * pause the host. @@ -213,41 +213,12 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int = error, bool acct_failed) return true; } error =3D scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.= sense)); - break; -#ifdef CONFIG_LINUX - /* These errno mapping are specific to Linux. For more inform= ation: - * - scsi_decide_disposition in drivers/scsi/scsi_error.c - * - scsi_result_to_blk_status in drivers/scsi/scsi_lib.c - * - blk_errors[] in block/blk-core.c - */ - case EBADE: - /* DID_NEXUS_FAILURE -> BLK_STS_NEXUS. */ - scsi_req_complete(&r->req, RESERVATION_CONFLICT); - break; - case ENODATA: - /* DID_MEDIUM_ERROR -> BLK_STS_MEDIUM. */ - scsi_check_condition(r, SENSE_CODE(READ_ERROR)); - break; - case EREMOTEIO: - /* DID_TARGET_FAILURE -> BLK_STS_TARGET. */ - scsi_req_complete(&r->req, HARDWARE_ERROR); - break; -#endif - case ENOMEDIUM: - scsi_check_condition(r, SENSE_CODE(NO_MEDIUM)); - break; - case ENOMEM: - scsi_check_condition(r, SENSE_CODE(TARGET_FAILURE)); - break; - case EINVAL: - scsi_check_condition(r, SENSE_CODE(INVALID_FIELD)); - break; - case ENOSPC: - scsi_check_condition(r, SENSE_CODE(SPACE_ALLOC_FAILED)); - break; - default: - scsi_check_condition(r, SENSE_CODE(IO_ERROR)); - break; + } else { + int status =3D scsi_sense_from_errno(error, &sense); + if (status =3D=3D CHECK_CONDITION) { + scsi_req_build_sense(&r->req, sense); + } + scsi_req_complete(&r->req, status); } } =20 diff --git a/include/scsi/utils.h b/include/scsi/utils.h index 096489c6cd..ff7c7091b6 100644 --- a/include/scsi/utils.h +++ b/include/scsi/utils.h @@ -135,4 +135,6 @@ int sg_io_sense_from_errno(int errno_value, struct sg_i= o_hdr *io_hdr, SCSISense *sense); #endif =20 +int scsi_sense_from_errno(int errno_value, SCSISense *sense); + #endif diff --git a/scsi/utils.c b/scsi/utils.c index 793c3a6b9c..6b56e01002 100644 --- a/scsi/utils.c +++ b/scsi/utils.c @@ -565,21 +565,52 @@ const char *scsi_command_name(uint8_t cmd) return names[cmd]; } =20 +int scsi_sense_from_errno(int errno_value, SCSISense *sense) +{ + switch (errno_value) { + case 0: + return GOOD; + case EDOM: + return TASK_SET_FULL; +#ifdef CONFIG_LINUX + /* These errno mapping are specific to Linux. For more informatio= n: + * - scsi_decide_disposition in drivers/scsi/scsi_error.c + * - scsi_result_to_blk_status in drivers/scsi/scsi_lib.c + * - blk_errors[] in block/blk-core.c + */ + case EBADE: + return RESERVATION_CONFLICT; + case ENODATA: + *sense =3D SENSE_CODE(READ_ERROR); + return CHECK_CONDITION; + case EREMOTEIO: + *sense =3D SENSE_CODE(LUN_COMM_FAILURE); + return CHECK_CONDITION; +#endif + case ENOMEDIUM: + *sense =3D SENSE_CODE(NO_MEDIUM); + return CHECK_CONDITION; + case ENOMEM: + *sense =3D SENSE_CODE(TARGET_FAILURE); + return CHECK_CONDITION; + case EINVAL: + *sense =3D SENSE_CODE(INVALID_FIELD); + return CHECK_CONDITION; + case ENOSPC: + *sense =3D SENSE_CODE(SPACE_ALLOC_FAILED); + return CHECK_CONDITION; + default: + *sense =3D SENSE_CODE(IO_ERROR); + return CHECK_CONDITION; + } +} + #ifdef CONFIG_LINUX int sg_io_sense_from_errno(int errno_value, struct sg_io_hdr *io_hdr, SCSISense *sense) { if (errno_value !=3D 0) { - switch (errno_value) { - case EDOM: - return TASK_SET_FULL; - case ENOMEM: - *sense =3D SENSE_CODE(TARGET_FAILURE); - return CHECK_CONDITION; - default: - *sense =3D SENSE_CODE(IO_ERROR); - return CHECK_CONDITION; - } + return scsi_sense_from_errno(errno_value, sense); } else { if (io_hdr->host_status =3D=3D SG_ERR_DID_NO_CONNECT || io_hdr->host_status =3D=3D SG_ERR_DID_BUS_BUSY || --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327381; cv=none; d=zohomail.com; s=zohoarc; b=Iw+up4OwsBqHmbkM5oWPVBpa9GFf2BJhN0Kx3E28vFlwlqF1lpIKMNogy1b2EMQiBdpVRSMzeZLePiMn9irtNVGWRTLwzVFQuNzNmtDc2pKKQSlHyQZ7m1CIpU07slPr9tcUYEXGwMF5sSgs5Ct5QSdWHpuF7hsXNtg/aGNK/tw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327381; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=osmTk+V+aeU1VByo64kXupbvRKx+EAC0OdfK2HOG+ik=; b=VG9xQ0n+I9wS8S+VyywWD3hfqv/cUAVNR97iCqP+xvd00bNMbW9FjINkX12esKhxcmWLv136pZczFwrd20WpbcPMi6RV4PUOt6+YB1ZGpGjzZ8VSuiSqxEQS8492Erm0C9Ffe1NUn0fn0K76M2ylMlYZKKEU0nFaXr1yVohWRSY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327381953308.0215489456491; Fri, 26 Feb 2021 00:16:21 -0800 (PST) Received: from localhost ([::1]:53628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYIO-0003mX-UC for importer@patchew.org; Fri, 26 Feb 2021 03:16:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY82-0001km-F4 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:39 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:37399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY80-00046r-D6 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:38 -0500 Received: by mail-wm1-x32b.google.com with SMTP id m1so6963726wml.2 for ; Fri, 26 Feb 2021 00:05:35 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=osmTk+V+aeU1VByo64kXupbvRKx+EAC0OdfK2HOG+ik=; b=Be0HZ6fAKzIzPFyEL8F9PLE+gWInqR5l3FG9mtlz32zoIYCSNspELF3YayRkO6GS7k dmcJZba4/Gy7v7CbNSnxYvg/9LSPWoEjqaPcW2HCQFIhQWi5QH1XeYM5XFimfVlWC9yI Ifai2LY+toXZzFWwmIMw5AU1nysWGv8N1kx1K2XyEbylzGGrrXcbou2/9cWFDsHJ+VdC vPvJKVxtgBYiKzHaALZCqAA/WWSxYBmdZzOkzXzyEz6u+p3Fv1AfQX7HysAN6TW+MRDw SCksFHRae3hP7mGSLU0Jnb/wYqVZk5RhufSWuckjk4EnMmLyJ8Nre3Ut/MaVjdhgLcDG 7Ewg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=osmTk+V+aeU1VByo64kXupbvRKx+EAC0OdfK2HOG+ik=; b=hZAUsj3KZTZcntYuBR0mZkefAhO8rruqsrmsnKF9QPiUbfPbJ1sdp+/XKLL+VbSDlE q8aRyszT/myufZXKGbnn8Pv/gehDWtzGf58we/QogdWoGcKiRNwUH53ta7kPtRlPL2vw ZN/DX3PmGGo4ExW6ZWxv9UConW2kNErmYJP1PwCfr0QxyrhZHF5oHYIrNW/73qls4BXn QLG76QY6BBdfO/RjM//gLODYQUmP+nxdZFMy0be9GRny7sVRHlmKEptko+8M2rg9LvNl hdrOjiFlG/ITSmH4ovHWtbzlcpv2nP2kzjl6Um0P9Gq4FAMY6O710y58hNFNzce96xFP fhZQ== X-Gm-Message-State: AOAM53132yoCrBKsB2yqQGrQ/OFa+JVeaF3alTXcunLznYPuY+ZR94mu AwSi1aLhyUWZyTnsLOKjiW3PwmEblYc= X-Google-Smtp-Source: ABdhPJzv94AJpuz7ZBOmEn2gAj+YR3i1V8H2b2qKZp0T3Y9ckEsWczSVZLfIXouaz9hG0XLIHxy9PQ== X-Received: by 2002:a7b:c5d0:: with SMTP id n16mr1520437wmk.27.1614326735023; Fri, 26 Feb 2021 00:05:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/29] scsi-disk: pass SCSI status to scsi_handle_rw_error Date: Fri, 26 Feb 2021 09:05:08 +0100 Message-Id: <20210226080526.651705-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Instead of fishing it from *r->status, just pass the SCSI status as a positive value of the second parameter and an errno as a negative value. Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 9c6099ffc4..548a5297fa 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -187,34 +187,48 @@ static void scsi_disk_load_request(QEMUFile *f, SCSIR= equest *req) * scsi_handle_rw_error always manages its reference counts, independent * of the return value. */ -static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_fail= ed) +static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed) { bool is_read =3D (r->req.cmd.mode =3D=3D SCSI_XFER_FROM_DEV); SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); SCSIDiskClass *sdc =3D (SCSIDiskClass *) object_get_class(OBJECT(s)); - BlockErrorAction action =3D blk_get_error_action(s->qdev.conf.blk, - is_read, error); - SCSISense sense; + SCSISense sense =3D SENSE_CODE(NO_SENSE); + int error =3D 0; + bool req_has_sense =3D false; + BlockErrorAction action; + int status; =20 + if (ret < 0) { + status =3D scsi_sense_from_errno(-ret, &sense); + error =3D -ret; + } else { + /* A passthrough command has completed with nonzero status. */ + status =3D ret; + if (status =3D=3D CHECK_CONDITION) { + req_has_sense =3D true; + error =3D scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.= sense)); + } else { + error =3D EINVAL; + } + } + + action =3D blk_get_error_action(s->qdev.conf.blk, is_read, error); if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { if (acct_failed) { block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct); } - if (error =3D=3D 0) { + if (req_has_sense) { /* A passthrough command has run and has produced sense data; = check * whether the error has to be handled by the guest or should = rather * pause the host. */ - assert(r->status && *r->status); if (scsi_sense_buf_is_guest_recoverable(r->req.sense, sizeof(r= ->req.sense))) { /* These errors are handled by guest. */ sdc->update_sense(&r->req); - scsi_req_complete(&r->req, *r->status); + scsi_req_complete(&r->req, status); return true; } - error =3D scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.= sense)); } else { - int status =3D scsi_sense_from_errno(error, &sense); if (status =3D=3D CHECK_CONDITION) { scsi_req_build_sense(&r->req, sense); } @@ -240,8 +254,10 @@ static bool scsi_disk_req_check_error(SCSIDiskReq *r, = int ret, bool acct_failed) return true; } =20 - if (ret < 0 || (r->status && *r->status)) { - return scsi_handle_rw_error(r, -ret, acct_failed); + if (ret < 0) { + return scsi_handle_rw_error(r, ret, acct_failed); + } else if (r->status && *r->status) { + return scsi_handle_rw_error(r, *r->status, acct_failed); } =20 return false; --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327277; cv=none; d=zohomail.com; s=zohoarc; b=FACLXcZkdFQtnG6G1uRtUNhyTYJBoDC83aA/dPwxmtLoA+3Fy0dTGFoH4zoPb1q6Z5VGFD5IFPIVb35sEeaq0bg2rp0waiTLXhyCGgE5bcmCcqMqyCl7A9gVz+OY9FCWy3S1iU9lJ86jvS1sRITK6DunF/29Kt2rU+PNxdm3PCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327277; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ycz7tMt4XNpb7H0VgGp30K9fstHZJN03neY0qoiIQu0=; b=kaRcckH7H/Qiy1Rnb0A8UPlWEKRqWlrWyK5z6nR2cc9Gvya/KtJT9EzslMZlU0P0cvDrRV8g/eooUKhYlR52lW8Iu3p9NfqocsgUVN+/+yj8S7tHzLD1ut5JYPM2YulTGlITdVNmJpeh4WkvJWr4ako6Trjx1JKyR0vpZpDEyhE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327277344613.1691464561734; Fri, 26 Feb 2021 00:14:37 -0800 (PST) Received: from localhost ([::1]:50460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYGh-0002Sk-7d for importer@patchew.org; Fri, 26 Feb 2021 03:14:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY85-0001nT-9W for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:43 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:54857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY81-00047W-1T for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:39 -0500 Received: by mail-wm1-x331.google.com with SMTP id u187so4748368wmg.4 for ; Fri, 26 Feb 2021 00:05:36 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ycz7tMt4XNpb7H0VgGp30K9fstHZJN03neY0qoiIQu0=; b=EpzvkFknQfEv4DPn+lmkVVsuscXs0RhCx0aLXB+w9UP5J7YyrdAjEwT1aWghYXYPGe grlOxXmKBKhKs1NkoSt9j3b11epk0T8unzb4ns+80KDEB5Wn8fWrTpteQ3dlGgCqIFts kWlSQI1PM3ygMQDXtKXjFgZUhmbZU/kEWRtGNGZP9Qetzv9bACqJ9OvilkIhkp1H/Ki5 BIh5CKq0qq+dLR9nNpRbXrH+xtIrXBjVFtUqVSAViBK3kIR7+Kti79MkJlHWUPaSrdV8 jF3FiSLgpG9zDxEsnGKMYtQvPz3JVUwHofm/f29TCC0LDFl5H1eo/gD1/62wwMOn+0Pq 3oRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ycz7tMt4XNpb7H0VgGp30K9fstHZJN03neY0qoiIQu0=; b=V8OMDsN6dumdWqbb/MSBLEk2vgXi1ZPZQJFbyuyDlLcx9HP5gfvHB5Bylt+gyIS51F IgFulzLQxm+tnXtm1NwjbRf2oRoMgS/nqcHJA6f+uOPN39F5dSQ04nbgQwBxg2pVBVPn 2E/qhrpvlTOJUz6gV0jaSpAHdJW/f30kDV47JUIzHKi7AgIJKKf3pBU0YDCz2U4k2zXr Ei3XpFby6AcYCII6OqPVei2M53GM81RGRANEgAd/kRIBOodHvFyx8MU837TKBVkSYZWh xaHubPW1749FbvGUJ5v5iLka4IT05LGBoo2dGafWVgtCU+cf/35hiZFuSDSrLvwgtUE5 QNHQ== X-Gm-Message-State: AOAM533VrR/GOB6ofNJxHJYPFJ/TTT5FW8xyInZSO00cPeNA+DAr6I3y FbDVV5Z1riICSWL/hHQ5NBZVTsSK6TA= X-Google-Smtp-Source: ABdhPJzKQaFJD/90C9sL+u9QbRQ/BJBop87yx0fBYvmRa6k88XQZwA2QxPXgnTmW4T6HvimAaK4Fkg== X-Received: by 2002:a1c:7fd8:: with SMTP id a207mr1523374wmd.40.1614326735610; Fri, 26 Feb 2021 00:05:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/29] scsi-disk: pass guest recoverable errors through even for rerror=stop Date: Fri, 26 Feb 2021 09:05:09 +0100 Message-Id: <20210226080526.651705-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x331.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Right now, recoverable sense values are only passed directly to the guest only for rerror=3Dreport. However, when rerror/werror are 'stop' we still don't want the host to be involved on every UNIT ATTENTION (especially considered that the QMP event will not have enough information to act on the report). Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 51 +++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 548a5297fa..a5a58d7db3 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -212,39 +212,44 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int = ret, bool acct_failed) } } =20 - action =3D blk_get_error_action(s->qdev.conf.blk, is_read, error); - if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { + /* + * Check whether the error has to be handled by the guest or should + * rather follow the rerror=3D/werror=3D settings. Guest-handled erro= rs + * are usually retried immediately, so do not post them to QMP and + * do not account them as failed I/O. + */ + if (req_has_sense && + scsi_sense_buf_is_guest_recoverable(r->req.sense, sizeof(r->req.se= nse))) { + action =3D BLOCK_ERROR_ACTION_REPORT; + acct_failed =3D false; + } else { + action =3D blk_get_error_action(s->qdev.conf.blk, is_read, error); + blk_error_action(s->qdev.conf.blk, action, is_read, error); + } + + switch (action) { + case BLOCK_ERROR_ACTION_REPORT: if (acct_failed) { block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct); } if (req_has_sense) { - /* A passthrough command has run and has produced sense data; = check - * whether the error has to be handled by the guest or should = rather - * pause the host. - */ - if (scsi_sense_buf_is_guest_recoverable(r->req.sense, sizeof(r= ->req.sense))) { - /* These errors are handled by guest. */ - sdc->update_sense(&r->req); - scsi_req_complete(&r->req, status); - return true; - } - } else { - if (status =3D=3D CHECK_CONDITION) { - scsi_req_build_sense(&r->req, sense); - } - scsi_req_complete(&r->req, status); + sdc->update_sense(&r->req); + } else if (status =3D=3D CHECK_CONDITION) { + scsi_req_build_sense(&r->req, sense); } - } + scsi_req_complete(&r->req, status); + return true; =20 - blk_error_action(s->qdev.conf.blk, action, is_read, error); - if (action =3D=3D BLOCK_ERROR_ACTION_IGNORE) { + case BLOCK_ERROR_ACTION_IGNORE: return false; - } =20 - if (action =3D=3D BLOCK_ERROR_ACTION_STOP) { + case BLOCK_ERROR_ACTION_STOP: scsi_req_retry(&r->req); + return true; + + default: + g_assert_not_reached(); } - return true; } =20 static bool scsi_disk_req_check_error(SCSIDiskReq *r, int ret, bool acct_f= ailed) --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327138; cv=none; d=zohomail.com; s=zohoarc; b=iw+yGdKKd4XDkgZ/vp0t32q9okY+YyMrxdbQQ3mup0E4eTXsQX+b39MJjA3FyjYGPATZgzp7r95cqkNo/mJfb5zG2D/29XK130Cfr0SjoPnOXomYm0KB3Blde+g4t0cNT40ZTuQX/a5qCYyMKYioR1vjiNbviLR51+b2SoztAXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327138; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6h5XOzhQAP4RyCZCnuUJCoageZdlc+jKm+5o9IKH9aI=; b=mJdnM9iepp8A/ZaCaKoaseJ0BvJXGz5GZEll1ej+EAuWVOcSaUuS1rsU4udsEmb18SuEX2AOoLqz4nl7qcWVh/2tTL5f4twthiyiY28tsJXSkzQuLS0/Zii7SiRqTLWYiY8xSPyYCjfQ+/K9G4Krb2k56PppXnY9TLtUuutWxdQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327138377756.3898042773003; Fri, 26 Feb 2021 00:12:18 -0800 (PST) Received: from localhost ([::1]:41992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYEQ-0007Tl-NE for importer@patchew.org; Fri, 26 Feb 2021 03:12:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY85-0001nU-9l for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:43 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:41621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY81-000486-K0 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:39 -0500 Received: by mail-wr1-x42f.google.com with SMTP id f12so3868261wrx.8 for ; Fri, 26 Feb 2021 00:05:37 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6h5XOzhQAP4RyCZCnuUJCoageZdlc+jKm+5o9IKH9aI=; b=Qr/+/nF+BF+hqjjSwez3o5fzRkYE8W9cUNb7oZMR/M0DCJfvWB3AvOjEY8gwLPwoh4 W5ib+WI2yZbNdR1T8+ahXMPFiljmcA7yv5I4/rXMpjtjG2AfoxntMSYV4C5uRMknkHkq 6Y9NESa7TwSeaF2vXsqyq90CjD/rXT8a+mGWmDAj8yMmaCO3AgNWJxG8Ti2m1hIxfsYO 5U1R8fNpEs3SWLhcI5LjrL2fpJVbfNpMiorEqhZa7tRjZOB1QcjK0rYYeiwgjHchAdva NEpWZ/OJTP1LMGXXOx0isJL9MOUVJ60RppEgBaFP3GNnSvtK9OIl6Q3pcf3WgjCoNlt8 lbWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6h5XOzhQAP4RyCZCnuUJCoageZdlc+jKm+5o9IKH9aI=; b=RbzL85vkodFn8jjtUZr7TIGIxhG3uXb+w2E8uBhSQlT58W9UXVJXAqUXlfEshicb/a 2Gg0UeVm0SQaE1H73anST8a7FN77sspG1HgB+vjAGATbyyUKjnLalqqrbbn6SVK/0jZt pY/P7OV6UfqSCmVLj5t+cbm1AMeYwmwLfunKqTrT7rwlo8PyEPk2NzPenVwy1mHz6n6Y Uvhgq6y/FYYimc/qrrZkVaodp97Aoa1RyGJDRmGDmFbw+NvM5FaSVtzmMLYFECS9ZP99 CklIprETFiEUyuDcyUXJGtRmksM8tMSSl9mpcpyplPuRtrsZtt74iLeKothfOwbWvAHy s5kA== X-Gm-Message-State: AOAM532K4Eav02btApcy2feR5d4kBJTx7NQ4mJMmG8wTJkJZ9/LEe0yu DF5pjHbPdXJb6Xr1Rcwylj150yYIt1Q= X-Google-Smtp-Source: ABdhPJyCRvAQpOrkQ2m0MjIu3yfh/Si/6mmAtDN0dQQv+3kPmqYrgFKfG7czVbanMmjikJGE0Wsy8Q== X-Received: by 2002:a5d:6205:: with SMTP id y5mr1845632wru.238.1614326736354; Fri, 26 Feb 2021 00:05:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/29] scsi: drop 'result' argument from command_complete callback Date: Fri, 26 Feb 2021 09:05:10 +0100 Message-Id: <20210226080526.651705-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hannes Reinecke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Hannes Reinecke The command complete callback has a SCSIRequest as the first argument, and the status field of that structure is identical to the 'status' argument. So drop the argument from the callback. Signed-off-by: Hannes Reinecke Message-Id: <20201116184041.60465-3-hare@suse.de> Signed-off-by: Paolo Bonzini --- hw/scsi/esp-pci.c | 5 ++--- hw/scsi/esp.c | 7 +++---- hw/scsi/lsi53c895a.c | 6 +++--- hw/scsi/megasas.c | 6 ++---- hw/scsi/mptsas.c | 5 +++-- hw/scsi/scsi-bus.c | 2 +- hw/scsi/spapr_vscsi.c | 12 ++++++------ hw/scsi/virtio-scsi.c | 5 ++--- hw/scsi/vmw_pvscsi.c | 4 ++-- hw/usb/dev-storage.c | 6 +++--- hw/usb/dev-uas.c | 7 +++---- include/hw/scsi/esp.h | 2 +- include/hw/scsi/scsi.h | 2 +- 13 files changed, 32 insertions(+), 37 deletions(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 2ce96dc56e..4d7c2cab56 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -329,13 +329,12 @@ static const VMStateDescription vmstate_esp_pci_scsi = =3D { } }; =20 -static void esp_pci_command_complete(SCSIRequest *req, uint32_t status, - size_t resid) +static void esp_pci_command_complete(SCSIRequest *req, size_t resid) { ESPState *s =3D req->hba_private; PCIESPState *pci =3D container_of(s, PCIESPState, esp); =20 - esp_command_complete(req, status, resid); + esp_command_complete(req, resid); pci->dma_regs[DMA_WBC] =3D 0; pci->dma_regs[DMA_STAT] |=3D DMA_STAT_DONE; } diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index b84e0fe33e..93d9c9c7b9 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -485,8 +485,7 @@ static void esp_report_command_complete(ESPState *s, ui= nt32_t status) } } =20 -void esp_command_complete(SCSIRequest *req, uint32_t status, - size_t resid) +void esp_command_complete(SCSIRequest *req, size_t resid) { ESPState *s =3D req->hba_private; =20 @@ -495,11 +494,11 @@ void esp_command_complete(SCSIRequest *req, uint32_t = status, * interrupt has been handled. */ trace_esp_command_complete_deferred(); - s->deferred_status =3D status; + s->deferred_status =3D req->status; s->deferred_complete =3D true; return; } - esp_report_command_complete(s, status); + esp_report_command_complete(s, req->status); } =20 void esp_transfer_data(SCSIRequest *req, uint32_t len) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 7d13c7dc1c..a4e58580e4 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -787,14 +787,14 @@ static int lsi_queue_req(LSIState *s, SCSIRequest *re= q, uint32_t len) } =20 /* Callback to indicate that the SCSI layer has completed a command. */ -static void lsi_command_complete(SCSIRequest *req, uint32_t status, size_t= resid) +static void lsi_command_complete(SCSIRequest *req, size_t resid) { LSIState *s =3D LSI53C895A(req->bus->qbus.parent); int out; =20 out =3D (s->sstat1 & PHASE_MASK) =3D=3D PHASE_DO; - trace_lsi_command_complete(status); - s->status =3D status; + trace_lsi_command_complete(req->status); + s->status =3D req->status; s->command_complete =3D 2; if (s->waiting && s->dbc !=3D 0) { /* Raise phase mismatch for short transfers. */ diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 5bfc92fca1..8f2389d2c6 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1852,13 +1852,12 @@ static void megasas_xfer_complete(SCSIRequest *req,= uint32_t len) } } =20 -static void megasas_command_complete(SCSIRequest *req, uint32_t status, - size_t resid) +static void megasas_command_complete(SCSIRequest *req, size_t resid) { MegasasCmd *cmd =3D req->hba_private; uint8_t cmd_status =3D MFI_STAT_OK; =20 - trace_megasas_command_complete(cmd->index, status, resid); + trace_megasas_command_complete(cmd->index, req->status, resid); =20 if (req->io_canceled) { return; @@ -1873,7 +1872,6 @@ static void megasas_command_complete(SCSIRequest *req= , uint32_t status, return; } } else { - req->status =3D status; trace_megasas_scsi_complete(cmd->index, req->status, cmd->iov_size, req->cmd.xfer); if (req->status !=3D GOOD) { diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index f86616544b..7416e78706 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -1133,7 +1133,7 @@ static QEMUSGList *mptsas_get_sg_list(SCSIRequest *sr= eq) } =20 static void mptsas_command_complete(SCSIRequest *sreq, - uint32_t status, size_t resid) + size_t resid) { MPTSASRequest *req =3D sreq->hba_private; MPTSASState *s =3D req->dev; @@ -1143,7 +1143,8 @@ static void mptsas_command_complete(SCSIRequest *sreq, hwaddr sense_buffer_addr =3D req->dev->sense_buffer_high_addr | req->scsi_io.SenseBufferLowAddr; =20 - trace_mptsas_command_complete(s, req->scsi_io.MsgContext, status, resi= d); + trace_mptsas_command_complete(s, req->scsi_io.MsgContext, + sreq->status, resid); =20 sense_len =3D scsi_req_get_sense(sreq, sense_buf, SCSI_SENSE_BUF_SIZE); if (sense_len > 0) { diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index c349fb7f2d..dc4141ec8d 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1483,7 +1483,7 @@ void scsi_req_complete(SCSIRequest *req, int status) =20 scsi_req_ref(req); scsi_req_dequeue(req); - req->bus->info->complete(req, req->status, req->resid); + req->bus->info->complete(req, req->resid); =20 /* Cancelled requests might end up being completed instead of cancelle= d */ notifier_list_notify(&req->cancel_notifiers, req); diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index 4aa0224c47..ca5c13c4a8 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -551,19 +551,19 @@ static void vscsi_transfer_data(SCSIRequest *sreq, ui= nt32_t len) } =20 /* Callback to indicate that the SCSI layer has completed a transfer. */ -static void vscsi_command_complete(SCSIRequest *sreq, uint32_t status, siz= e_t resid) +static void vscsi_command_complete(SCSIRequest *sreq, size_t resid) { VSCSIState *s =3D VIO_SPAPR_VSCSI_DEVICE(sreq->bus->qbus.parent); vscsi_req *req =3D sreq->hba_private; int32_t res_in =3D 0, res_out =3D 0; =20 - trace_spapr_vscsi_command_complete(sreq->tag, status, req); + trace_spapr_vscsi_command_complete(sreq->tag, sreq->status, req); if (req =3D=3D NULL) { fprintf(stderr, "VSCSI: Can't find request for tag 0x%x\n", sreq->= tag); return; } =20 - if (status =3D=3D CHECK_CONDITION) { + if (sreq->status =3D=3D CHECK_CONDITION) { req->senselen =3D scsi_req_get_sense(req->sreq, req->sense, sizeof(req->sense)); trace_spapr_vscsi_command_complete_sense_data1(req->senselen, @@ -574,8 +574,8 @@ static void vscsi_command_complete(SCSIRequest *sreq, u= int32_t status, size_t re req->sense[12], req->sense[13], req->sense[14], req->sense= [15]); } =20 - trace_spapr_vscsi_command_complete_status(status); - if (status =3D=3D 0) { + trace_spapr_vscsi_command_complete_status(sreq->status); + if (sreq->status =3D=3D 0) { /* We handle overflows, not underflows for normal commands, * but hopefully nobody cares */ @@ -585,7 +585,7 @@ static void vscsi_command_complete(SCSIRequest *sreq, u= int32_t status, size_t re res_in =3D req->data_len; } } - vscsi_send_rsp(s, req, status, res_in, res_out); + vscsi_send_rsp(s, req, sreq->status, res_in, res_out); vscsi_put_req(req); } =20 diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 99ff261cea..358c0e70b0 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -500,8 +500,7 @@ static void virtio_scsi_complete_cmd_req(VirtIOSCSIReq = *req) virtio_scsi_complete_req(req); } =20 -static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status, - size_t resid) +static void virtio_scsi_command_complete(SCSIRequest *r, size_t resid) { VirtIOSCSIReq *req =3D r->hba_private; uint8_t sense[SCSI_SENSE_BUF_SIZE]; @@ -513,7 +512,7 @@ static void virtio_scsi_command_complete(SCSIRequest *r= , uint32_t status, } =20 req->resp.cmd.response =3D VIRTIO_SCSI_S_OK; - req->resp.cmd.status =3D status; + req->resp.cmd.status =3D r->status; if (req->resp.cmd.status =3D=3D GOOD) { req->resp.cmd.resid =3D virtio_tswap32(vdev, resid); } else { diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index a63d25de48..0da378ed50 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -511,7 +511,7 @@ pvscsi_write_sense(PVSCSIRequest *r, uint8_t *sense, in= t len) } =20 static void -pvscsi_command_complete(SCSIRequest *req, uint32_t status, size_t resid) +pvscsi_command_complete(SCSIRequest *req, size_t resid) { PVSCSIRequest *pvscsi_req =3D req->hba_private; PVSCSIState *s; @@ -528,7 +528,7 @@ pvscsi_command_complete(SCSIRequest *req, uint32_t stat= us, size_t resid) pvscsi_req->cmp.hostStatus =3D BTSTAT_DATARUN; } =20 - pvscsi_req->cmp.scsiStatus =3D status; + pvscsi_req->cmp.scsiStatus =3D req->status; if (pvscsi_req->cmp.scsiStatus =3D=3D CHECK_CONDITION) { uint8_t sense[SCSI_SENSE_BUF_SIZE]; int sense_len =3D diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index c49e8b819e..a5f76fc001 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -277,17 +277,17 @@ static void usb_msd_transfer_data(SCSIRequest *req, u= int32_t len) } } =20 -static void usb_msd_command_complete(SCSIRequest *req, uint32_t status, si= ze_t resid) +static void usb_msd_command_complete(SCSIRequest *req, size_t resid) { MSDState *s =3D DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent); USBPacket *p =3D s->packet; =20 - trace_usb_msd_cmd_complete(status, req->tag); + trace_usb_msd_cmd_complete(req->status, req->tag); =20 s->csw.sig =3D cpu_to_le32(0x53425355); s->csw.tag =3D cpu_to_le32(req->tag); s->csw.residue =3D cpu_to_le32(s->data_len); - s->csw.status =3D status !=3D 0; + s->csw.status =3D req->status !=3D 0; =20 if (s->packet) { if (s->data_len =3D=3D 0 && s->mode =3D=3D USB_MSDM_DATAOUT) { diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index a51402bc0b..d2bd85d3f6 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -598,17 +598,16 @@ static void usb_uas_scsi_transfer_data(SCSIRequest *r= , uint32_t len) } } =20 -static void usb_uas_scsi_command_complete(SCSIRequest *r, - uint32_t status, size_t resid) +static void usb_uas_scsi_command_complete(SCSIRequest *r, size_t resid) { UASRequest *req =3D r->hba_private; =20 - trace_usb_uas_scsi_complete(req->uas->dev.addr, req->tag, status, resi= d); + trace_usb_uas_scsi_complete(req->uas->dev.addr, req->tag, r->status, r= esid); req->complete =3D true; if (req->data) { usb_uas_complete_data_packet(req); } - usb_uas_queue_sense(req, status); + usb_uas_queue_sense(req, r->status); scsi_req_unref(req->req); } =20 diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h index 60cc3047a5..d8a6263c13 100644 --- a/include/hw/scsi/esp.h +++ b/include/hw/scsi/esp.h @@ -151,7 +151,7 @@ struct SysBusESPState { =20 void esp_dma_enable(ESPState *s, int irq, int level); void esp_request_cancelled(SCSIRequest *req); -void esp_command_complete(SCSIRequest *req, uint32_t status, size_t resid); +void esp_command_complete(SCSIRequest *req, size_t resid); void esp_transfer_data(SCSIRequest *req, uint32_t len); void esp_hard_reset(ESPState *s); uint64_t esp_reg_read(ESPState *s, uint32_t saddr); diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index a8ef59c0f4..5d992e6e1d 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -123,7 +123,7 @@ struct SCSIBusInfo { int (*parse_cdb)(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf, void *hba_private); void (*transfer_data)(SCSIRequest *req, uint32_t arg); - void (*complete)(SCSIRequest *req, uint32_t arg, size_t resid); + void (*complete)(SCSIRequest *req, size_t resid); void (*cancel)(SCSIRequest *req); void (*change)(SCSIBus *bus, SCSIDevice *dev, SCSISense sense); QEMUSGList *(*get_sg_list)(SCSIRequest *req); --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614328298; cv=none; d=zohomail.com; s=zohoarc; b=UuzVdl4KjY0x+6TtunjZI55gcImhzCk+NIMKAdc/ZKWV7KWNc8ELHdklfzuok6zpA8u1zxeA05ffUXBVe9pZ6AxaUOMRWzYzXbW1s8cNhSaWdvu0Jv1oJ/c3hnorKPj2uja0y6SoOX39P8RN/0Suz9uzEBnPBKWYtF30rHyHr7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614328298; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Dyyp+0lRQyqt+67PKzEpz6dldpSC1ghMN214ADCGSKk=; b=D12yqaQP76lmkyf7XlCi7qEPXxq97+ctbZfMUt5PsQ4tpzn1OqvM354bMCHNYpeaNMwfOWFHb9r4QdmsPcvMAeHTT23cPtZafc9zg+II78KOq/XSa6lXow1LDZ2HdAEAPd8P9Zpz3aUHyCJDGM8RR4r3SXjb0sZwl73Fp6x3c9Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614328298544187.76187164012447; Fri, 26 Feb 2021 00:31:38 -0800 (PST) Received: from localhost ([::1]:54858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYXB-00089x-Av for importer@patchew.org; Fri, 26 Feb 2021 03:31:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY87-0001pc-Ic for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:45 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44124) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY82-00048a-C8 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:41 -0500 Received: by mail-wr1-x432.google.com with SMTP id h98so7647470wrh.11 for ; Fri, 26 Feb 2021 00:05:37 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dyyp+0lRQyqt+67PKzEpz6dldpSC1ghMN214ADCGSKk=; b=dksOwJZLQ6LVquCjMyaVnwisMnZhvD0KEgD08LSdGyd+sD0LLCUX38FWMyS6e8nxe4 5IBITAhltrY8Fls4/uitHdfCzzUK5OiuKrK6ayFuSkAgIH8GtBDTbdJxqfNbwJ8YUsfU 6OTokoMRgB9PANBFhZE6bIAn4bdsPAPMnM137HSaGim0/kEX2vHMRHkeLSnv0BhPSKVF t1i4qgGj3I0A6p+hJJnraN8TU474pviVvuzhHAbYgw0zakuNMeq0I+0isWk7Qty/920c UdDtcK8wI17iygLBUzRPvGqSdgagwRx0ule4uOoRi8QL2+mIqgqb/zqMjKBz9cvxdSFU FB2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Dyyp+0lRQyqt+67PKzEpz6dldpSC1ghMN214ADCGSKk=; b=kOXeHboQ8IQIdfRnyYho3REKtU3mydMzLxecZ0/bzfsJQGV40tCf2Lsqpl4KIPIbMp UlWQMK2EgQXzawTVPK/yzC0CobFJOa4Lva4Wopf56fAeYnlz5z/KMwu5e3lMNdNUYMsc yQlj+XE23ZuNhPwxuUOZbXAFbEVyNHBkuVrJmc6zexnS7agduJGx01ahDCjvNZsCgs8J cAc22p8UZns2KKPHYd6fBLSEOL4rs6N/DStujLgcWN3RDiOffi/gTGAqXd4emVdROkkQ NA3fGpwWMKDcfqXsZJGt5gtOAgo85d4pm4GJv27zPMe5+wg5xExS4L+4TUqkIyILxtb9 Azhg== X-Gm-Message-State: AOAM530ArZoLh/yLutJCGUOVWMkeAyCEeWX6glQzDLNtCPji+TMLAkET c6ktf/gD1ct/xHlSyRgJ3OLuTUT2YhU= X-Google-Smtp-Source: ABdhPJy8QceMvn1c/4Tu9FOkz5UPzd1Ix3XSlMcAX960BNqFSq7lMUM+zi9cR+LfXTQQ43nRlDo0CQ== X-Received: by 2002:a5d:400f:: with SMTP id n15mr1795406wrp.89.1614326737009; Fri, 26 Feb 2021 00:05:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/29] char: don't fail when client is not connected Date: Fri, 26 Feb 2021 09:05:11 +0100 Message-Id: <20210226080526.651705-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Pavel Dovgalyuk This patch checks that ioc is not null before using it in tcp socket tcp_chr_add_watch function. The failure occurs in replay mode of the execution, when monitor and serial port are tcp servers, and there are no clients connected to them: -monitor tcp:127.0.0.1:8081,server,nowait -serial tcp:127.0.0.1:8082,server,nowait Signed-off-by: Pavel Dovgalyuk Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <161284977034.741841.12565530923825663110.stgit@pasha-ThinkPad-= X280> Signed-off-by: Paolo Bonzini --- chardev/char-socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 9061981f6d..b7863b8aae 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -387,6 +387,9 @@ static ssize_t tcp_chr_recv(Chardev *chr, char *buf, si= ze_t len) static GSource *tcp_chr_add_watch(Chardev *chr, GIOCondition cond) { SocketChardev *s =3D SOCKET_CHARDEV(chr); + if (!s->ioc) { + return NULL; + } return qio_channel_create_watch(s->ioc, cond); } =20 --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614328131; cv=none; d=zohomail.com; s=zohoarc; b=UIDZf+hcCRBNKo/8d4692eXcgVHChiq0cgPHos4M1SCT3N61D1dvzwPi9pLroWmYkupdWrsms9O3KKVDmKf9dXeFRCHawlMzre8FBK6WQnlQPn1ARJHhoAdOiGxpDzitiZdQGVySaLdORDoV1jgVW+IvAQ4OxkohLjPYC4hXRds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614328131; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rrqK8m5bH0TYeFmkYwQErUjHLXqopQlqqp5xtPJzQyI=; b=MWTqZ/rXv+9FKgKe97q0mjeRUfWU5W8P/PvnOSMmu+l18uoegFYFsgTwMigWnHYw/7yPQZdW93/10iPZ8fN6bLfmx3i/QYiNnf4b0uweTQGDFKLeoGEMHnQwyCujQrv0GdYiJP5qyLBInUD1HjAxXS2Kx1HfDoWhz5nneQo295w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614328131974830.6450517729622; Fri, 26 Feb 2021 00:28:51 -0800 (PST) Received: from localhost ([::1]:50754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYUV-0006KT-0K for importer@patchew.org; Fri, 26 Feb 2021 03:28:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY85-0001na-9p for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:43 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:44126) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY83-00049I-22 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:40 -0500 Received: by mail-wr1-x434.google.com with SMTP id h98so7647501wrh.11 for ; Fri, 26 Feb 2021 00:05:38 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rrqK8m5bH0TYeFmkYwQErUjHLXqopQlqqp5xtPJzQyI=; b=rOYv8MrCBAz+vz14EQk0jDWqu39D/9qOs+1eIA/tYQFFMhgkC2jtiay7pLAPlh50Pr JfJ9m4bea3ph6tAfgxiBgNJZEfVqPAA8dzUvSnxYG/1UyA6EmPPHhcRlj7/fTtNEMm40 u54RHupErzrtybO6a62/FifbUmwZzlZsgYEcpqwFpkhkC5HJ12Yi95nzMyfmIlasGNTb Q+sRS+z8iPY4GwLuaFWxpe9xCBzR0BMjBxkVR9jtuoM0lFPBt6hgxcVeCqhhO4oO9lEq 9TK9Eqm961USLDxyLwjEVHAQ1cloTu6HqF3cNSdy6j9I1IRVV+BWCGSCBckGK5w0Pidd 6Q2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rrqK8m5bH0TYeFmkYwQErUjHLXqopQlqqp5xtPJzQyI=; b=A6NTDC0RgxBYwQb4asH2MCPi8s0D5pPgMV06W5oiTvEXNkaGhTJizjc+R4yaA82l3U QnNjRFm4y+kbK7mRwTQ/F5ZG+ahgLuaW+oNDadyqjWw/t4zx/DTa8zil4Wh2BXEji0YB OIbS7+X8vXg2A25sDsOiPkcB8znr0V/4r+OYlTfsrXnQHoCE0nETuFvGsn661Ol5NONz J0INDUQGYTP7g3fs3xSr5awtZXSl8v9ARXLEskk1drbGWDL4cgwjJtwQwM6dPnKG6Jdd qMvsLqw4eC8pwJCY6SASvnAE7VRBxPbgRZWi9Li5fo0fFtlXokxoEOs5KIlptgKrX559 NeKA== X-Gm-Message-State: AOAM531Fxn8YDo0EIhsMv/1bhQTasuI/kadHFrl2359iYLBERHMd6bgA GrlEf3ke64NcwmAnlDYH7CHHiDNfkaY= X-Google-Smtp-Source: ABdhPJyUdvyfznSinISbp++dNZvsH8Uw7nHNL72nq57ltGQYsYaDKqFTN1+7Yimz+nfb3JieNnAKEg== X-Received: by 2002:adf:fbce:: with SMTP id d14mr1779898wrs.44.1614326737646; Fri, 26 Feb 2021 00:05:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/29] gdbstub: use preferred boolean option syntax Date: Fri, 26 Feb 2021 09:05:12 +0100 Message-Id: <20210226080526.651705-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210216191027.595031-2-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- gdbstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdbstub.c b/gdbstub.c index 759bb00bcf..3ee40479b6 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -3505,7 +3505,7 @@ int gdbserver_start(const char *device) if (strstart(device, "tcp:", NULL)) { /* enforce required TCP attributes */ snprintf(gdbstub_device_name, sizeof(gdbstub_device_name), - "%s,nowait,nodelay,server", device); + "%s,wait=3Doff,delay=3Doff,server=3Don", device); device =3D gdbstub_device_name; } #ifndef _WIN32 --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327514; cv=none; d=zohomail.com; s=zohoarc; b=Mag8QzwjMtdRPdYW3EbES9LIsPO/j0o6iEvXaHGlnRcVA8kcCO6iDEWwDf3oJIk/Nl7XcTX87+HV8wtJ3mRG95qBqWNHOghJ3Fg8BrbGOGteGc+zvl+kGgvaIIj6n7ofEtmdOLFihIw/LSc05pkyyed4HAbD3UXH5ELBgt4CsPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327514; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=of0bpl2rGPvoAK4bpTeHOSzNLa0Pb2YOCS2cQuRXtyU=; b=Xnorq5SlJJS9ZepI++9FYjjEgdh5sQrKREHiYOq3DUixbPxNbFqpgsdCglLCbcE7yiITzkSD69YVD8n6b4ioBOCDJMQuBtfT0KiGIsJfVPsZZyx9q8lBKcjUKUBpuOpkn+LM4oaCqE2jBzC+ydZf7zIqPdYyAX+/A/cS0muolyU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327514481686.5338603721906; Fri, 26 Feb 2021 00:18:34 -0800 (PST) Received: from localhost ([::1]:58856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYKX-00064H-Da for importer@patchew.org; Fri, 26 Feb 2021 03:18:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY87-0001pv-RK for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:45 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:36517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY85-00049Z-1z for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:43 -0500 Received: by mail-wr1-x42e.google.com with SMTP id u14so7679042wri.3 for ; Fri, 26 Feb 2021 00:05:39 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=of0bpl2rGPvoAK4bpTeHOSzNLa0Pb2YOCS2cQuRXtyU=; b=N3mgSLqUWOIC1HzXSsM5bBZS8//cgf8CER8Me5gcwyoX6cXFW396l0CLPMjoGS0/kp HEs6aQTB2u9Gttqkm0Wit2CBln4/A9E/Re7YB3utpNVGgIFp2FYtIBXcmK4WXoKQfl6R y8x2yvzwKqmYH+m76Iau2rcd5fZepQeKaL4DTJxPMpaR2c8QOE+98honMoImptLJTaaq iKqV8JIVWVJu8e8cBTdtV3KidT1cHl1zNvesUs1nA9iUK/gV0mJhicArWGHV+aX/ElVW BLrCBHz2nq4GQsiV5V+bbM9qz+xWLY2TW+Qg25NppJ9SxYZCpH4pXJn3Xi3zn3wSLHX/ NZWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=of0bpl2rGPvoAK4bpTeHOSzNLa0Pb2YOCS2cQuRXtyU=; b=Y5GAD0v8i1d6JcDB9l/7y39w9WNfT/jC6O8sG8VyzG9jwmB1/OOBui8eZY2zm48KOU 4dL1+/+XSTZRaGi27QdzgdXlCJe/t9cGunF2sWFdV9BL2pmA+mrRwjW0OpUXNup/rM4Q 928gD46GZtKYL97TXnUiPXzp4VJbr13rjsG1HIglrnAPYF7dYL6IA4pGCuUSaQPZPTVd JMUVkieOEQfoxjh76KMzcdbFYjP1CszfJXVoUcnA+WHpCyF38yS2oKjszWHA5KHcF10K DJBmbQsyAbJ5JDns0jUGahjTF50/0y2QESHstWsPDeE4z/bjc0BKPtM6eQv+q9leQ1pE 0JcQ== X-Gm-Message-State: AOAM530enLzxL2jZMu8zCHMgGYGopdzqzyXBUicCDF5gWiOb6iUWZeZX 56oFmVXBhXxtdRvorHXgpom7p4ZfMj4= X-Google-Smtp-Source: ABdhPJxwG9txx8zqEBfb+J7+Uihi+pyQn9SqqNxxz2LYpx8dQN4/IuvmAkMGAcEzqdPhRqR42a0zJw== X-Received: by 2002:a5d:4649:: with SMTP id j9mr1879357wrs.302.1614326738289; Fri, 26 Feb 2021 00:05:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/29] qemu-options: update to show preferred boolean syntax for -chardev Date: Fri, 26 Feb 2021 09:05:13 +0100 Message-Id: <20210226080526.651705-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The preferred syntax is to use "foo=3Don|off", rather than a bare "foo" or "nofoo". Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210216191027.595031-3-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- qemu-options.hx | 78 ++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 6c34c7050f..972ef412cc 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3032,13 +3032,13 @@ DEFHEADING(Character device options:) DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, "-chardev help\n" "-chardev null,id=3Did[,mux=3Don|off][,logfile=3DPATH][,logappend=3Don= |off]\n" - "-chardev socket,id=3Did[,host=3Dhost],port=3Dport[,to=3Dto][,ipv4][,i= pv6][,nodelay][,reconnect=3Dseconds]\n" - " [,server][,nowait][,telnet][,websocket][,reconnect=3Dseconds= ][,mux=3Don|off]\n" + "-chardev socket,id=3Did[,host=3Dhost],port=3Dport[,to=3Dto][,ipv4=3Do= n|off][,ipv6=3Don|off][,delay=3Don|off][,reconnect=3Dseconds]\n" + " [,server=3Don|off][,wait=3Don|off][,telnet=3Don|off][,websoc= ket=3Don|off][,reconnect=3Dseconds][,mux=3Don|off]\n" " [,logfile=3DPATH][,logappend=3Don|off][,tls-creds=3DID][,tls= -authz=3DID] (tcp)\n" - "-chardev socket,id=3Did,path=3Dpath[,server][,nowait][,telnet][,webso= cket][,reconnect=3Dseconds]\n" + "-chardev socket,id=3Did,path=3Dpath[,server=3Don|off][,wait=3Don|off]= [,telnet=3Don|off][,websocket=3Don|off][,reconnect=3Dseconds]\n" " [,mux=3Don|off][,logfile=3DPATH][,logappend=3Don|off][,abstr= act=3Don|off][,tight=3Don|off] (unix)\n" "-chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr= ]\n" - " [,localport=3Dlocalport][,ipv4][,ipv6][,mux=3Don|off]\n" + " [,localport=3Dlocalport][,ipv4=3Don|off][,ipv6=3Don|off][,mu= x=3Don|off]\n" " [,logfile=3DPATH][,logappend=3Don|off]\n" "-chardev msmouse,id=3Did[,mux=3Don|off][,logfile=3DPATH][,logappend= =3Don|off]\n" "-chardev vc,id=3Did[[,width=3Dwidth][,height=3Dheight]][[,cols=3Dcols= ][,rows=3Drows]]\n" @@ -3148,21 +3148,21 @@ The available backends are: A void device. This device will not emit any data, and will drop any data it receives. The null backend does not take any options. =20 -``-chardev socket,id=3Did[,TCP options or unix options][,server][,nowait][= ,telnet][,websocket][,reconnect=3Dseconds][,tls-creds=3Did][,tls-authz=3Did= ]`` +``-chardev socket,id=3Did[,TCP options or unix options][,server=3Don|off][= ,wait=3Don|off][,telnet=3Don|off][,websocket=3Don|off][,reconnect=3Dseconds= ][,tls-creds=3Did][,tls-authz=3Did]`` Create a two-way stream socket, which can be either a TCP or a unix socket. A unix socket will be created if ``path`` is specified. Behaviour is undefined if TCP options are specified for a unix socket. =20 - ``server`` specifies that the socket shall be a listening socket. + ``server=3Don|off`` specifies that the socket shall be a listening soc= ket. =20 - ``nowait`` specifies that QEMU should not block waiting for a client + ``wait=3Don|off`` specifies that QEMU should not block waiting for a c= lient to connect to a listening socket. =20 - ``telnet`` specifies that traffic on the socket should interpret + ``telnet=3Don|off`` specifies that traffic on the socket should interp= ret telnet escape sequences. =20 - ``websocket`` specifies that the socket uses WebSocket protocol for + ``websocket=3Don|off`` specifies that the socket uses WebSocket protoc= ol for communication. =20 ``reconnect`` sets the timeout for reconnecting on non-server @@ -3183,7 +3183,7 @@ The available backends are: =20 TCP and unix socket options are given below: =20 - ``TCP options: port=3Dport[,host=3Dhost][,to=3Dto][,ipv4][,ipv6][,node= lay]`` + ``TCP options: port=3Dport[,host=3Dhost][,to=3Dto][,ipv4=3Don|off][,ip= v6=3Don|off][,delay=3Don|off]`` ``host`` for a listening socket specifies the local address to be bound. For a connecting socket species the remote host to connect to. ``host`` is optional for listening sockets. If not @@ -3199,21 +3199,21 @@ The available backends are: bind to subsequent ports up to and including ``to`` until it succeeds. ``to`` must be specified as a port number. =20 - ``ipv4`` and ``ipv6`` specify that either IPv4 or IPv6 must be - used. If neither is specified the socket may use either - protocol. + ``ipv4=3Don|off`` and ``ipv6=3Don|off`` specify that either IPv4 + or IPv6 must be used. If neither is specified the socket may + use either protocol. =20 - ``nodelay`` disables the Nagle algorithm. + ``delay=3Don|off`` disables the Nagle algorithm. =20 ``unix options: path=3Dpath[,abstract=3Don|off][,tight=3Don|off]`` ``path`` specifies the local path of the unix socket. ``path`` is required. - ``abstract`` specifies the use of the abstract socket namespace, + ``abstract=3Don|off`` specifies the use of the abstract socket nam= espace, rather than the filesystem. Optional, defaults to false. - ``tight`` sets the socket length of abstract sockets to their mini= mum, + ``tight=3Don|off`` sets the socket length of abstract sockets to t= heir minimum, rather than the full sun_path length. Optional, defaults to true. =20 -``-chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr][,= localport=3Dlocalport][,ipv4][,ipv6]`` +``-chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr][,= localport=3Dlocalport][,ipv4=3Don|off][,ipv6=3Don|off]`` Sends all traffic from the guest to a remote host over UDP. =20 ``host`` specifies the remote host to connect to. If not specified @@ -3228,7 +3228,7 @@ The available backends are: ``localport`` specifies the local port to bind to. If not specified any available local port will be used. =20 - ``ipv4`` and ``ipv6`` specify that either IPv4 or IPv6 must be used. + ``ipv4=3Don|off`` and ``ipv6=3Don|off`` specify that either IPv4 or IP= v6 must be used. If neither is specified the device may use either protocol. =20 ``-chardev msmouse,id=3Did`` @@ -3592,30 +3592,30 @@ SRST ``telnet options:`` localhost 5555 =20 - ``tcp:[host]:port[,server][,nowait][,nodelay][,reconnect=3Dseconds]`` + ``tcp:[host]:port[,server=3Don|off][,wait=3Don|off][,delay=3Don|off][,= reconnect=3Dseconds]`` The TCP Net Console has two modes of operation. It can send the serial I/O to a location or wait for a connection from a location. By default the TCP Net Console is sent to host at the - port. If you use the server option QEMU will wait for a client + port. If you use the ``server=3Don`` option QEMU will wait for a c= lient socket application to connect to the port before continuing, - unless the ``nowait`` option was specified. The ``nodelay`` - option disables the Nagle buffering algorithm. The ``reconnect`` - option only applies if noserver is set, if the connection goes + unless the ``wait=3Don|off`` option was specified. The ``delay=3Do= n|off`` + option disables the Nagle buffering algorithm. The ``reconnect=3Do= n`` + option only applies if ``server=3Dno`` is set, if the connection g= oes down it will attempt to reconnect at the given interval. If host is omitted, 0.0.0.0 is assumed. Only one TCP connection at a - time is accepted. You can use ``telnet`` to connect to the + time is accepted. You can use ``telnet=3Don`` to connect to the corresponding character device. =20 ``Example to send tcp console to 192.168.0.2 port 4444`` -serial tcp:192.168.0.2:4444 =20 ``Example to listen and wait on port 4444 for connection`` - -serial tcp::4444,server + -serial tcp::4444,server=3Don =20 ``Example to not wait and listen on ip 192.168.0.100 port 4444`` - -serial tcp:192.168.0.100:4444,server,nowait + -serial tcp:192.168.0.100:4444,server=3Don,wait=3Doff =20 - ``telnet:host:port[,server][,nowait][,nodelay]`` + ``telnet:host:port[,server=3Don|off][,wait=3Don|off][,delay=3Don|off]`` The telnet protocol is used instead of raw tcp sockets. The options work the same as if you had specified ``-serial tcp``. The difference is that the port acts like a telnet server or @@ -3625,11 +3625,11 @@ SRST you do it with Control-] and then type "send break" followed by pressing the enter key. =20 - ``websocket:host:port,server[,nowait][,nodelay]`` + ``websocket:host:port,server=3Don[,wait=3Don|off][,delay=3Don|off]`` The WebSocket protocol is used instead of raw tcp socket. The port acts as a WebSocket server. Client mode is not supported. =20 - ``unix:path[,server][,nowait][,reconnect=3Dseconds]`` + ``unix:path[,server=3Don|off][,wait=3Don|off][,reconnect=3Dseconds]`` A unix domain socket is used instead of a tcp socket. The option works the same as if you had specified ``-serial tcp`` except the unix domain socket path is used for connections. @@ -3642,7 +3642,7 @@ SRST multiplex the monitor onto a telnet server listening on port 4444 would be: =20 - ``-serial mon:telnet::4444,server,nowait`` + ``-serial mon:telnet::4444,server=3Don,wait=3Doff`` =20 When the monitor is multiplexed to stdio in this way, Ctrl+C will not terminate QEMU any more but will be passed to the guest @@ -4815,11 +4815,11 @@ SRST primary: -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downs= cript=3D/etc/qemu-ifdown -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 - -chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server= ,nowait - -chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,serve= r,nowait - -chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,serve= r,nowait + -chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server= =3Don,wait=3Doff + -chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,serve= r=3Don,wait=3Doff + -chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,serve= r=3Don,wait=3Doff -chardev socket,id=3Dcompare0-0,host=3D3.3.3.3,port=3D9001 - -chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,se= rver,nowait + -chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,se= rver=3Don,wait=3Doff -chardev socket,id=3Dcompare_out0,host=3D3.3.3.3,port=3D9005 -object iothread,id=3Diothread1 -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev= =3Dmirror0 @@ -4841,13 +4841,13 @@ SRST primary: -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downs= cript=3D/etc/qemu-ifdown -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 - -chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server= ,nowait - -chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,serve= r,nowait - -chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,serve= r,nowait + -chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server= =3Don,wait=3Doff + -chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,serve= r=3Don,wait=3Doff + -chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,serve= r=3Don,wait=3Doff -chardev socket,id=3Dcompare0-0,host=3D3.3.3.3,port=3D9001 - -chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,se= rver,nowait + -chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,se= rver=3Don,wait=3Doff -chardev socket,id=3Dcompare_out0,host=3D3.3.3.3,port=3D9005 - -chardev socket,id=3Dnotify_way,host=3D3.3.3.3,port=3D9009,ser= ver,nowait + -chardev socket,id=3Dnotify_way,host=3D3.3.3.3,port=3D9009,ser= ver=3Don,wait=3Doff -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev= =3Dmirror0 -object filter-redirector,netdev=3Dhn0,id=3Dredire0,queue=3Drx= ,indev=3Dcompare_out -object filter-redirector,netdev=3Dhn0,id=3Dredire1,queue=3Drx= ,outdev=3Dcompare0 --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327652; cv=none; d=zohomail.com; s=zohoarc; b=VwJg7ByzTVPxU2vkG7ekTnF14OC7c80FtSQt3UHPxri7V6CIQSPJMGXEeA3KIYuEL2A3Y7rz7bWcaPM8/SxccbB2zxdEbPc3xlpEFHAmlv/h3oej3MqIHIXW2SHnSHuYbnoce7zI9wLBU8md5j6KwpGU9uRGM5AOHQC6m/a4iz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327652; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kf+lvljz372V0FIW3LDVvUzPPbqpQ8K07ZfLmGiXllY=; b=F/3ml01N3OynaqX7ZCRxld4+yT6N8pA6A18oHH+pcOeWYURw+oXqeZMtZojmVKDWnGWxkNCpmGi9m8UEeaMQ7uJYjT1djm+QfZW16JThHhmurE+BLeOFbQAADhhWcEgHGgyD8M5OWEnV3Nk5d8gqpdRZq3pxkYiBTTvGpI/Dhy4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327652559788.4573030637315; Fri, 26 Feb 2021 00:20:52 -0800 (PST) Received: from localhost ([::1]:36958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYMl-0000Kl-Gu for importer@patchew.org; Fri, 26 Feb 2021 03:20:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY87-0001pe-LI for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:45 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY85-00049k-2I for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:43 -0500 Received: by mail-wm1-x32f.google.com with SMTP id o16so6955596wmh.0 for ; Fri, 26 Feb 2021 00:05:39 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kf+lvljz372V0FIW3LDVvUzPPbqpQ8K07ZfLmGiXllY=; b=gy11z+ZAjYScTfOBlwoNGR/d3ShuhHzVEj83rOj8Dsx88C4Ru0NJZXOor7ULFHWH7J 8/tNsEkBbcxKh8igWq4uHt+L9z0gZAH8YA+1+CtajT8+wToBduMeCfYHffkZ7SwwH4fK Ra99u9GauGrs9LJlZtyZ6O6Duqo2y87tq4fLPJZvecB5OjSxfgA0DQELiOK3g/G6xm14 ZWOjVLCX7qGm4fg9lSfgOnTD952fb7Qc8OjIZM5Xi9sH8wZHrZocOwU9/05dFkKl2NSL ytradTucd8iE59D/w+PeGwD+A6p93oPj1tozv5A0VVAOwUl+W2hnhZ086OviSp22WCW2 WPZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kf+lvljz372V0FIW3LDVvUzPPbqpQ8K07ZfLmGiXllY=; b=rKJQBxJMgkmijuqHJQA2Uu0N0zeheFb1DgASw3tuIPvSKC5+v/vHQKI5KDH1cBkALi +oFTbsJwFvQv9K6BqbtxWJ3gi9/An62NPX4l6DfIk9jiH7yL1HX1+I6ZVGvqdedLSk/c 58nFLAvymlmIzkhbzm6tYvux6FbGaSk0X6+8k2u3ioEtjge3O1cOFcNMZVWZzP63ZcLT 7JRhCfkRzG1psqqtr7HRS4bChxiIz1XBTOtBbHmuc/2sxHryFub7PZ6fMWFJmmTx+tHF oazpUBfJ7Was1dPSJ6Alrdl442Nqai3mwSYfj/QKqAU/525RQDILIhoOpGol70qkf9nl N4KQ== X-Gm-Message-State: AOAM532gR+NlKUTBnr+3EsieuXCJkkH7MmljuU2Lt7L25ooxvb36I6aG 4WtD9h/GCt1ttlPc9AxWlnNRrKHJth0= X-Google-Smtp-Source: ABdhPJzCuQH3eEF/GYuKhWlxBLifbhgzU93mGUWmglzbD8qHspV1witLfMai8EV1L6QYZi3VlBaggA== X-Received: by 2002:a1c:a985:: with SMTP id s127mr1511214wme.158.1614326738890; Fri, 26 Feb 2021 00:05:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/29] qemu-options: update to show preferred boolean syntax for -spice Date: Fri, 26 Feb 2021 09:05:14 +0100 Message-Id: <20210226080526.651705-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The preferred syntax is to use "foo=3Don|off", rather than a bare "foo" or "nofoo". Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210216191027.595031-4-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- qemu-options.hx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 972ef412cc..bdf159c929 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1894,16 +1894,17 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, "-spice [port=3Dport][,tls-port=3Dsecured-port][,x509-dir=3D]\n" " [,x509-key-file=3D][,x509-key-password=3D]\n" " [,x509-cert-file=3D][,x509-cacert-file=3D]\n" - " [,x509-dh-key-file=3D][,addr=3Daddr][,ipv4|ipv6|unix]\n" + " [,x509-dh-key-file=3D][,addr=3Daddr]\n" + " [,ipv4=3Don|off][,ipv6=3Don|off][,unix=3Don|off]\n" " [,tls-ciphers=3D]\n" " [,tls-channel=3D[main|display|cursor|inputs|record|playback]]\= n" " [,plaintext-channel=3D[main|display|cursor|inputs|record|playb= ack]]\n" - " [,sasl][,password=3D][,disable-ticketing]\n" + " [,sasl=3Don|off][,password=3D][,disable-ticketing=3Don= |off]\n" " [,image-compression=3D[auto_glz|auto_lz|quic|glz|lz|off]]\n" " [,jpeg-wan-compression=3D[auto|never|always]]\n" " [,zlib-glz-wan-compression=3D[auto|never|always]]\n" - " [,streaming-video=3D[off|all|filter]][,disable-copy-paste]\n" - " [,disable-agent-file-xfer][,agent-mouse=3D[on|off]]\n" + " [,streaming-video=3D[off|all|filter]][,disable-copy-paste=3Don= |off]\n" + " [,disable-agent-file-xfer=3Don|off][,agent-mouse=3D[on|off]]\n" " [,playback-compression=3D[on|off]][,seamless-migration=3D[on|o= ff]]\n" " [,gl=3D[on|off]][,rendernode=3D]\n" " enable spice\n" @@ -1920,13 +1921,13 @@ SRST Set the IP address spice is listening on. Default is any address. =20 - ``ipv4``; \ ``ipv6``; \ ``unix`` + ``ipv4=3Don|off``; \ ``ipv6=3Don|off``; \ ``unix=3Don|off`` Force using the specified IP version. =20 ``password=3D`` Set the password you need to authenticate. =20 - ``sasl`` + ``sasl=3Don|off`` Require that the client use SASL to authenticate with the spice. The exact choice of authentication method used is controlled from the system / user's SASL configuration file for the 'qemu' @@ -1940,13 +1941,13 @@ SRST data encryption preventing compromise of authentication credentials. =20 - ``disable-ticketing`` + ``disable-ticketing=3Don|off`` Allow client connects without authentication. =20 - ``disable-copy-paste`` + ``disable-copy-paste=3Don|off`` Disable copy paste between the client and the guest. =20 - ``disable-agent-file-xfer`` + ``disable-agent-file-xfer=3Don|off`` Disable spice-vdagent based file-xfer between the client and the guest. =20 --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327976; cv=none; d=zohomail.com; s=zohoarc; b=FBHtueYOo+eX6tBm3jN/daLtTnZG5KtCwWfYHI/+kvM6sbS+PDaYxXvnv7c03S2cha32v0BOFZbggPL7b2Ubtrc7zi9CksELhuAfRD8uOS/8OTt4VdzuL8x4/g08V6wik7+zDNM0YyfAgRjyJyAwS7Ec5ZsSjStIWa1z5xBJTJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327976; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=30KXONDiNcy4WUvSxoUXnCCDoB6X1hP4UlcthuQ38g0=; b=hXmXZGnU/3bchHu/AOMZRZdtx5qzMutdUI8RmKosQdrAA3SzCWKhq3nFRvEVDMjEGzkb7c7EMbTXc/8OVwlE/Cyz5NcM5NuMeqhKmJFjE+9iz7Z90IbquIQObCacl1qCtrALnegZD+rHnZWXjBMLd3tfDCU8QJLYCV7m3MMfqfc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327976463382.34700047829665; Fri, 26 Feb 2021 00:26:16 -0800 (PST) Received: from localhost ([::1]:46446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYRz-0004Tb-C5 for importer@patchew.org; Fri, 26 Feb 2021 03:26:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY87-0001pd-Ju for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:45 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:40185) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY85-0004AR-21 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:43 -0500 Received: by mail-wr1-x42d.google.com with SMTP id d11so7661763wrj.7 for ; Fri, 26 Feb 2021 00:05:40 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=30KXONDiNcy4WUvSxoUXnCCDoB6X1hP4UlcthuQ38g0=; b=NkQGrR248FkWbFTCQ0AfUDC14qbW8+YqyGlbMR/ATh95DLrlEes2S9zJQJc0jG7sPb Q/nh5G/R26w2PU4SfkJc/zhAnh7VAZlDM9Km/SxZ4RyohBaVQc9v0ftTLrN4QnqYxyJs sz0oFFGnNKBD/IZzkXnI0IhV/AfWVESdxeN78r2/5dY+uiYK3erVImqg+74Wk0yk8gWx lMDMKnP+uJUdBMyQeCZnLIIDXrq6PIFqwjiKkbKgkoKC64x2gV0Fs4+NBDjo5wfn3tpA 6wMHCQMr3qn3C4jMvvFxa9PPtl0jQLg8Dl/5SG9fjmL+PS6ofLwVAetP1SqJB+2MkTYd K5Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=30KXONDiNcy4WUvSxoUXnCCDoB6X1hP4UlcthuQ38g0=; b=YCK5LGPJSNCoXbBR6vyjkGF5HRHqkW7N0WuTNepxFhhg+SX5cKT6reDJABQZXKc9rw EkIm5ene270t6chxIhflPNKe+7H1JuVnaM1yFTrmGA0Nq1M8YJlU5BvxQN6GEgWz0mq2 TKiU3u9sndZLetm5aA/hA5Fg8APMIz/0UUjBwVXDsZaLDnO0XIGlJMCSSzvpZ8Cz8SfA +6GnuIh48EjIJEUKXHUr5/UzEcOA21/i3kJ9WrQKhoFbHMDyJL4K2qRiEBggk+EeV40O n/Sku7CFuePd7OK6xmK0veRiHB2K4FIUuElOavDeWSCCKLNodfTnxPEMtcMB7kjV4V6S DxTg== X-Gm-Message-State: AOAM531IBmKwU7MwNo3QGHtmxZ/CbJ0oobnQrfwfaBUIJlEUGXp+ucdu tWmUssOOCYoCatE0n5fWM6UEc65k0Ow= X-Google-Smtp-Source: ABdhPJwMUTZ8dsaPDhejzxQaS5GGrNdrwJjHdGGnNrtnr9GovEJCg8/JTCrlf/rrdIVtysudPTBUlw== X-Received: by 2002:a5d:452e:: with SMTP id j14mr1983921wra.244.1614326739482; Fri, 26 Feb 2021 00:05:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/29] qemu-options: update to show preferred boolean syntax for -netdev Date: Fri, 26 Feb 2021 09:05:15 +0100 Message-Id: <20210226080526.651705-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The preferred syntax is to use "foo=3Don|off", rather than a bare "foo" or "nofoo". Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210216191027.595031-5-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- qemu-options.hx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index bdf159c929..fb2050cda9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2406,8 +2406,8 @@ DEFHEADING(Network options:) =20 DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, #ifdef CONFIG_SLIRP - "-netdev user,id=3Dstr[,ipv4[=3Don|off]][,net=3Daddr[/mask]][,host=3Da= ddr]\n" - " [,ipv6[=3Don|off]][,ipv6-net=3Daddr[/int]][,ipv6-host=3Daddr= ]\n" + "-netdev user,id=3Dstr[,ipv4=3Don|off][,net=3Daddr[/mask]][,host=3Dadd= r]\n" + " [,ipv6=3Don|off][,ipv6-net=3Daddr[/int]][,ipv6-host=3Daddr]\= n" " [,restrict=3Don|off][,hostname=3Dhost][,dhcpstart=3Daddr]\n" " [,dns=3Daddr][,ipv6-dns=3Daddr][,dnssearch=3Ddomain][,domain= name=3Ddomain]\n" " [,tftp=3Ddir][,tftp-server-name=3Dname][,bootfile=3Df][,host= fwd=3Drule][,guestfwd=3Drule]" @@ -2454,8 +2454,8 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, #endif #ifdef __linux__ "-netdev l2tpv3,id=3Dstr,src=3Dsrcaddr,dst=3Ddstaddr[,srcport=3Dsrcpor= t][,dstport=3Ddstport]\n" - " [,rxsession=3Drxsession],txsession=3Dtxsession[,ipv6=3Don/of= f][,udp=3Don/off]\n" - " [,cookie64=3Don/off][,counter][,pincounter][,txcookie=3Dtxco= okie]\n" + " [,rxsession=3Drxsession],txsession=3Dtxsession[,ipv6=3Don|of= f][,udp=3Don|off]\n" + " [,cookie64=3Don|off][,counter][,pincounter][,txcookie=3Dtxco= okie]\n" " [,rxcookie=3Drxcookie][,offset=3Doffset]\n" " configure a network backend with ID 'str' connected t= o\n" " an Ethernet over L2TPv3 pseudowire.\n" @@ -2884,7 +2884,7 @@ SRST -device e1000,netdev=3Dn1,mac=3D52:54:00:12:34:56= \\ -netdev socket,id=3Dn1,mcast=3D239.192.168.1:1102= ,localaddr=3D1.2.3.4 =20 -``-netdev l2tpv3,id=3Did,src=3Dsrcaddr,dst=3Ddstaddr[,srcport=3Dsrcport][,= dstport=3Ddstport],txsession=3Dtxsession[,rxsession=3Drxsession][,ipv6][,ud= p][,cookie64][,counter][,pincounter][,txcookie=3Dtxcookie][,rxcookie=3Drxco= okie][,offset=3Doffset]`` +``-netdev l2tpv3,id=3Did,src=3Dsrcaddr,dst=3Ddstaddr[,srcport=3Dsrcport][,= dstport=3Ddstport],txsession=3Dtxsession[,rxsession=3Drxsession][,ipv6=3Don= |off][,udp=3Don|off][,cookie64][,counter][,pincounter][,txcookie=3Dtxcookie= ][,rxcookie=3Drxcookie][,offset=3Doffset]`` Configure a L2TPv3 pseudowire host network backend. L2TPv3 (RFC3931) is a popular protocol to transport Ethernet (and other Layer 2) data frames between two systems. It is present in routers, firewalls and --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327812; cv=none; d=zohomail.com; s=zohoarc; b=BbyafQZQJyAsQGQOS+pPxurqyQWpaM3mYJALm+XUxjbOmucDLVjM8ppIH0PT3pE9LhrA9pDIkbw9Q5bXHQgIgrlyQ3T5JXWiaqI2KTm9dhB+3zK8j65DrozPnerCNjgU9bTlcVmWIxfv8/wg5KINw7gzknjvzZ1w/jCtPhPnODQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327812; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7vxQpXVPhVJex6fCepeRyx3Or84hKClWAQ2rJefeJ+E=; b=BPy0N5BnXMQgr/oevKfxe/xzGBJ34+Mer1mpYprn1jgd3r1oyWnkSePtOb2TvusrE1SLJ5TUbYokrZp2i7/ReqY0mXFQTKsVA/S7Sc9Ok2kgYwu8NduSolz94/7DmS5kLz1uVhfkeanYnqy4WRVUsIk7ADQZDPXN3DM95708vAY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327812426629.172867864795; Fri, 26 Feb 2021 00:23:32 -0800 (PST) Received: from localhost ([::1]:41966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYPL-0002Vs-9W for importer@patchew.org; Fri, 26 Feb 2021 03:23:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY88-0001q6-Qm for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:45 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:34816) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY87-0004AZ-3M for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:44 -0500 Received: by mail-wm1-x334.google.com with SMTP id o16so6955643wmh.0 for ; Fri, 26 Feb 2021 00:05:41 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7vxQpXVPhVJex6fCepeRyx3Or84hKClWAQ2rJefeJ+E=; b=BSQNoN9sA5KopClM3ahy9G2cvJY+x2Vk/H17IxZM0QODQMkbiHWuMTnFM3uAIXHcZa sbOgGwwzCs/DABiKyDREp2DC5G1KN6js7wiPMLjHdWMRPEWMjlJFX/laCuhc5TXVeC1d j13g32h/i0A+Qw0NNzemBMyCj1mpko2gJYCt3l46wJFtSzgfnV4bTEXV41RvLp6useKK lceqCEBhElkvg6JeZkEDQiwtgT9w2waqJm1/nrYdinn5CZTHvcPPBhAQlaTLvgIPgnnw beCmpgnPz6u24NoJSL6DalgRU+HTXDT4/jAliIMqHforoeh7Hi4kweFIQbQ4Mo3JeWDS yg+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7vxQpXVPhVJex6fCepeRyx3Or84hKClWAQ2rJefeJ+E=; b=qIbRUfY2PvsWsag6SnfoptwrIfVvT0Y8PEpymFx7Im/0M0mFCR/CFEiaRgMTCUUU3U VW0M3QtLbFwq8Clbp99AYUgi3Hmdq1wgwweJjIyODeEcp9B1uMR2EDC+ck9pU0Y6+jku Rca7drIPVio9LdpZ/hVrWLIz9vRag11RNwSWTryMkhRa6f5pvdngcebxRnXpiLG7pLp8 Q4qZWiKbrgErma7MFZo4QJ0RgMWHr6o9ZwRBrbCKNhnAveoakac3ExDvFwBjyQXYE3sZ e64Kb1ZEZiMzh8LCI01wP/fUkOcCKHDcXQq19OZHpiHyG94bpG1mDfdse8uFkGhldVUq u0Dg== X-Gm-Message-State: AOAM532n15OqsxFnE7D83Gw6R5ef94X0dbhW5dPlw4T7wjHFhtwCRNFJ gJqwurHStxZYc7yqvRwh8imcW/ZgnRE= X-Google-Smtp-Source: ABdhPJynTixVaySr+gTFhhCWttw2L4ETpU1YMLFmVz/ZO4JFyVP6M/hrwevgigKUsXAdEYvA9HUWNA== X-Received: by 2002:a05:600c:220b:: with SMTP id z11mr1554012wml.151.1614326740081; Fri, 26 Feb 2021 00:05:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/29] qemu-options: update to show preferred boolean syntax for -incoming Date: Fri, 26 Feb 2021 09:05:16 +0100 Message-Id: <20210226080526.651705-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x334.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The preferred syntax is to use "foo=3Don|off", rather than a bare "foo" or "nofoo". Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210216191027.595031-6-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- qemu-options.hx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index fb2050cda9..da0ddf8a3a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4135,8 +4135,8 @@ SRST ERST =20 DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \ - "-incoming tcp:[host]:port[,to=3Dmaxport][,ipv4][,ipv6]\n" \ - "-incoming rdma:host:port[,ipv4][,ipv6]\n" \ + "-incoming tcp:[host]:port[,to=3Dmaxport][,ipv4=3Don|off][,ipv6=3Don|o= ff]\n" \ + "-incoming rdma:host:port[,ipv4=3Don|off][,ipv6=3Don|off]\n" \ "-incoming unix:socketpath\n" \ " prepare for incoming migration, listen on\n" \ " specified protocol and socket address\n" \ @@ -4148,9 +4148,9 @@ DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \ " wait for the URI to be specified via migrate_incoming= \n", QEMU_ARCH_ALL) SRST -``-incoming tcp:[host]:port[,to=3Dmaxport][,ipv4][,ipv6]`` +``-incoming tcp:[host]:port[,to=3Dmaxport][,ipv4=3Don|off][,ipv6=3Don|off]= `` \=20 -``-incoming rdma:host:port[,ipv4][,ipv6]`` +``-incoming rdma:host:port[,ipv4=3Don|off][,ipv6=3Don|off]`` Prepare for incoming migration, listen on a given tcp port. =20 ``-incoming unix:socketpath`` --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614328532; cv=none; d=zohomail.com; s=zohoarc; b=iB+o470PFa+JnI5+rHMLnnyr0HDr7GBiW+SiBPmTZZtjcZj5PEzpmXoEamkwZxfTk5tSc7u7dUpWndgKAkbPGoyNgFtyRWCUmMKi+EKZLKg3Gw2CZVFn7PTpw4we2RThQMMiuh+8UDULDAuMHFMuPfb3I8yDgKoQmBnGbw104CU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614328532; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=05AZRXWbyn+bWvJPWKwjXp65/qILBYcVFo3vpzLecO4=; b=kjvPqP6prhJ1INch/qR3Uhou/peQ7K1wGPq0i7YkoclmhOpyIsZXrQgIxeC7dHmGB1NPdXuMWTYjOwj+pfJVPfmCfajdnM9F3loqKGWiKa+a+AIIiNQ2Lm618KP+eL/LVuqvnR+yL+mxitk9ZdB494KCGmG+OFZImlHPOFmby1w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614328532819616.9590231448428; Fri, 26 Feb 2021 00:35:32 -0800 (PST) Received: from localhost ([::1]:59512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYax-0001kL-QB for importer@patchew.org; Fri, 26 Feb 2021 03:35:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY89-0001rz-Jk for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:47 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:43403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY87-0004Ah-Ab for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:44 -0500 Received: by mail-wr1-x435.google.com with SMTP id w11so7649532wrr.10 for ; Fri, 26 Feb 2021 00:05:41 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=05AZRXWbyn+bWvJPWKwjXp65/qILBYcVFo3vpzLecO4=; b=nYaMpmOEUu2IUEyiVLlQ3+mqCUOwXUL4fxoPdDqn6v57yRyn25qP60rWCWySyK5pJW HnCCx2jGt0Wl3ndRV63NKcmT9uSBugwQ/ieBxcpn+eI0mDj0Jh+EXa+siqebcT9c/d3e hSfHc2EkYHhiIZw/0IFCLoSZ3Ft7yADnNnZfYJ49XMV39m9EfYqKSUuxfxcHapzMjBy8 51j4eDYsyP8NFjjdvSmo+oodjcLFQvZMlsS+36NYvY8Xg8816eWzoZSVPvKiRy5lQ4Wu XrSJU8czDfCeDnx7GfUBvcWpdLwC5+UDq78PXQEF9Df1h7K50S1J9th7Ez83Q7p4B8YB qyWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=05AZRXWbyn+bWvJPWKwjXp65/qILBYcVFo3vpzLecO4=; b=OljTtHuDvDh7C0HzqDIUXVh54h81s7h1YAD9o3kH9ECHcwMQWnr++IyiD9sPpB/tTD pDKWmo9JOEMdj13gkTMo1hdrgNonZNUjHXET8iEEIJvlyA6dB+2Y7rIOAU9WP5Dk8bn0 Mh6Pxosk30vb5ckJMle+3VPO8UICo3zy5z2ydfT4wN6zrMCrA4NxEBTgOoJaq9DF7A2V bhWV+vYESfWSCkhuze+JZvGKMl+oSdy3u78a64e8gD4+09+3NfiFca/FM7ZjI4cxlLjB B4DpvfVP2yZdiPTN2J1BHwxFbf/J/5Zkz+3rRJHXjA/c0DnE3EnzhqHkNZjV8DzWqrnN K6Yg== X-Gm-Message-State: AOAM531Uzr54jJFNNmpkH45jQHdiopDcOMclokMghM6HB4tlYU1qzep5 YPSRG558nO0AUv9rLY5zoJ3otE8MX2c= X-Google-Smtp-Source: ABdhPJzp4Z9/DlEOgrIIvjW0qmDxAdC5kat2KymDQtwgnQEk7xCk2cUwRlmxQsNBLsUzv7JmtpUspQ== X-Received: by 2002:a5d:4ac4:: with SMTP id y4mr1845553wrs.86.1614326740733; Fri, 26 Feb 2021 00:05:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/29] qemu-options: update to show preferred boolean syntax for -vnc Date: Fri, 26 Feb 2021 09:05:17 +0100 Message-Id: <20210226080526.651705-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The preferred syntax is to use "foo=3Don|off", rather than a bare "foo" or "nofoo". The on|off syntax has been supported since -vnc switched to use QemuOpts in commit 4db14629c38611061fc19ec6927405923de84f08 Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210216191027.595031-7-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- qemu-options.hx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index da0ddf8a3a..34be5a7a2d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2123,13 +2123,13 @@ SRST Following the display value there may be one or more option flags separated by commas. Valid options are =20 - ``reverse`` + ``reverse=3Don|off`` Connect to a listening VNC client via a "reverse" connection. The client is specified by the display. For reverse network connections (host:d,``reverse``), the d argument is a TCP port number, not a display number. =20 - ``websocket`` + ``websocket=3Don|off`` Opens an additional TCP listening port dedicated to VNC Websocket connections. If a bare websocket option is given, the Websocket port is 5700+display. An alternative port can be @@ -2143,7 +2143,7 @@ SRST runs in unencrypted mode. If TLS credentials are provided, the websocket connection requires encrypted client connections. =20 - ``password`` + ``password=3Don|off`` Require that password based authentication is used for client connections. =20 @@ -2180,7 +2180,7 @@ SRST on the fly while the VNC server is active. If missing, it will default to denying access. =20 - ``sasl`` + ``sasl=3Don|off`` Require that the client use SASL to authenticate with the VNC server. The exact choice of authentication method used is controlled from the system / user's SASL configuration file for @@ -2203,7 +2203,7 @@ SRST fly while the VNC server is active. If missing, it will default to denying access. =20 - ``acl`` + ``acl=3Don|off`` Legacy method for enabling authorization of clients against the x509 distinguished name and SASL username. It results in the creation of two ``authz-list`` objects with IDs of @@ -2213,13 +2213,13 @@ SRST This option is deprecated and should no longer be used. The new ``sasl-authz`` and ``tls-authz`` options are a replacement. =20 - ``lossy`` + ``lossy=3Don|off`` Enable lossy compression methods (gradient, JPEG, ...). If this option is set, VNC client may receive lossy framebuffer updates depending on its encoding settings. Enabling this option can save a lot of bandwidth at the expense of quality. =20 - ``non-adaptive`` + ``non-adaptive=3Don|off`` Disable adaptive encodings. Adaptive encodings are enabled by default. An adaptive encoding will try to detect frequently updated screen regions, and send updates in these regions using @@ -2254,7 +2254,7 @@ SRST must be omitted, otherwise is must be present and specify a valid audiodev. =20 - ``power-control`` + ``power-control=3Don|off`` Permit the remote client to issue shutdown, reboot or reset power control requests. ERST --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614328591; cv=none; d=zohomail.com; s=zohoarc; b=d1YXyVvnLXqAMphDc06kj/DaHBVIW0xtkeJTWBiAIjNytWWpPWDzq8p9mcIigWbZCi6GzIF7d/Zysz44qDh7nnghNSrbpc+levZK80pK7kgUFaoeeGwp81/U65WgJIYc3M7cwxJ9o8z3bRvyedLRMkcR6xiAPEMLSn0fiTLVSjc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614328591; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J1kroVxxhA606cnPpCcUxvcZNFdJXn2/DhoRETfHB2w=; b=OLt9VfGTwOW00zZyoTQySImr4e2Xf8uN+l0Sa1aPvw0hzzGYeWMPORdShK4p9sS74/ZmGaynIC+dpE7aNh4tLN8EGqodAv0rK0KCfC+AlC8KrTomBUuTXWJDmbMTa+EmqUXC4Q+9p6bLQSAHhUIhE4S5RZjd/p3C5CrR/RFOdpA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614328591104806.6914444232757; Fri, 26 Feb 2021 00:36:31 -0800 (PST) Received: from localhost ([::1]:33500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYbu-0002lP-1Z for importer@patchew.org; Fri, 26 Feb 2021 03:36:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY89-0001s8-Ke for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:47 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:40189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY87-0004BT-AC for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:45 -0500 Received: by mail-wr1-x431.google.com with SMTP id d11so7661875wrj.7 for ; Fri, 26 Feb 2021 00:05:42 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J1kroVxxhA606cnPpCcUxvcZNFdJXn2/DhoRETfHB2w=; b=WGAJurUStwUogMq3S1JllFi2z58pYzWO4PlMRhssQRzmnaB2Z5gKJRyhj2BdaLSSwl 9+D2cpukjDBk8R5rryLN6DN7sIP87rtCa8IzNipi+c4y5dfkYEyPZfXugTTMfP9qQHQd eEVOp8puJe6EnB2JpZo2NuI+0Xi6UwfWv7JtKTV9+opFSGqkkjDqP3qMUnQu+Ip0mb6t FWKLqo+pOKOW2MYzuLNN29A0jbXMZibPjzjtBgfTlIKQWjKiKEle+yRCF+TvMLkan+P7 YaIm0e1Yi5rLuQSggW2pkmSXdj1e8fJBANbkYOc6R17VuK1EnFWq3DqWkOsUwd/2Mq8v KZxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=J1kroVxxhA606cnPpCcUxvcZNFdJXn2/DhoRETfHB2w=; b=qaNSOx5CKHorevVkZ2TNEZfuKhY1usKQfCWp/aX05phJxkZD/6V2OrXJ4fCnUhI46O ip7jdaeoIsouRzs4jck9/DdPfhCu8UpUVzGE5Tkera3XrEYqWEiWQEOKt7pRtXTgHHDk AaPQft6wIBNd8HH3R9/7giZd3XBZKUAh3Jd7ye014mQayH49hPdGe1XVhqKOa8mwNzTG /PvEnEaDchTwKEJeHqu0Wp8AALerTMpAZRJSRF472E10x828dEY/wFOrzMelN0EX1O8P xy40A/Yrf7gx5xW1NmqBoInU4zIFZS4QW2IEoT903PXGoQgyTDjBTgpy1Eh0nxfPcbqo 2btA== X-Gm-Message-State: AOAM530ONeZixINcv8hS58J1Wd8fRldQ6rs02TwrvcWEjkGe5JoPnXk5 z+VA3mXvEIlJU9Gwf3vnn+nRUCex70U= X-Google-Smtp-Source: ABdhPJz0Ky2t4K/u91YDBUX7UXkUt6bvP2KmSgQNyI8v8PDECgsMVy+SIxBxB/vqOssOz5VNgyIIpQ== X-Received: by 2002:adf:f584:: with SMTP id f4mr1853200wro.311.1614326741502; Fri, 26 Feb 2021 00:05:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 21/29] docs: update to show preferred boolean syntax for -chardev Date: Fri, 26 Feb 2021 09:05:18 +0100 Message-Id: <20210226080526.651705-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The preferred syntax is to use "foo=3Don|off", rather than a bare "foo" or "nofoo". Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210216191027.595031-8-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- docs/COLO-FT.txt | 8 ++++---- docs/ccid.txt | 6 ++++-- docs/colo-proxy.txt | 16 ++++++++-------- docs/devel/writing-qmp-commands.txt | 2 +- docs/interop/live-block-operations.rst | 4 ++-- docs/interop/qmp-intro.txt | 4 ++-- docs/system/cpu-hotplug.rst | 2 +- docs/system/s390x/3270.rst | 2 +- docs/system/target-avr.rst | 2 +- docs/tools/qemu-storage-daemon.rst | 4 ++-- scripts/qmp/qemu-ga-client | 2 +- tests/test-char.c | 4 ++-- 12 files changed, 29 insertions(+), 27 deletions(-) diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index bc5fb2a1bb..8874690e83 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -162,11 +162,11 @@ instance. -device piix3-usb-uhci -device usb-tablet -name primary \ -netdev tap,id=3Dhn0,vhost=3Doff,helper=3D/usr/lib/qemu/qemu-bridge-hel= per \ -device rtl8139,id=3De0,netdev=3Dhn0 \ - -chardev socket,id=3Dmirror0,host=3D0.0.0.0,port=3D9003,server,nowait \ - -chardev socket,id=3Dcompare1,host=3D0.0.0.0,port=3D9004,server,wait \ - -chardev socket,id=3Dcompare0,host=3D127.0.0.1,port=3D9001,server,nowai= t \ + -chardev socket,id=3Dmirror0,host=3D0.0.0.0,port=3D9003,server=3Don,wai= t=3Doff \ + -chardev socket,id=3Dcompare1,host=3D0.0.0.0,port=3D9004,server=3Don,wa= it=3Don \ + -chardev socket,id=3Dcompare0,host=3D127.0.0.1,port=3D9001,server=3Don,= wait=3Doff \ -chardev socket,id=3Dcompare0-0,host=3D127.0.0.1,port=3D9001 \ - -chardev socket,id=3Dcompare_out,host=3D127.0.0.1,port=3D9005,server,no= wait \ + -chardev socket,id=3Dcompare_out,host=3D127.0.0.1,port=3D9005,server=3D= on,wait=3Doff \ -chardev socket,id=3Dcompare_out0,host=3D127.0.0.1,port=3D9005 \ -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev=3Dmirror0 \ -object filter-redirector,netdev=3Dhn0,id=3Dredire0,queue=3Drx,indev=3D= compare_out \ diff --git a/docs/ccid.txt b/docs/ccid.txt index c7fda6d07d..c97fbd2de0 100644 --- a/docs/ccid.txt +++ b/docs/ccid.txt @@ -109,7 +109,8 @@ NSS. Registration can be done from Firefox or the comm= and line: =20 on the host specify the ccid-card-passthru device with a suitable chardev: =20 - qemu -chardev socket,server,host=3D0.0.0.0,port=3D2001,id=3Dccid,nowai= t -usb -device usb-ccid -device ccid-card-passthru,chardev=3Dccid + qemu -chardev socket,server=3Don,host=3D0.0.0.0,port=3D2001,id=3Dccid,= wait=3Doff \ + -usb -device usb-ccid -device ccid-card-passthru,chardev=3Dccid =20 on the client run vscclient, built when you built QEMU: =20 @@ -125,7 +126,8 @@ Follow instructions as per #4, except run QEMU and vscc= lient as follows: Run qemu as per #5, and run vscclient from the "fake-smartcard" directory as follows: =20 - qemu -chardev socket,server,host=3D0.0.0.0,port=3D2001,id=3Dccid,nowai= t -usb -device usb-ccid -device ccid-card-passthru,chardev=3Dccid + qemu -chardev socket,server=3Don,host=3D0.0.0.0,port=3D2001,id=3Dccid,= wait=3Doff \ + -usb -device usb-ccid -device ccid-card-passthru,chardev=3Dccid vscclient -e "db=3D\"sql:$PWD\" use_hw=3Dno soft=3D(,Test,CAC,,id-cert= ,signing-cert,encryption-cert)" 2001 =20 =20 diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index fa1cef0278..1fc38aed1b 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -164,11 +164,11 @@ clearly describe the usage. Primary(ip:3.3.3.3): -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downscript=3D/etc= /qemu-ifdown -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 --chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server,nowait --chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server,nowait --chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server,nowait +-chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server=3Don,wait= =3Doff +-chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server=3Don,wait= =3Doff +-chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server=3Don,wait= =3Doff -chardev socket,id=3Dcompare0-0,host=3D3.3.3.3,port=3D9001 --chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server,nowait +-chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server=3Don,wa= it=3Doff -chardev socket,id=3Dcompare_out0,host=3D3.3.3.3,port=3D9005 -object iothread,id=3Diothread1 -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev=3Dmirror0 @@ -190,11 +190,11 @@ If you want to use virtio-net-pci or other driver wit= h vnet_header: Primary(ip:3.3.3.3): -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downscript=3D/etc= /qemu-ifdown -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 --chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server,nowait --chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server,nowait --chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server,nowait +-chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server=3Don,wait= =3Doff +-chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server=3Don,wait= =3Doff +-chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server=3Don,wait= =3Doff -chardev socket,id=3Dcompare0-0,host=3D3.3.3.3,port=3D9001 --chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server,nowait +-chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server=3Don,wa= it=3Doff -chardev socket,id=3Dcompare_out0,host=3D3.3.3.3,port=3D9005 -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev=3Dmirror0,vne= t_hdr_support -object filter-redirector,netdev=3Dhn0,id=3Dredire0,queue=3Drx,indev=3Dcom= pare_out,vnet_hdr_support diff --git a/docs/devel/writing-qmp-commands.txt b/docs/devel/writing-qmp-c= ommands.txt index 258e63bff5..b1e31d56c0 100644 --- a/docs/devel/writing-qmp-commands.txt +++ b/docs/devel/writing-qmp-commands.txt @@ -39,7 +39,7 @@ shown here. First, QEMU should be started like this: =20 # qemu-system-TARGET [...] \ - -chardev socket,id=3Dqmp,port=3D4444,host=3Dlocalhost,server \ + -chardev socket,id=3Dqmp,port=3D4444,host=3Dlocalhost,server=3Don \ -mon chardev=3Dqmp,mode=3Dcontrol,pretty=3Don =20 Then, in a different terminal: diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-blo= ck-operations.rst index e13f5a21f8..1073b930dc 100644 --- a/docs/interop/live-block-operations.rst +++ b/docs/interop/live-block-operations.rst @@ -133,7 +133,7 @@ socket:: -M q35 -nodefaults -m 512 \ -blockdev node-name=3Dnode-A,driver=3Dqcow2,file.driver=3Dfile,fil= e.node-name=3Dfile,file.filename=3D./a.qcow2 \ -device virtio-blk,drive=3Dnode-A,id=3Dvirtio0 \ - -monitor stdio -qmp unix:/tmp/qmp-sock,server,nowait + -monitor stdio -qmp unix:/tmp/qmp-sock,server=3Don,wait=3Doff =20 The ``-blockdev`` command-line option, used above, is available from QEMU 2.9 onwards. In the above invocation, notice the ``node-name`` @@ -698,7 +698,7 @@ it could be located elsewhere):: -M q35 -nodefaults -m 512 \ -blockdev node-name=3Dnode-TargetDisk,driver=3Dqcow2,file.driver= =3Dfile,file.node-name=3Dfile,file.filename=3D./target-disk.qcow2 \ -device virtio-blk,drive=3Dnode-TargetDisk,id=3Dvirtio0 \ - -S -monitor stdio -qmp unix:./qmp-sock2,server,nowait \ + -S -monitor stdio -qmp unix:./qmp-sock2,server=3Don,wait=3Doff \ -incoming tcp:localhost:6666 =20 Given the disk image chain on source QEMU:: diff --git a/docs/interop/qmp-intro.txt b/docs/interop/qmp-intro.txt index 9d54a718b8..1c745a7af0 100644 --- a/docs/interop/qmp-intro.txt +++ b/docs/interop/qmp-intro.txt @@ -26,7 +26,7 @@ Usage You can use the -qmp option to enable QMP. For example, the following makes QMP available on localhost port 4444: =20 -$ qemu [...] -qmp tcp:localhost:4444,server,nowait +$ qemu [...] -qmp tcp:localhost:4444,server=3Don,wait=3Doff =20 However, for more flexibility and to make use of more options, the -mon command-line option should be used. For instance, the following example @@ -34,7 +34,7 @@ creates one HMP instance (human monitor) on stdio and one= QMP instance on localhost port 4444: =20 $ qemu [...] -chardev stdio,id=3Dmon0 -mon chardev=3Dmon0,mode=3Dreadline \ - -chardev socket,id=3Dmon1,host=3Dlocalhost,port=3D4444,server= ,nowait \ + -chardev socket,id=3Dmon1,host=3Dlocalhost,port=3D4444,server= =3Don,wait=3Doff \ -mon chardev=3Dmon1,mode=3Dcontrol,pretty=3Don =20 Please, refer to QEMU's manpage for more information. diff --git a/docs/system/cpu-hotplug.rst b/docs/system/cpu-hotplug.rst index d0b06403f1..bd0663616e 100644 --- a/docs/system/cpu-hotplug.rst +++ b/docs/system/cpu-hotplug.rst @@ -14,7 +14,7 @@ vCPU hotplug $ qemu-system-x86_64 -display none -no-user-config -m 2048 \ -nodefaults -monitor stdio -machine pc,accel=3Dkvm,usb=3Doff \ -smp 1,maxcpus=3D2 -cpu IvyBridge-IBRS \ - -qmp unix:/tmp/qmp-sock,server,nowait + -qmp unix:/tmp/qmp-sock,server=3Don,wait=3Doff =20 (2) Run 'qmp-shell' (located in the source tree, under: "scripts/qmp/) to connect to the just-launched QEMU:: diff --git a/docs/system/s390x/3270.rst b/docs/system/s390x/3270.rst index 0554a70a9f..0e173b323f 100644 --- a/docs/system/s390x/3270.rst +++ b/docs/system/s390x/3270.rst @@ -24,7 +24,7 @@ Example configuration =20 * Add a ``tn3270`` chardev and a ``x-terminal3270`` to the QEMU command li= ne:: =20 - -chardev socket,id=3Dch0,host=3D0.0.0.0,port=3D2300,nowait,server,tn3270 + -chardev socket,id=3Dch0,host=3D0.0.0.0,port=3D2300,wait=3Doff,server= =3Don,tn3270=3Don -device x-terminal3270,chardev=3Dch0,devno=3Dfe.0.000a,id=3Dterminal0 =20 * Start the guest. In the guest, use ``chccwdev -e 0.0.000a`` to enable diff --git a/docs/system/target-avr.rst b/docs/system/target-avr.rst index 25ab46ef05..03d5ab51c1 100644 --- a/docs/system/target-avr.rst +++ b/docs/system/target-avr.rst @@ -24,7 +24,7 @@ AVR cpu - Continuous non interrupted execution with serial output into telnet wind= ow:: =20 qemu-system-avr -M mega2560 -bios demo.elf -nographic \ - -serial tcp::5678,server,nowait + -serial tcp::5678,server=3Don,wait=3Doff =20 and then in another shell:: =20 diff --git a/docs/tools/qemu-storage-daemon.rst b/docs/tools/qemu-storage-d= aemon.rst index f63627eaf6..c05b3d3811 100644 --- a/docs/tools/qemu-storage-daemon.rst +++ b/docs/tools/qemu-storage-daemon.rst @@ -69,7 +69,7 @@ Standard options: a description of character device properties. A common character device definition configures a UNIX domain socket:: =20 - --chardev socket,id=3Dchar1,path=3D/tmp/qmp.sock,server,nowait + --chardev socket,id=3Dchar1,path=3D/tmp/qmp.sock,server=3Don,wait=3Doff =20 .. option:: --export [type=3D]nbd,id=3D,node-name=3D[,name= =3D][,writable=3Don|off][,bitmap=3D] --export [type=3D]vhost-user-blk,id=3D,node-name=3D,addr.= type=3Dunix,addr.path=3D[,writable=3Don|off][,logical-block-si= ze=3D][,num-queues=3D] @@ -124,7 +124,7 @@ Launch the daemon with QMP monitor socket ``qmp.sock`` = so clients can execute QMP commands:: =20 $ qemu-storage-daemon \ - --chardev socket,path=3Dqmp.sock,server,nowait,id=3Dchar1 \ + --chardev socket,path=3Dqmp.sock,server=3Don,wait=3Doff,id=3Dchar1 \ --monitor chardev=3Dchar1 =20 Export raw image file ``disk.img`` over NBD UNIX domain socket ``nbd.sock`= `:: diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client index ce122984a9..348d85864c 100755 --- a/scripts/qmp/qemu-ga-client +++ b/scripts/qmp/qemu-ga-client @@ -11,7 +11,7 @@ # # Start QEMU with: # -# # qemu [...] -chardev socket,path=3D/tmp/qga.sock,server,nowait,id=3Dqga= 0 \ +# # qemu [...] -chardev socket,path=3D/tmp/qga.sock,server=3Don,wait=3Doff= ,id=3Dqga0 \ # -device virtio-serial -device virtserialport,chardev=3Dqga0,name=3Dorg= .qemu.guest_agent.0 # # Run the script: diff --git a/tests/test-char.c b/tests/test-char.c index 469d25989c..755d54c15e 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -780,7 +780,7 @@ static void char_socket_server_test(gconstpointer opaqu= e) =20 g_setenv("QTEST_SILENT_ERRORS", "1", 1); /* - * We rely on config->addr containing "nowait", otherwise + * We rely on config->addr containing "wait=3Doff", otherwise * qemu_chr_new() will block until a client connects. We * can't spawn our client thread though, because until * qemu_chr_new() returns we don't know what TCP port was @@ -1114,7 +1114,7 @@ static void char_socket_server_two_clients_test(gcons= tpointer opaque) =20 g_setenv("QTEST_SILENT_ERRORS", "1", 1); /* - * We rely on addr containing "nowait", otherwise + * We rely on addr containing "wait=3Doff", otherwise * qemu_chr_new() will block until a client connects. We * can't spawn our client thread though, because until * qemu_chr_new() returns we don't know what TCP port was --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614328392; cv=none; d=zohomail.com; s=zohoarc; b=leGZN81PlFXlLMoifIj3zF6FWgMNXMQqLVkRecoHWSUuk4qRaNnvm3sec6dAqthVqqoJHVd9WUVpLYedo8T9+rXOfkqQno65WmZ4ZTP1toV62FQNroeh7YnPiNp9e9FwaqNWMOw6yuPa97LF/72OTXc5QNiP6ITag6ebhjT0grU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614328392; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CcJTd08L1ttvSLW4nGKplXDeyrJw0bi8MGU/5r3AoI4=; b=S8k5urXJTteUEaXxvZehd6NgReyjJKVUtGjs3khHaU97dfVd//MQvoqEKw5YHHtWMAzAYcF0BKegYYky4N3ifC0LynFPhlvYVeGvwLDZcQB5NqFN/W1LoEaUyKUbFGixqrEtTcehHvh5g3mtDZ3Ig2w3kMmxpW4gkviIiF6F8D8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614328392348426.27805325867155; Fri, 26 Feb 2021 00:33:12 -0800 (PST) Received: from localhost ([::1]:57338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYYh-0000oN-7Q for importer@patchew.org; Fri, 26 Feb 2021 03:33:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY89-0001rm-Ha for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:47 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:37632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY87-0004Ba-DV for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:44 -0500 Received: by mail-wr1-x434.google.com with SMTP id v15so7679057wrx.4 for ; Fri, 26 Feb 2021 00:05:42 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CcJTd08L1ttvSLW4nGKplXDeyrJw0bi8MGU/5r3AoI4=; b=q20qc+SeffD4AwMQBSc1jPCgsfSqbEK8k64UeVYiechK8eIZdZ4ZlgESl41WnR6AVa F2QHY1x9kVu40ClXc7qOn+3lH+orB5nntkbW+Vgw2neC1wfIfqNByxUgatBoN6xPvV73 zDqbk5Gsk4G66pmNrtH05qw9DAozMxQzF1EZBg43930AkTWDCPxxnFTPR0buSnycFOf9 qaCI6X/8KiSWJXQh2+iAv94/gCxkiCa/bJO3AeJyA0RXI1epO4TxnjYMsBbafGl08pe5 whVXAdex6RJhJOPp00TEwQ2eXYT343RTv+RRx9CAprHw/nu80Sze6c87MzuNbsZijqbs po6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CcJTd08L1ttvSLW4nGKplXDeyrJw0bi8MGU/5r3AoI4=; b=a3vsZ6HiHT+fKO9Ug85XwVxJKXP7CMV0lCYvv//GwLD8iYprlU0Owmpz/AW/cOG4Uh lcCpNApq5uXIocMVllVYqwvumCNfRcGRAhbPN8FqWW5bmiWp2ZFi/eNYPAt/mmJf0p8I kZSaJkMrFnpW6sNmVjLHo6YAc7S9vDlXoTLt60zmSKqnM5ilC5j/5pFUxrgVBBylat6W jx3F5G6WcY/gNRPCE6NvPcV0sdFsjzqelHlvjrHQx84PEulXrsX8l/Dr9z+JmvVNV8+l ayueWdgwZnJMasBdS4EdRg48yi4PgZa94n/IGtUvBDfagGNiDnb5oNyX8GC9DYlAlILF T1rA== X-Gm-Message-State: AOAM530CsNFkzOG2qyMWOUdf7wJsxD2czeTJDmkjFg9YB8YOAUWtefDv zx4DKS3M5w8f8vLiPrMCz7QibOS4yr4= X-Google-Smtp-Source: ABdhPJw0VtuOusbxj45t2n+6UCyHcD8ZsgsRBhwGoa5HQsd8qLPqA9HRavMJuGhEl68Sy/BJPaK8zg== X-Received: by 2002:a5d:4e41:: with SMTP id r1mr1864620wrt.6.1614326742084; Fri, 26 Feb 2021 00:05:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 22/29] docs: update to show preferred boolean syntax for -vnc Date: Fri, 26 Feb 2021 09:05:19 +0100 Message-Id: <20210226080526.651705-23-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The preferred syntax is to use "foo=3Don|off", rather than a bare "foo" or "nofoo". The on|off syntax has been supported since -vnc switched to use QemuOpts in commit 4db14629c38611061fc19ec6927405923de84f08 Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210216191027.595031-9-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- docs/system/vnc-security.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/system/vnc-security.rst b/docs/system/vnc-security.rst index ebca656d87..830f6acc73 100644 --- a/docs/system/vnc-security.rst +++ b/docs/system/vnc-security.rst @@ -44,7 +44,7 @@ the password all clients will be rejected. =20 .. parsed-literal:: =20 - |qemu_system| [...OPTIONS...] -vnc :1,password -monitor stdio + |qemu_system| [...OPTIONS...] -vnc :1,password=3Don -monitor stdio (qemu) change vnc password Password: ******** (qemu) @@ -104,7 +104,7 @@ authentication to provide two layers of authentication = for clients. =20 |qemu_system| [...OPTIONS...] \ -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Don \ - -vnc :1,tls-creds=3Dtls0,password -monitor stdio + -vnc :1,tls-creds=3Dtls0,password=3Don -monitor stdio (qemu) change vnc password Password: ******** (qemu) @@ -128,7 +128,7 @@ can be launched with: =20 .. parsed-literal:: =20 - |qemu_system| [...OPTIONS...] -vnc :1,sasl -monitor stdio + |qemu_system| [...OPTIONS...] -vnc :1,sasl=3Don -monitor stdio =20 .. _vnc_005fsec_005fcertificate_005fsasl: =20 @@ -146,7 +146,7 @@ x509 options: =20 |qemu_system| [...OPTIONS...] \ -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Don \ - -vnc :1,tls-creds=3Dtls0,sasl -monitor stdio + -vnc :1,tls-creds=3Dtls0,sasl=3Don -monitor stdio =20 .. _vnc_005fsetup_005fsasl: =20 --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614328714; cv=none; d=zohomail.com; s=zohoarc; b=HoUBWz94okQajsFjGIE4xHHWqIa2IRtay5r5L/qPCNC06xKGeCXEd84goy2luRZCduQNnLGxvLXUeAn8/5gNIF5ohRxmeLWAAfv8xd+wwVYiH7QSQ9sYV4UECd6CfrRIEBQDWrTjySGy0H75thmKoPL0pB8ditvG/1NzSyzQt20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614328714; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E0L8Sq6KiLJWfXw/sUSLMMArs29XR5X2eO596viPvco=; b=RMjWfZ198VdRi1v/cPnl0WIs37sM9jhduV10DkFJhY/Z3kONhdKOOy8Re/pWreAZc6bURAqCK3rFWrq+iaDGGIATJBzq9OqYUICHCVnRydY5Ck6AIs/DhYcrG4Vo/krPu7WmUzgMvNeAOkZplMHGub/y6UO5iMjORXO5oKkH/KI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614328714386321.7706012981423; Fri, 26 Feb 2021 00:38:34 -0800 (PST) Received: from localhost ([::1]:35850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYdt-0003nd-80 for importer@patchew.org; Fri, 26 Feb 2021 03:38:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY8A-0001sC-7S for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:47 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:46152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY88-0004Bg-Dt for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:46 -0500 Received: by mail-wr1-x42f.google.com with SMTP id t15so7645553wrx.13 for ; Fri, 26 Feb 2021 00:05:43 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E0L8Sq6KiLJWfXw/sUSLMMArs29XR5X2eO596viPvco=; b=ssecy2zMBX+LcJoCeLe8Nv84U8VffItyE0aStBHywt1YhAw84fA9bj029bzPlkfEKx D/rO9MWDIQizpmqRw8Hloh9AKamCvSKVhI9o0S0tId6SldK9T7zzRzW9JwO1rvJLYiiT 5/NOdNxM9x7vrKR71eyZE1eYpEPJ9WsjUAMKlH5WEkrOlUWPQxlAqYQOLTiV6DZmeS3R viB43g04+FUAoYkRMSU3tIsaRrTfjLUsX53RCOEG/przGYXaNHHwo2u4schpeZamc8JC qyMf7+XF6vg0el7Yiw0Yu8w5wDf8JsbJ8zzsM2h9P6nIrMcNX8mB6dxj2iBUaUnEsi/j 1gLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=E0L8Sq6KiLJWfXw/sUSLMMArs29XR5X2eO596viPvco=; b=DuEt0EAeLeSncdN+l60lPBWI3mXxxFU04PO0PZiCrBiy0JrBG1L/uhw5b1qgBnBWwZ s0xyqU25LKWseIYnPruBDHD+eW7bMhjDRbIWi/dt+lA6NSPFymyK1pTvD7w5CMlg9fwM NlkFxxO3Qjernc3DTGG41/9bDSh3Y+hFWeEN6K3BPaLDnEt1k1wx6vX9A7GHmFVOZuA5 6aXlpZEnyV54P/+7xwmK8t8pxDEG/FajN28vVVNYKfh33Dnq2ASut7DF1j9uH7hlK3jJ on94D3s01MxI1DzHBQxEVhYq4Et5tzVcHpbTUWA06SjdeZMAnmLciG8t+BLcDix97fid ZCaQ== X-Gm-Message-State: AOAM533NuYTE34zW1u+B7JOI0VtxFZ+peL3N9n3/x3Z9OcuqPpP/erGT uaPJ19e/tpkQ/l1i4nh5JWRorZH4s5A= X-Google-Smtp-Source: ABdhPJzkxdOA/Okw4Q2Eo9ozEYiMvHCUbM/AW1IfQj0ThqanKaYtoqTo/QNCks2z7W55kH1KgBm8AQ== X-Received: by 2002:a5d:6b47:: with SMTP id x7mr1902684wrw.170.1614326742721; Fri, 26 Feb 2021 00:05:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 23/29] docs: update to show preferred boolean syntax for -cpu Date: Fri, 26 Feb 2021 09:05:20 +0100 Message-Id: <20210226080526.651705-24-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The preferred syntax is to use "foo=3Don|off", rather than a bare "+foo" or "-foo" Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210216191027.595031-10-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- docs/COLO-FT.txt | 4 ++-- docs/interop/firmware.json | 2 +- docs/system/cpu-models-x86.rst.inc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index 8874690e83..8d6d53a5a2 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -158,7 +158,7 @@ instance. =20 # imagefolder=3D"/mnt/vms/colo-test-primary" =20 -# qemu-system-x86_64 -enable-kvm -cpu qemu64,+kvmclock -m 512 -smp 1 -qmp = stdio \ +# qemu-system-x86_64 -enable-kvm -cpu qemu64,kvmclock=3Don -m 512 -smp 1 -= qmp stdio \ -device piix3-usb-uhci -device usb-tablet -name primary \ -netdev tap,id=3Dhn0,vhost=3Doff,helper=3D/usr/lib/qemu/qemu-bridge-hel= per \ -device rtl8139,id=3De0,netdev=3Dhn0 \ @@ -189,7 +189,7 @@ any IP's here, except for the $primary_ip variable. =20 # qemu-img create -f qcow2 $imagefolder/secondary-hidden.qcow2 10G =20 -# qemu-system-x86_64 -enable-kvm -cpu qemu64,+kvmclock -m 512 -smp 1 -qmp = stdio \ +# qemu-system-x86_64 -enable-kvm -cpu qemu64,kvmclock=3Don -m 512 -smp 1 -= qmp stdio \ -device piix3-usb-uhci -device usb-tablet -name secondary \ -netdev tap,id=3Dhn0,vhost=3Doff,helper=3D/usr/lib/qemu/qemu-bridge-hel= per \ -device rtl8139,id=3De0,netdev=3Dhn0 \ diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 989f10b626..9d94ccafa9 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -129,7 +129,7 @@ # "-machine smm=3Don". (On the "pc-q35-*" machine types of # the @i386 emulation target, @requires-smm presents # further CPU requirements; one combination known to work -# is "-cpu coreduo,-nx".) If the firmware is marked as +# is "-cpu coreduo,nx=3Doff".) If the firmware is marked as # both @secure-boot and @requires-smm, then write # accesses to the pflash chip (NVRAM) that holds the UEFI # variable store must be restricted to code that executes diff --git a/docs/system/cpu-models-x86.rst.inc b/docs/system/cpu-models-x8= 6.rst.inc index 9a2327828e..867c8216b5 100644 --- a/docs/system/cpu-models-x86.rst.inc +++ b/docs/system/cpu-models-x86.rst.inc @@ -364,7 +364,7 @@ Host passthrough with feature customization: =20 .. parsed-literal:: =20 - |qemu_system| -cpu host,-vmx,... + |qemu_system| -cpu host,vmx=3Doff,... =20 Named CPU models: =20 @@ -376,7 +376,7 @@ Named CPU models with feature customization: =20 .. parsed-literal:: =20 - |qemu_system| -cpu Westmere,+pcid,... + |qemu_system| -cpu Westmere,pcid=3Don,... =20 Libvirt guest XML ^^^^^^^^^^^^^^^^^ --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327278; cv=none; d=zohomail.com; s=zohoarc; b=V7oGCwi6AFz2dV2SHDLpLw8tVaU0x6rc/mI2x+nMl9/+tlhVrE9Rp513aRbaIB7D/KNweDFj1wlY9MGz2rItLgezYB7r4gqpUBjvCidXJ/7SXbtf8YWT2LzQktSuLeRAeTSX6EItsJBBmI8pyp1iOPZ0c2S5cMSIVjq+bBCWNhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327278; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=maJSKIWYKl0RCCJeoVPGbr174vVxdopzn3tLa+epCzM=; b=T6odMqzLXob/RmSE0n0330rljXR/vjJa1CJCk2JLfZ8u9HHnrOl0hvG8ec/TQWnRtOt2KkqCblFsHArPAHMZfqvzLa4LPWlfuR5y2Ni/+o/yTAhVDHqX/ydfJFtvtyjh++2TuBqN22Zi+CEOyqWHbGw6Klw8X4kOYTDBOzK0yaI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327278256298.9666611953602; Fri, 26 Feb 2021 00:14:38 -0800 (PST) Received: from localhost ([::1]:50604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYGi-0002WE-Ty for importer@patchew.org; Fri, 26 Feb 2021 03:14:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY8B-0001sw-JF for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:47 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:45657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY88-0004By-Le for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:46 -0500 Received: by mail-wr1-x433.google.com with SMTP id e10so7439676wro.12 for ; Fri, 26 Feb 2021 00:05:44 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=maJSKIWYKl0RCCJeoVPGbr174vVxdopzn3tLa+epCzM=; b=qYlLCGG8tjRIVgCbCBDoTH2XCivy19IgOdclmKnDsCUxxxmkAA7bFpaWwcZJf0SEkV n36paHVBF7M+xyAvkn+jx3wEWVJ28nM34e2hxjcD89yVm2xFTNJCXekLrLwlstfjPI19 M880XtURAo7gTIuIwrNl0uixq09rnE1JMkJ+b2M+3wbbx/oC6lA8njK76COOEHE97LYF QfcIFhC7plc3iiJPsom36t8zDvAKUSUfReyiM8/bpQW7BxLG01Hmc1yQ4eSe3nrAReIl yigjOL94EeqOIEGngCuNN/VDsZAcd6PX5LWQTh6bRl4LpvGGZKq0zvEVLI/0mfHOJTpX f8OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=maJSKIWYKl0RCCJeoVPGbr174vVxdopzn3tLa+epCzM=; b=G/8cWlPoEPLBkZEwSxNVDJNxZYu3lnYCygPM7xk1/M0QakJC5UzznP7T6nQv/ya5h9 fuI/fYstVsp0n/nRVm9luhseBP/yUpDZgYkQ5IIfXJfRZ03kbdvNdEJI43X3BxwzIJfp GHGLCxY2aWDqrnh38TpetNY9AeW4p+ZIoxmhw9SQClxQcHq4Oklv/TsIpe/+Li77g9KH 5e+jEcvP7Op0vWUnCXl9OntkALr7/6YGfXGmg/mtYPrhxsBPXZwTaAAOOSz5nv9VJC2i MKXWCFCYZLoUq9PtHHdbBqU/BIonwYEgjsbbJgphZ9U2Ar7w0lx0LzszsczTYa2oNEQy g7Qw== X-Gm-Message-State: AOAM530ous2PSpOWn8PkCLMjtKj1GRfMMuR59wI6X4IuXx7cHYUM+sY4 VyuCW4bLc4ZNmgqQ/wLLIkoEIsZJjKQ= X-Google-Smtp-Source: ABdhPJxVzk0kjUqAhJmSw+G3plfDGpYYosog/cCA+EEp6DPWu83bM2tshoQprhmLZTSrzq9Rp2CYzA== X-Received: by 2002:adf:dd81:: with SMTP id x1mr1808685wrl.233.1614326743325; Fri, 26 Feb 2021 00:05:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/29] target/i386: update to show preferred boolean syntax for -cpu Date: Fri, 26 Feb 2021 09:05:21 +0100 Message-Id: <20210226080526.651705-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 The preferred syntax is to use "foo=3Don|off", rather than a bare "+foo" or "-foo" Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210216191027.595031-11-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- tests/qtest/test-x86-cpuid-compat.c | 52 ++++++++++++++--------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6a53446e6a..bc6956561a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6557,7 +6557,7 @@ static void x86_cpu_expand_features(X86CPU *cpu, Erro= r **errp) } else if (cpu->env.cpuid_min_level < 0x14) { mark_unavailable_features(cpu, FEAT_7_0_EBX, CPUID_7_0_EBX_INTEL_PT, - "Intel PT need CPUID leaf 0x14, please set by \"-cpu .= ..,+intel-pt,min-level=3D0x14\""); + "Intel PT need CPUID leaf 0x14, please set by \"-cpu .= ..,intel-pt=3Don,min-level=3D0x14\""); } } =20 diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpu= id-compat.c index 7ca1883a29..6470f0a85d 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -235,82 +235,82 @@ int main(int argc, char **argv) /* If level is not large enough, it should increase automatically: */ /* CPUID[6].EAX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/arat", - "-cpu 486,+arat", "level", 6); + "-cpu 486,arat=3Don", "level", 6); /* CPUID[EAX=3D7,ECX=3D0].EBX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/fsgsbase", - "-cpu phenom,+fsgsbase", "level", 7); + "-cpu phenom,fsgsbase=3Don", "level", 7); /* CPUID[EAX=3D7,ECX=3D0].ECX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/avx512vbmi", - "-cpu phenom,+avx512vbmi", "level", 7); + "-cpu phenom,avx512vbmi=3Don", "level", 7); /* CPUID[EAX=3D0xd,ECX=3D1].EAX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/xsaveopt", - "-cpu phenom,+xsaveopt", "level", 0xd); + "-cpu phenom,xsaveopt=3Don", "level", 0xd); /* CPUID[8000_0001].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/3dnow", - "-cpu 486,+3dnow", "xlevel", 0x80000001); + "-cpu 486,3dnow=3Don", "xlevel", 0x80000001); /* CPUID[8000_0001].ECX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/sse4a", - "-cpu 486,+sse4a", "xlevel", 0x80000001); + "-cpu 486,sse4a=3Don", "xlevel", 0x80000001); /* CPUID[8000_0007].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/invtsc", - "-cpu 486,+invtsc", "xlevel", 0x80000007); + "-cpu 486,invtsc=3Don", "xlevel", 0x80000007); /* CPUID[8000_000A].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/npt", - "-cpu 486,+svm,+npt", "xlevel", 0x8000000A); + "-cpu 486,svm=3Don,npt=3Don", "xlevel", 0x8000000A); /* CPUID[C000_0001].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel2/phenom/xstore", - "-cpu phenom,+xstore", "xlevel2", 0xC0000001); + "-cpu phenom,xstore=3Don", "xlevel2", 0xC0000001); /* SVM needs CPUID[0x8000000A] */ add_cpuid_test("x86/cpuid/auto-xlevel/athlon/svm", - "-cpu athlon,+svm", "xlevel", 0x8000000A); + "-cpu athlon,svm=3Don", "xlevel", 0x8000000A); =20 =20 /* If level is already large enough, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-level/SandyBridge/multiple", - "-cpu SandyBridge,+arat,+fsgsbase,+avx512vbmi", + "-cpu SandyBridge,arat=3Don,fsgsbase=3Don,avx512vbmi=3D= on", "level", 0xd); /* If level is explicitly set, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-level/486/fixed/0xF", - "-cpu 486,level=3D0xF,+arat,+fsgsbase,+avx512vbmi,+xsav= eopt", + "-cpu 486,level=3D0xF,arat=3Don,fsgsbase=3Don,avx512vbm= i=3Don,xsaveopt=3Don", "level", 0xF); add_cpuid_test("x86/cpuid/auto-level/486/fixed/2", - "-cpu 486,level=3D2,+arat,+fsgsbase,+avx512vbmi,+xsaveo= pt", + "-cpu 486,level=3D2,arat=3Don,fsgsbase=3Don,avx512vbmi= =3Don,xsaveopt=3Don", "level", 2); add_cpuid_test("x86/cpuid/auto-level/486/fixed/0", - "-cpu 486,level=3D0,+arat,+fsgsbase,+avx512vbmi,+xsaveo= pt", + "-cpu 486,level=3D0,arat=3Don,fsgsbase=3Don,avx512vbmi= =3Don,xsaveopt=3Don", "level", 0); =20 /* if xlevel is already large enough, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-xlevel/phenom/3dnow", - "-cpu phenom,+3dnow,+sse4a,+invtsc,+npt,+svm", + "-cpu phenom,3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don= ,svm=3Don", "xlevel", 0x8000001A); /* If xlevel is explicitly set, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/80000002", - "-cpu 486,xlevel=3D0x80000002,+3dnow,+sse4a,+invtsc,+np= t,+svm", + "-cpu 486,xlevel=3D0x80000002,3dnow=3Don,sse4a=3Don,inv= tsc=3Don,npt=3Don,svm=3Don", "xlevel", 0x80000002); add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/8000001A", - "-cpu 486,xlevel=3D0x8000001A,+3dnow,+sse4a,+invtsc,+np= t,+svm", + "-cpu 486,xlevel=3D0x8000001A,3dnow=3Don,sse4a=3Don,inv= tsc=3Don,npt=3Don,svm=3Don", "xlevel", 0x8000001A); add_cpuid_test("x86/cpuid/auto-xlevel/phenom/fixed/0", - "-cpu 486,xlevel=3D0,+3dnow,+sse4a,+invtsc,+npt,+svm", + "-cpu 486,xlevel=3D0,3dnow=3Don,sse4a=3Don,invtsc=3Don,= npt=3Don,svm=3Don", "xlevel", 0); =20 /* if xlevel2 is already large enough, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-xlevel2/486/fixed", - "-cpu 486,xlevel2=3D0xC0000002,+xstore", + "-cpu 486,xlevel2=3D0xC0000002,xstore=3Don", "xlevel2", 0xC0000002); =20 /* Check compatibility of old machine-types that didn't * auto-increase level/xlevel/xlevel2: */ =20 add_cpuid_test("x86/cpuid/auto-level/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,+arat,+avx512vbmi,+xsa= veopt", + "-machine pc-i440fx-2.7 -cpu 486,arat=3Don,avx512vbmi= =3Don,xsaveopt=3Don", "level", 1); add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,+3dnow,+sse4a,+invtsc,= +npt,+svm", + "-machine pc-i440fx-2.7 -cpu 486,3dnow=3Don,sse4a=3Don,= invtsc=3Don,npt=3Don,svm=3Don", "xlevel", 0); add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,+xstore", + "-machine pc-i440fx-2.7 -cpu 486,xstore=3Don", "xlevel2", 0); /* * QEMU 1.4.0 had auto-level enabled for CPUID[7], already, @@ -321,19 +321,19 @@ int main(int argc, char **argv) "-machine pc-i440fx-1.4 -cpu Nehalem", "level", 2); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-1.5/on", - "-machine pc-i440fx-1.4 -cpu Nehalem,+smap", + "-machine pc-i440fx-1.4 -cpu Nehalem,smap=3Don", "level", 7); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/off", "-machine pc-i440fx-2.3 -cpu Penryn", "level", 4); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/on", - "-machine pc-i440fx-2.3 -cpu Penryn,+erms", + "-machine pc-i440fx-2.3 -cpu Penryn,erms=3Don", "level", 7); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", "-machine pc-i440fx-2.9 -cpu Conroe", "level", 10); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on", - "-machine pc-i440fx-2.9 -cpu Conroe,+erms", + "-machine pc-i440fx-2.9 -cpu Conroe,erms=3Don", "level", 10); =20 /* @@ -348,7 +348,7 @@ int main(int argc, char **argv) "-machine pc-i440fx-2.4 -cpu SandyBridge,", "xlevel", 0x80000008); add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on", - "-machine pc-i440fx-2.4 -cpu SandyBridge,+svm,+npt", + "-machine pc-i440fx-2.4 -cpu SandyBridge,svm=3Don,npt= =3Don", "xlevel", 0x80000008); =20 /* Test feature parsing */ --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614328983; cv=none; d=zohomail.com; s=zohoarc; b=SMX3bD6fgs9h4i5bQ1k7woQp3/PcbiJYY4BX/zEZuupPXvdQNyqI+s0SmkNYYzbP2a8pESQFU/fkILYnQXSm7+jPhPkBuEGqUqIgSP6WBzUsyeeK0FHPuWyy40Z7ir2AxgbIHE5lvcpM3MXMgmrLt6A/E2aoBQi57F0FjveCk64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614328983; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4Tyc0Jf+g8+mnJ98ePNvnwEXE/WCrdZV8Vy0rBBwf9M=; b=VhybIEvsWaIKAFcGMlQ5lubCfwj13Z1rOgNuxwQVhNOKY8PW8pqADwZq+Xwc7INIepuPC8G9tupSkuOZ1DnS5agXC/imy/wvbMFoDFpMk13lS3uMfUKK0OX2zfmh11lQyYbDb2dr18QXYrN9IkdejjWapJB9auF4zNqSuARc1HM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614328983173115.40232705883523; Fri, 26 Feb 2021 00:43:03 -0800 (PST) Received: from localhost ([::1]:43052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYiE-00079Y-3C for importer@patchew.org; Fri, 26 Feb 2021 03:43:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY8B-0001ss-KG for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:47 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:38783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY89-0004C4-9p for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:46 -0500 Received: by mail-wr1-x431.google.com with SMTP id b3so7665977wrj.5 for ; Fri, 26 Feb 2021 00:05:44 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4Tyc0Jf+g8+mnJ98ePNvnwEXE/WCrdZV8Vy0rBBwf9M=; b=MRIQmrzYC2r5WU0HYH6ZepOoUeThRL0JeaJkavPjSxcCzYt89IC/vhBE2c14eQt763 sfAY1yvkC0Hwqffoj7fPVPLsBQaoSxj/2mmeu3dsTMYM+K6UaVjWL99PYjrXks8kAHP4 8PhVB9t0G9oMzyJt+Dee+z2qTyXVNZui//dSrsom3qzh61WCUCZ/qb6cBKdsOWprCzNr yGcGGBX7wsd+APryL2Y90X3yoYwTb5GRTiC3EfKXaQRXK0MmOlHf4swu/G3o7k6i3n00 5LrVr64Q50XuD3OoOBQFlchH0qJpelV3pqtwC7pQKv1+yFn5Mqs9ZQuzCDrKHbtQk6cE 3cvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4Tyc0Jf+g8+mnJ98ePNvnwEXE/WCrdZV8Vy0rBBwf9M=; b=rP+N0jFncHo7/4tYKDp4qyO86ZhqYSOqdL9FTs/pDPRLXBK6BzEZZKg30F8ygNRw/p srJpLM6OjBe0FqZoxKsZXKZohTCo9v5H9mE+Sa7BMp6/HikdqifcoHtUQtoisPz6icbE P9PGbiOfrmQlWLQe5Su88LWFfO/sUQG2G6Wv7URNVpBzOjoN5d6st7YNUpurKkCuYvwm Urmujzkp2RB2w0vESfHnsJR/IAGFQ98L3WDFmIfQvvV0PLn2J6/6xObfHITaMwz9Ev5c lzygKX7tohXhFDXR97Cur9WQJqUAMcCD99BvOJ1El9qPMPnWqqk+t5DTjlthCPUc5YQ7 6zIA== X-Gm-Message-State: AOAM533cVzI0vvuL9Xp2GoeSKFqsa4wJAdRRJw612ksFLVYarVR7DXs6 9YYKjX6GgzXMXVnyMKom2sHY6IYhQcs= X-Google-Smtp-Source: ABdhPJzDErvKjQR9zqhyqfuXx1wcsqx7pnF3Y4YLxDSQRjdq+ZJXLcAZZgeHsU+j+16w/nkhMcmzBg== X-Received: by 2002:a05:6000:147:: with SMTP id r7mr1875528wrx.25.1614326743984; Fri, 26 Feb 2021 00:05:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 25/29] qom/object.c: Fix typo Date: Fri, 26 Feb 2021 09:05:22 +0100 Message-Id: <20210226080526.651705-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Doug Evans Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Doug Evans A simple typo (noticed by inspection). Signed-off-by: Doug Evans Message-Id: <000000000000530c7105bb191b33@google.com> Signed-off-by: Paolo Bonzini Signed-off-by: Doug Evans Signed-off-by: Paolo Bonzini --- qom/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qom/object.c b/qom/object.c index 491823db4a..6a01d56546 100644 --- a/qom/object.c +++ b/qom/object.c @@ -695,7 +695,7 @@ static void object_finalize(void *data) =20 /* Find the minimum alignment guaranteed by the system malloc. */ #if __STDC_VERSION__ >=3D 201112L -typddef max_align_t qemu_max_align_t; +typedef max_align_t qemu_max_align_t; #else typedef union { long l; --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614328793; cv=none; d=zohomail.com; s=zohoarc; b=Ls+zc0n/2E1auHchluQPpMBmH/ybTFbl37pOEKvv0fnAiWmJ5ybeREb453e3pmhDM+aYfc3XgpBCIt9qooq8eMCmatLIW5yb3zf2KWQ5CoYs3nYL6YUl/H6fo//TKHqXvK9zs5ZdBtpP/fnEbiJGnpoGtP+az2s6p4RGYWN5WUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614328793; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UJvvnaeptbuYgzrZOE0d0WLQHfz6cH/c4DsWLR0qbV8=; b=V4EMQylsF7UR4YhxIcomfGBCR6QZNFwTizzxXyheO7Q7ITfzUULZhk2/r93aj/n9S7fCgKmYPOOFblsQU991UNQa5Jj2E/bVt0malCYicgQKXSZ8J5ROIZNUflgDOs3reQiWpcBC6wsyg6v9spdSIdcqhSnyWDeKfFrKzSYw1iY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614328793649750.1622152393516; Fri, 26 Feb 2021 00:39:53 -0800 (PST) Received: from localhost ([::1]:38484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYfA-0004vA-JA for importer@patchew.org; Fri, 26 Feb 2021 03:39:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY8B-0001sx-Jk for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:47 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:33701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY89-0004CW-UM for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:47 -0500 Received: by mail-wr1-x42a.google.com with SMTP id 7so7679982wrz.0 for ; Fri, 26 Feb 2021 00:05:45 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UJvvnaeptbuYgzrZOE0d0WLQHfz6cH/c4DsWLR0qbV8=; b=gniSp2G55g1amU4K+WjdXxJIcgqYjn/Wu3ryIat+Y5d+lyv0Qa68HA/jBO18A9Q9by M8UvwnNX/wTSvVPTsF3aJY2/B5jpv1waB7ExuKs7ZO87AjRe5lxrY/iUE9hPjWK7m6kD hJPz9qQo9+lOof+quDOfhgOPQA/SViTpJRH+JNFy8qIKQ0BtzVK/osGhUDElqwUUfokZ eAldItoHQmEz26wzNL0EnDEkiSekDjcZ3V3JlfAuIigku471VEql547zTB9aR/Q2fFsk 6AJ8fQj939HUoIjo0K5el4xLgI8CgN2PyIwjUTw+kiM9UxartMr8cAbzeoduj44MwJPT tRTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UJvvnaeptbuYgzrZOE0d0WLQHfz6cH/c4DsWLR0qbV8=; b=SnYdx7v0afmwDdISt4I0HsfMUCbya7159k/EU+0/O7HI0ih4Zay+zjLzZQq+CFI/QX aTxbW3GbpD2h8tydObU2EK6ZHBgu/LNzU9djWbGQsa4WsUh2SmVi98qjh7QlZb0UVxiY 7CgJ60fc8YgLGfwsLLNBLPCRy9wXSh+2tB+th5yRSslS88/S4fcYnd+l6Jdl8SJ3Hjdg u8tkNostVFiW7hJte59KZplR7O9k2gsqdswtrXHvc//rLDMouFKaIv3hdEBkZeg8dtw2 PAfT6Ffu8yZs6LZigga084gKxasBUgt8B5EpWPBibu5bflGQOTWX8MgEut4SbM2aCYxT glTg== X-Gm-Message-State: AOAM530CuCmJar9t8aDjjmAXahca9Yb8xvJdAcuEeohI2VQ8z44hfjY8 9cDIeXEitCusAHq2cHMDHjfuSHxqWQc= X-Google-Smtp-Source: ABdhPJwa1I4A0rvrUHOCfROYUGPRvNVc38ycbwNmylQM8VcYwXP3WHvB5MX3NBEw0AXAorNNRo/Lng== X-Received: by 2002:adf:ded1:: with SMTP id i17mr1851522wrn.349.1614326744580; Fri, 26 Feb 2021 00:05:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 26/29] target/i386: Add bus lock debug exception support Date: Fri, 26 Feb 2021 09:05:23 +0100 Message-Id: <20210226080526.651705-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chenyi Qiang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Chenyi Qiang Bus lock debug exception is a feature that can notify the kernel by generate an #DB trap after the instruction acquires a bus lock when CPL>0. This allows the kernel to enforce user application throttling or mitigations. This feature is enumerated via CPUID.(EAX=3D7,ECX=3D0).ECX[bit 24]. Signed-off-by: Chenyi Qiang Message-Id: <20210202090224.13274-1-chenyi.qiang@intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- target/i386/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index bc6956561a..50008431c3 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -963,7 +963,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS]= =3D { "avx512bitalg", NULL, "avx512-vpopcntdq", NULL, "la57", NULL, NULL, NULL, NULL, NULL, "rdpid", NULL, - NULL, "cldemote", NULL, "movdiri", + "bus-lock-detect", "cldemote", NULL, "movdiri", "movdir64b", NULL, NULL, "pks", }, .cpuid =3D { diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 8be39cfb62..b4b136cd0d 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -769,6 +769,8 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS]; #define CPUID_7_0_ECX_LA57 (1U << 16) /* Read Processor ID */ #define CPUID_7_0_ECX_RDPID (1U << 22) +/* Bus Lock Debug Exception */ +#define CPUID_7_0_ECX_BUS_LOCK_DETECT (1U << 24) /* Cache Line Demote Instruction */ #define CPUID_7_0_ECX_CLDEMOTE (1U << 25) /* Move Doubleword as Direct Store Instruction */ --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614329249; cv=none; d=zohomail.com; s=zohoarc; b=aKdAO//zVd8D9YBsOxBINXIR1Hj6t3IDAugP/YFNHC5EAbZkxlxyQvvPriAv0zfTVLe8UuBfVpbQyAYTClegXeYq8tqO5OgqkPZzuHgAX0h+rHJ3GpbGcUbszdvO+/Q/k0iw+7eVx4fcLIcuclX+rzD9u7fy6xiLdukYsDBulGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614329249; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AAtYqOemksZdw5g1rYUo9+pu9VW+WxY7JUlFmC94moo=; b=MVTlzg9iW/k9fW51kEkS+bPiyLagEp9/Icr7IpqHqfqMBDcX18gm+pFMhhMbj4BeqpzXCQ79nrJLDtWZKxNoPZsk7Wv162o2hMytpDdKDAPoNCnh2jMjQnF9rrdLp7LG5+WbGaYGdMUNEINieA8i2yfM1Yam7mINoqudBcOuu6s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161432924932520.13662643895657; Fri, 26 Feb 2021 00:47:29 -0800 (PST) Received: from localhost ([::1]:50474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYmU-00026S-50 for importer@patchew.org; Fri, 26 Feb 2021 03:47:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY8D-0001vk-1A for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:49 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:37622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY8B-0004D7-6m for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:48 -0500 Received: by mail-wr1-x429.google.com with SMTP id v15so7679204wrx.4 for ; Fri, 26 Feb 2021 00:05:46 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AAtYqOemksZdw5g1rYUo9+pu9VW+WxY7JUlFmC94moo=; b=bkf9dZiwsls4VYuiVjip7YfhL8TV8JmZcZmhwiX/fbspjaoVQx+G9ooTF7zpgf+WvK QLJOZPDpk0EoDUr8PFHvuXhcePJevp4skPD6rpp7269xCT1LSyGVwipYjNrQEADou15F 83nsyJLyrOxafKBCIIdMF/DqwUgccbTZ5QZ/GZS77bdi7QBSyhTxgq8ZF8mHpB8hZBY7 V2yT5khUPZAP+DwQNK6Z9BxgOGQVJSrwWhRjUDeWUN6xNFetHjNHBlsKzW14lMlLhWu9 k7qB2CjJ+g6EmM5kyGlpaa2hl4HqM0THDOc3gycShVQpoR5wwZEUZ2bLMtgSLjgf4855 lHLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=AAtYqOemksZdw5g1rYUo9+pu9VW+WxY7JUlFmC94moo=; b=Ciz2OFzUPjd1Avcjd1WI+JLmIYhOceae3oRg4qbA7zqePFvVLYbhzhmKMN3oWb32VE xa9qCahHWFU9fgJCU0TE5QFwOUHzaplMWhmphCta6ZYx+7cJofcivHrDRjlDVZ+fRasY 0ELsZa8vUrNpgvePVH2eynKpz7ZtH5I9qfvAyjFlUPj2Q79B9FQYs0dkjmsixxgE+a54 FaDT9W/5RURFmlFURsOyeYxlcYBqjd7btdrg3CKR4P/JSVKKWVzYfJoTS0zxvt4pQmH7 z6eAobrwHQIRg48ZPpAHC2ZgfZfpXPJKvQ9ti9coSXxUBvxkxmDlaQL9pBn9VLjA6Md6 O6GQ== X-Gm-Message-State: AOAM531DUncfwjIOQCC6DaJkDAYu8RPvj3xRBq/1OCIs+vSiAVJeM+1L PAHptWg5YQ7SFVh2qSzVS45eJ40cWTg= X-Google-Smtp-Source: ABdhPJz69KW8Du/Kh4zrcn3oGpUseErXg05YR4NnGQraPq8XtHyL+9TDpGOyx0hdFTlGiNToTR4RDA== X-Received: by 2002:adf:b641:: with SMTP id i1mr1825442wre.295.1614326745285; Fri, 26 Feb 2021 00:05:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 27/29] vl: deprecate -writeconfig Date: Fri, 26 Feb 2021 09:05:24 +0100 Message-Id: <20210226080526.651705-28-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The functionality of -writeconfig is limited and the code does not even try to detect cases where it prints incorrect syntax (for example if values have a quote in them, since qemu_config_parse does not support any kind of escaping) so remove it. Signed-off-by: Paolo Bonzini --- docs/system/deprecated.rst | 7 +++++++ qemu-options.hx | 7 +------ softmmu/vl.c | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 2fcac7861e..561c916da2 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -146,6 +146,13 @@ library enabled as a cryptography provider. Neither the ``nettle`` library, or the built-in cryptography provider are supported on FIPS enabled hosts. =20 +``-writeconfig`` (since 6.0) +''''''''''''''''''''''''''''' + +The ``-writeconfig`` option is not able to serialize the entire contents +of the QEMU command line. It is thus considered a failed experiment +and deprecated, with no current replacement. + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/qemu-options.hx b/qemu-options.hx index 34be5a7a2d..252db9357c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4335,13 +4335,8 @@ SRST ERST DEF("writeconfig", HAS_ARG, QEMU_OPTION_writeconfig, "-writeconfig \n" - " read/write config file\n", QEMU_ARCH_ALL) + " read/write config file (deprecated)\n", QEMU_ARCH_ALL) SRST -``-writeconfig file`` - Write device configuration to file. The file can be either filename - to save command line and device configuration into file or dash - ``-``) character to print the output to stdout. This can be later - used as input file for ``-readconfig`` option. ERST =20 DEF("no-user-config", 0, QEMU_OPTION_nouserconfig, diff --git a/softmmu/vl.c b/softmmu/vl.c index b219ce1f35..6d8393b6f7 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3356,6 +3356,7 @@ void qemu_init(int argc, char **argv, char **envp) case QEMU_OPTION_writeconfig: { FILE *fp; + warn_report("-writeconfig is deprecated. It will go a= way in QEMU 6.2 with no replacement"); if (strcmp(optarg, "-") =3D=3D 0) { fp =3D stdout; } else { --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327975; cv=none; d=zohomail.com; s=zohoarc; b=F8KjnbFGcGj6jKx8iUzoZxMZYW6sO9KDDZAPD0ZwaXEgFkUXg2Ie6UmWCmEy666A1lFA/TYlMOq6tDTM3hyrOhhZW1pLJDxfm1FZQCl5OgDMg3syFeqzIREmzZIob1vvN2Adm98dLFHv7IhZY90VhauZaeVIlEGXLOsnj3nrkho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327975; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Igm6ct5NehfHivXC2S4IhXhFpL7IzqtPsIoaglG2gD0=; b=GRteMZHk/gFpk1pBKNmhfMj0jmCDVnwl2jC+gpZ5PJXAh/7Ut38y0RtMS8iQfI4DnqIsZUZnVji6MwAgAqkrLjxia4t7uoGD5KLqf+McHPsvJb/JlheHlomqioIop93h0jY8NrrRy4U72jNBUeyb5Ctv7LGj4ADni1wOBCfLVfw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327975486339.83870006837026; Fri, 26 Feb 2021 00:26:15 -0800 (PST) Received: from localhost ([::1]:46382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYRy-0004Rt-7Z for importer@patchew.org; Fri, 26 Feb 2021 03:26:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY8C-0001vO-Sf for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:48 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:43397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY8B-0004ED-6d for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:48 -0500 Received: by mail-wr1-x42e.google.com with SMTP id w11so7649733wrr.10 for ; Fri, 26 Feb 2021 00:05:46 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Igm6ct5NehfHivXC2S4IhXhFpL7IzqtPsIoaglG2gD0=; b=PqaKfoPCugykF0otyhZj7JLLyAsJBT7e5hD0sOTQrp1Let3Sep71KN7iiVGl30Ay4R PVki4r15jhib0l2MiG++e0Jk4I1oZNzlV5CGaTbDiX+p9rX6tR8N18MxtJqYGnVVYGNO vKbUyWgMGJEoFd17PR/FMVU4R5OoQTpJAc3kIOITLovj/Wf82u1Q1QWolW3EWUtS7XsS kZpZrSalvqnHijEEJye8O2S4oFNaFXPScL8xSqDE+0L2I7HVw8rv+DsbFiZGwFJ3oc1d e3pZhrO+/i1ZB2ogOkI/eV1pk2SrZoAgbtpBCCpMObGFP3HyhvxyFtmJlbLhf5Bax/G3 OtGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Igm6ct5NehfHivXC2S4IhXhFpL7IzqtPsIoaglG2gD0=; b=Uq3mG7YgqSqC0YwkpK/cza9lla7zMX+qMJlgPt07S3PlEdxPrVZUa5pqDjA68Gcur0 Z4ulHVG1b5teIDmNOZBwv5qJCMjciqaHML0oDrV04QxMBYHjqvHKsVxm+UG+sEoGSoBs et2KP1CeiXaYniBQmJw/TszALmkhdTKbT5sojeplJdxYnM+OTZ2rgF+NTMAQ4VlLxwfu IckYAnsxuExoR6K4biVnOWZZLGUky88HpvTPYNy/4i5E6HyggO+DGWekFWAoZfrj//U4 t3NibsGmlqdwOF/gG4PBVitXJOhMJWQKoHwug+fCDYglJCkDUobWW71Ye9lfgw9ta25V 9+oQ== X-Gm-Message-State: AOAM532MDN0LGCcEaLCQSddbuX+hgHMuHB+cxy8gZ2MGUqJZ3W23reOI C77jVx6FHoEeYX0i5NawwXl9cmEUxMg= X-Google-Smtp-Source: ABdhPJw+YqzI46Th+rkLAJlKdR4Zc5f/d5vYakSPlAK2/B1E3F0ZyH+OTYb3c9i9lCs7x2wJpJHTYg== X-Received: by 2002:a05:6000:1a8c:: with SMTP id f12mr1810358wry.173.1614326745988; Fri, 26 Feb 2021 00:05:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 28/29] chardev: do not use short form boolean options in non-QemuOpts character device descriptions Date: Fri, 26 Feb 2021 09:05:25 +0100 Message-Id: <20210226080526.651705-29-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Options such as "-gdb" or "-serial" accept a part-QemuOpts part-parsed-by-h= and character device description. Do not use short form boolean options in the QemuOpts part. Signed-off-by: Paolo Bonzini --- chardev/char-socket.c | 10 +++++----- qapi/char.json | 4 ++-- tests/guest-debug/run-test.py | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index b7863b8aae..06a37c0cc8 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -452,7 +452,7 @@ static char *qemu_chr_socket_address(SocketChardev *s, = const char *prefix) qemu_chr_socket_protocol(s), s->addr->u.inet.host, s->addr->u.inet.port, - s->is_listen ? ",server" : ""); + s->is_listen ? ",server=3Don" : ""); break; case SOCKET_ADDRESS_TYPE_UNIX: { @@ -470,12 +470,12 @@ static char *qemu_chr_socket_address(SocketChardev *s= , const char *prefix) =20 return g_strdup_printf("%sunix:%s%s%s%s", prefix, sa->path, abstract, tight, - s->is_listen ? ",server" : ""); + s->is_listen ? ",server=3Don" : ""); break; } case SOCKET_ADDRESS_TYPE_FD: return g_strdup_printf("%sfd:%s%s", prefix, s->addr->u.fd.str, - s->is_listen ? ",server" : ""); + s->is_listen ? ",server=3Don" : ""); break; case SOCKET_ADDRESS_TYPE_VSOCK: return g_strdup_printf("%svsock:%s:%s", prefix, @@ -607,7 +607,7 @@ static char *qemu_chr_compute_filename(SocketChardev *s) case AF_UNIX: return g_strdup_printf("unix:%s%s", ((struct sockaddr_un *)(ss))->sun_path, - s->is_listen ? ",server" : ""); + s->is_listen ? ",server=3Don" : ""); #endif case AF_INET6: left =3D "["; @@ -621,7 +621,7 @@ static char *qemu_chr_compute_filename(SocketChardev *s) return g_strdup_printf("%s:%s%s%s:%s%s <-> %s%s%s:%s", qemu_chr_socket_protocol(s), left, shost, right, sserv, - s->is_listen ? ",server" : "", + s->is_listen ? ",server=3Don" : "", left, phost, right, pserv); =20 default: diff --git a/qapi/char.json b/qapi/char.json index 58338ed62d..6413970fa7 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -47,12 +47,12 @@ # "return": [ # { # "label": "charchannel0", -# "filename": "unix:/var/lib/libvirt/qemu/seabios.rhel6.agent,= server", +# "filename": "unix:/var/lib/libvirt/qemu/seabios.rhel6.agent,= server=3Don", # "frontend-open": false # }, # { # "label": "charmonitor", -# "filename": "unix:/var/lib/libvirt/qemu/seabios.rhel6.monito= r,server", +# "filename": "unix:/var/lib/libvirt/qemu/seabios.rhel6.monito= r,server=3Don", # "frontend-open": true # }, # { diff --git a/tests/guest-debug/run-test.py b/tests/guest-debug/run-test.py index 8b91ff95af..2e58795a10 100755 --- a/tests/guest-debug/run-test.py +++ b/tests/guest-debug/run-test.py @@ -64,10 +64,10 @@ def log(output, msg): =20 # Launch QEMU with binary if "system" in args.qemu: - cmd =3D "%s %s %s -gdb unix:path=3D%s,server" % (args.qemu, - args.qargs, - args.binary, - socket_name) + cmd =3D "%s %s %s -gdb unix:path=3D%s,server=3Don" % (args.qemu, + args.qargs, + args.binary, + socket_name) else: cmd =3D "%s %s -g %s %s" % (args.qemu, args.qargs, socket_name, args.binary) --=20 2.29.2 From nobody Fri May 17 10:34:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614327569; cv=none; d=zohomail.com; s=zohoarc; b=NqfXiDpRvh6vIBygJezHqs/u+pE89IZj35g+md1N6aZ7QO5c6Cd4mQjWB1J/BfvYg4JCFOa6CgTRVWNnqS/g8CUwjN+7YnaFiMFG2hsLYOMXHT0LJzSa8ADYMR6Y6Cic3RTUjvhTu3BLr7toc38ZlBKoLSHXJE0vAI6Hmhi1hks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614327569; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LXNkYFS5l7kUXq9kRDwi/4xS2o8Je0/mCuHM1El/ua4=; b=OcfR+aI0yXmCKYKZaIxY7narOQBHG2jepDV/HPXnYFP7H8qTK6hNUxXbP7+VPoVUZigNTB4/hN1NZkax/gVb8EguzLDEm0BsjsgfzwVFi1O5/7wTj61N+epkNN8WHLQEE/Qou8jqpBxkgOzSp6F7ASNOSee38So47QixgtW8bNU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614327569277995.6428159849869; Fri, 26 Feb 2021 00:19:29 -0800 (PST) Received: from localhost ([::1]:33180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFYLP-00079P-SW for importer@patchew.org; Fri, 26 Feb 2021 03:19:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFY8E-0001yR-9e for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:50 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:40523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFY8C-0004Ee-1l for qemu-devel@nongnu.org; Fri, 26 Feb 2021 03:05:50 -0500 Received: by mail-wm1-x334.google.com with SMTP id u11so794079wmq.5 for ; Fri, 26 Feb 2021 00:05:47 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n66sm10700830wmn.25.2021.02.26.00.05.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 00:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LXNkYFS5l7kUXq9kRDwi/4xS2o8Je0/mCuHM1El/ua4=; b=LKI5PMZ4Pc2Oa/wQqDLgWbxVDAe0Bw7KRVJgcYnkkMDc1SHpKmwmvg0o+pncY2vs9S 3PS/GpqboSHsQWVs/tCqYs7KT9ysLgMvDnzSaW5Km8JtOqa5UhoOgQdQkmSHuCcEhJZT /wIIB8Fvkbc2OxjveQWEpe8C3m9zf5oe5e+nePNVUuiOYpLz7R1m5D8uCtXsqLtujzZm XUP5Ry3Jsa/SqpX8Gny8Nf+wNvaNs/XePpp/VGf6RNOTzHgHrzn6ox8C0hhWadLpuc3x vE4qiTdEWYp+PgLSpUGXqSLq+wk032EsH2TsOZGY5EpaVsGESGw3KtebBSGFdbRWg4kx JQeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LXNkYFS5l7kUXq9kRDwi/4xS2o8Je0/mCuHM1El/ua4=; b=UMpdYaYRnUPetiQlILmItw03ZKV8ETw/xi7fGJKoTGK+LW0ZNs1nvpcJLZx7cTluFg dPR8k1AtA7whIpZi+/Ls6XAX1yw0jUQ3L/b3iziE96FAEC5fyspLuLKjQrBrOf0oAkkm aGu18yCrhyQaHZh8t/sMJgzfSHWatCAVSN/6r7IE9OZSMB8EM3XZcScu/VvtZeMJareh Sq3N0+Wsiql/xr8osjRPDStbbtsTuuHp8rHyyIfX5TYTqFP9ipIVnnbfxsWLIocRNu8S Irsl6v38YB8/PbiUrqZlYbky6epnsl988JNSGBj6Ap363bDXpIrFzQPzohdxAlmuLT75 CEAA== X-Gm-Message-State: AOAM533JjF8ERlfsmZY4P6JHcWr5f9tAUsB2+nfa2U5/+rUQNO4BHSqd St5juu06x4hhsZuE8pi2scKdIkwaUyE= X-Google-Smtp-Source: ABdhPJwnR/d1q5II2L5dZNRNd2teNKu3fPiaKE4gWNSE6vwWYiY7OS7kQkia0fY7J/XzXompKZhV6Q== X-Received: by 2002:a05:600c:4f91:: with SMTP id n17mr1586279wmq.48.1614326746587; Fri, 26 Feb 2021 00:05:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 29/29] tcg/i386: rdpmc: fix the the condtions Date: Fri, 26 Feb 2021 09:05:26 +0100 Message-Id: <20210226080526.651705-30-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210226080526.651705-1-pbonzini@redhat.com> References: <20210226080526.651705-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x334.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zheng Zhan Liang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Zheng Zhan Liang Signed-off-by: Zheng Zhan Liang Message-Id: <20210225054756.35962-1-linuxmaker@163.com> Signed-off-by: Paolo Bonzini --- target/i386/tcg/misc_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/i386/tcg/misc_helper.c b/target/i386/tcg/misc_helper.c index f02e4fd400..90b87fdef0 100644 --- a/target/i386/tcg/misc_helper.c +++ b/target/i386/tcg/misc_helper.c @@ -222,7 +222,8 @@ void helper_rdtscp(CPUX86State *env) =20 void helper_rdpmc(CPUX86State *env) { - if ((env->cr[4] & CR4_PCE_MASK) && ((env->hflags & HF_CPL_MASK) !=3D 0= )) { + if (((env->cr[4] & CR4_PCE_MASK) =3D=3D 0 ) && + ((env->hflags & HF_CPL_MASK) !=3D 0)) { raise_exception_ra(env, EXCP0D_GPF, GETPC()); } cpu_svm_check_intercept_param(env, SVM_EXIT_RDPMC, 0, GETPC()); --=20 2.29.2