From patchwork Tue Jul 12 09:58:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 589797 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5817:0:0:0:0 with SMTP id j23csp121762max; Tue, 12 Jul 2022 03:12:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tOP/an+vEq0b9a7gk2qJ1/C8bsH4t08Gyl2tzSsRQ+1pdzBjs334NufRf7oQw8TaGy2GSB X-Received: by 2002:a0c:f903:0:b0:473:14ff:f089 with SMTP id v3-20020a0cf903000000b0047314fff089mr17053875qvn.20.1657620745005; Tue, 12 Jul 2022 03:12:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657620745; cv=none; d=google.com; s=arc-20160816; b=ayBA7c3UfTwqgp8FcMciOEPjtZfFqEKNZQVUDTW3sDeK6yFnyqmJWY5gwW9eY4aJ9E Ked86t3lSTb9YaumBuNv/G8i191O6BEjn0HcdzFzI4PfjsxYiZJpKih8tTi+hPkW+PVY EY+VAscyQWC5HC8CR+ZruwrNvl0j7FABGmf2QtUtdPwysOTAnko4bqV4mL6vZc1gTKFQ HSXCGb3kwLgfrD/fMl99Ppq3YFAsdqdgaRnX5IZ6H7hf/1XLoOOQ35zgzqfnbtFQJieP DwgdAcIdsDdlBL1+UdBRcS2bZ2PeNinDM+75KeWKdvURfE7pPNLS3UvlMTb+SlPDRz1K GRYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=rJ+VyvcSydqu+4FCbS9hByiPkxhrQVr0Qvk9HN6Gx1E=; b=VDCDsPezukA7l/g1EWzmovfEUEAbuhduhKZdXsuyY0GYvwHfgNfzKvN8kUoWyLA8Yp zK7OWFlAkyoS6f1nn7SSoVHqYtJjQhVNvRhJGCgmnyuXMd01KfvYOLN9NKtO3WGrkQqA EUmR/8doqVYXD0MnGxofiNO6NR94mhsN37uT08uHWrn8KRApXcVqFIr9XgQ7B+7kKHpS tqrONGod61yH0dsa6dvuUpYkkgh3jk97VI+UEOYf+D+r7JOCrHAo0hQLpz2K0O/6e4xI VBNRjrjf3OiSRWlox+0ZsP1UYYso/S3JbokD+AYMUhkufdb/FND7zREdp23Uv2Dx8CMc 9k7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nPaqjf0f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gc3-20020a056214230300b0047301cec878si5254443qvb.582.2022.07.12.03.12.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Jul 2022 03:12:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nPaqjf0f; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBCsS-000131-Hq for patch@linaro.org; Tue, 12 Jul 2022 06:12:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBCfh-000671-4t for qemu-devel@nongnu.org; Tue, 12 Jul 2022 05:59:13 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:46852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBCfe-0001HN-JJ for qemu-devel@nongnu.org; Tue, 12 Jul 2022 05:59:12 -0400 Received: by mail-pf1-x42d.google.com with SMTP id a15so7027340pfv.13 for ; Tue, 12 Jul 2022 02:59:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rJ+VyvcSydqu+4FCbS9hByiPkxhrQVr0Qvk9HN6Gx1E=; b=nPaqjf0f6pqR2Ge5Xj1ct/KdpT2WusjSoNFXHYsgLnd2ltGC5waFQ/BSe+/yw1kwHL 1NRxN5SkjDhTcJpl0moiJKZXWPTYQQqXP1NJuj4QLx5qtpNpZk+tdgkV00XK9aVsKx3I udOQzQdLGm9m0xWoEh/s+MKl/+gmVFcnh48BgK0bCw8SgYYdGAQ7anUeA7P+wgS2+ZN1 WNBqMeS56YUwf1tZKUl6I46jr0erLnD6Qqzjzewt05YZu7m5la061y660rfxt2p/k54+ O3COpe53oDB9b+cgVgQwPRXyy7XTfw2EmpqhYwhEYoA0awRonFI4VU/7cW1yA1uxjEsS joYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rJ+VyvcSydqu+4FCbS9hByiPkxhrQVr0Qvk9HN6Gx1E=; b=QkdrbBdU8Lm0SHt/ai8A5S3Dq3E1RhzPJy6V77liqfvLSePmAuLA1zEmEyKvGNzoM1 +Pc3n8Bi2DnaVApivvo8FZW1FK8KCgTVu7q83wk/rq+NrR45UggmU6EjgBmSMhehzh2q yND6KoO6xJt8sOY+lVeulaSYIcmQMt57f2DAgoo+Im/l0GIf6s7XUyPNaTDJw/fnTh2h Ox+4g2ob8huYTKpxlWIGKmQZmvQYAPk1FKnW7T1sqbR7DQG4g7uGUWOmyL79xpEM4Luq 6fiLpSEz/rsBocxOSaklXZsA4FmetQCEzebxiKjCZ2rYjsJSOdSwMOtcJxFRtYjJzSe8 6TkQ== X-Gm-Message-State: AJIora9sNcJ+vAhuqbNxuRd3UuxxwYFvHMk3tA9l6gpjZhgu+HGqkWwi bBZ9Va3N/WCYxmW1VLcNByIqzrblPgTjpdq6 X-Received: by 2002:a63:9b0a:0:b0:406:8c31:47e6 with SMTP id r10-20020a639b0a000000b004068c3147e6mr19609759pgd.329.1657619949163; Tue, 12 Jul 2022 02:59:09 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id s18-20020a170902ea1200b0016bdb5a3e37sm6348990plg.250.2022.07.12.02.59.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 02:59:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [COMMITTED 1/3] gitlab-ci/cirrus: Update freebsd to python 3.9 packages Date: Tue, 12 Jul 2022 15:28:59 +0530 Message-Id: <20220712095901.212353-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220712095901.212353-1-richard.henderson@linaro.org> References: <20220712095901.212353-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" FreeBSD has stopped shipping python 3.8, causing our cirrus builds to fail immediately. Upstream lcitool has an update to address this, but has also reorganized its source tree so additional changes are required for 'make lcitool-update'. In the meantime, fix the build. Signed-off-by: Richard Henderson --- .gitlab-ci.d/cirrus/freebsd-12.vars | 3 ++- .gitlab-ci.d/cirrus/freebsd-13.vars | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index b4842271b2..f59263731f 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -1,4 +1,5 @@ # THIS FILE WAS AUTO-GENERATED +# ... and then edited to fix py39, pending proper lcitool update. # # $ lcitool variables freebsd-12 qemu # @@ -11,6 +12,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-virtualenv py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 546a82dd75..40fc961398 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -1,4 +1,5 @@ # THIS FILE WAS AUTO-GENERATED +# ... and then edited to fix py39, pending proper lcitool update. # # $ lcitool variables freebsd-13 qemu # @@ -11,6 +12,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-virtualenv py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' From patchwork Tue Jul 12 09:59:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 589795 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5817:0:0:0:0 with SMTP id j23csp112711max; Tue, 12 Jul 2022 03:02:24 -0700 (PDT) X-Google-Smtp-Source: AGRyM1seqOxA5JnUmYH9LBi6GD+Ztb5mYbxO07jXYwF6mSATKv6f/HiqACalEeMGDHhFzNe7upmi X-Received: by 2002:a05:6214:c25:b0:473:2d88:f5ff with SMTP id a5-20020a0562140c2500b004732d88f5ffmr16922014qvd.101.1657620144453; Tue, 12 Jul 2022 03:02:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657620144; cv=none; d=google.com; s=arc-20160816; b=mBw7Cv8JMxNWr1EaTwajfJuUHPrbh7+ofxOz0dtuZmq3c4tI4vrb3XB40alp2REErk 3bZaeS54knXW5x5T5kqfBNihxThNl3Mfxa79nf/oHVgOuiSKJoRWKbdhoZgWBc1hlA8/ NNKnPrDcZDLJ172nrwSPAJEgI+pbEBscZbBheEhLPyuS/bEW8OO2IAHH5Rybdt8FH/XZ JP8lC9tKGstJDsgrkOPjFr7r51O3+4RZz0e8Gl7clltyVLuUSTPrN6tsWzwDqir7jKz7 XNcDtDsjnTuvFtoRT2aAsvj7yJRmW0dbLKkMlEzLIaF3FpS09f/5yg90/kZrFQ9J7pj/ 8Ngg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zbOxxenHaKVYrkhpq6ujndTW/g6U1Cx28IHyEc7+Fms=; b=j1X/eBCTflWomOMu2mb8CTJd7kBJiXJQd21p/ZHVd9pvAWUq+17oR4DXCJOkW2NHGx UC8CFl8tEUt9Lee+PVCJ6S9lBHL+jgtBJCJRG4yQSk4/uUlKKJaBzLuzgcympBDejoe4 XvMiNhsuB2V1HUPCzYQGOa1Ox0Y1GygHraxAokGYoXg1hYlcvOcO7Fj9cMU4tIYaRo4J S6OoQwK9EQiI/2A+a5T19/1dLAP++95U5KDf74hCO3GxwU3HZPEk6jjm5E+9vpmwhHL8 R+wGItjLWuqwlNprucRO4R7VsKdaVby5PpQaB+0hsZIIPfB2HDSn9Rrl9Glvg15fajwm UT7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I4aMdhkN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id kk1-20020a056214508100b00470b57610c9si4075822qvb.273.2022.07.12.03.02.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Jul 2022 03:02:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I4aMdhkN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBCik-0006AV-Vu for patch@linaro.org; Tue, 12 Jul 2022 06:02:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBCfj-00067t-A5 for qemu-devel@nongnu.org; Tue, 12 Jul 2022 05:59:15 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]:36654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBCfh-0001Hj-RI for qemu-devel@nongnu.org; Tue, 12 Jul 2022 05:59:15 -0400 Received: by mail-pg1-x533.google.com with SMTP id s206so7114286pgs.3 for ; Tue, 12 Jul 2022 02:59:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zbOxxenHaKVYrkhpq6ujndTW/g6U1Cx28IHyEc7+Fms=; b=I4aMdhkN8WaqfY/0E0vNob0K2snm5nOuTH1phx2VmVMZymoBYjX+Om/AGZnCd+QYIR 2diT+V1vqWfYGgp7JBjuM1HGOaJhjKK/gC1f6a0O2nG69kumDOtHi4mkRxkkIv5awFVn 7N+hkUTD2XD6yx5ElKjytnx4NcEMHUSgSVIVSL6/K+HkqXeQNLo0onBN4bLVaasE+FT0 AZFAxN+uM7lGSnmw+lQ29RRnC+BuWtzKujgcm0OTdssOOsUvH975ahpt0hWGwprbdm5k P4+SXM71BNZBfeySAwwJpCX96rQaFX1IjLRrzGvoUbWoCXgZaYFTa3CwcdPhrHQb3Nrb LAcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zbOxxenHaKVYrkhpq6ujndTW/g6U1Cx28IHyEc7+Fms=; b=vgBUGrHn+daeZKDUWxGGRi79aD4HxeyF4ojg9wZkjsa1ZDzORQlAeM9GE+FhvEcdqy qwADKF9IOPG/1f1RnUzeWuFsQguAy/eIua89rkdhsmnQ2pLSlRLgF2ZalaWwJj/z86o7 LoL+Vrf7qaelytNvIj02/qOSBsG009hBnq0H/Sr38zQolaP4VOQn1pVkDjvJgkP2a8O7 CVRVwz6nYFSmN4nb8zzL6tFDhXsJ8hvPgiydi23DRCNFWzlihicS9JxSw0ecguIvU83q bDlqd6xz9yhJW2rbIewUbOlASQQLh+BgLdz46Ig7xMQPGkIynvABIlTT2vGr+Q6nQFky BQuA== X-Gm-Message-State: AJIora/qOroWbjWIvY0nchQmoiZq6q4MXWoFrOFiz011JFc4UhMC0vaq K8tXbzQ1uNYwArrb/MVUEvrvG9AonVcWCDL6 X-Received: by 2002:a63:1047:0:b0:40d:7553:d897 with SMTP id 7-20020a631047000000b0040d7553d897mr19260306pgq.485.1657619952421; Tue, 12 Jul 2022 02:59:12 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id s18-20020a170902ea1200b0016bdb5a3e37sm6348990plg.250.2022.07.12.02.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 02:59:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Vladimir Sementsov-Ogievskiy , Thomas Huth , Hanna Reitz Subject: [COMMITTED 2/3] iotests: fix copy-before-write for macOS and FreeBSD Date: Tue, 12 Jul 2022 15:29:00 +0530 Message-Id: <20220712095901.212353-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220712095901.212353-1-richard.henderson@linaro.org> References: <20220712095901.212353-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Vladimir Sementsov-Ogievskiy strerror() represents ETIMEDOUT a bit different in Linux and macOS / FreeBSD. Let's support the latter too. Fixes: 9d05a87b77 ("iotests: copy-before-write: add cases for cbw-timeout option") Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Thomas Huth Reviewed-by: Hanna Reitz Message-Id: <20220705153708.186418-1-vsementsov@yandex-team.ru> Signed-off-by: Richard Henderson Reviewed-by: Warner Losh --- tests/qemu-iotests/tests/copy-before-write | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qemu-iotests/tests/copy-before-write b/tests/qemu-iotests/tests/copy-before-write index 16efebbf8f..56937b9dff 100755 --- a/tests/qemu-iotests/tests/copy-before-write +++ b/tests/qemu-iotests/tests/copy-before-write @@ -192,6 +192,11 @@ read 1048576/1048576 bytes at offset 0 def test_timeout_break_guest(self): log = self.do_cbw_timeout('break-guest-write') + # macOS and FreeBSD tend to represent ETIMEDOUT as + # "Operation timed out", when Linux prefer + # "Connection timed out" + log = log.replace('Operation timed out', + 'Connection timed out') self.assertEqual(log, """\ wrote 524288/524288 bytes at offset 0 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) From patchwork Tue Jul 12 09:59:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 589798 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5817:0:0:0:0 with SMTP id j23csp126745max; Tue, 12 Jul 2022 03:18:01 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tT5JMGH564HeayaDQBCoPh0/OQMBW6PipKtvEqhH3AxWqhi6vhdcUFmcI9ai6LP4RnR12G X-Received: by 2002:a05:6214:4115:b0:473:4828:a8ef with SMTP id kc21-20020a056214411500b004734828a8efmr15119217qvb.62.1657621081785; Tue, 12 Jul 2022 03:18:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657621081; cv=none; d=google.com; s=arc-20160816; b=x9J6WT++EYug6MzT6WnN3whiXzh4NWBSwl22nvTg3Ak7He4ggLtyuilyzHHLFPEfbI NVJ+c2DbmJuiIl7we10FyAYVIWyS7S9bFldmfJvN+BBzm3d5g+DXNVScWPu/RXfrcNA7 VpPELig/8aoIQg2NMrCq6LNFZJ9a9ibApcGW/bn3egKMtzsUy8FhOvocwXkCTHBXfyva MNVLFsh+7hJtpqcEKx2JAtqy1EbEWRtVjnkrO/zsMY95TTRqnSCt8xl/WWew3auEU7UM E2edfK2D177taS/ozaPqiEaaE1Txaic4NrCA+RjPIT1YV27M6yntfQB91zErGjNMc9sG lJ9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8D+naDWZLCHEn9jSH25u5UsvgNBDEBh2df0ljLbC5x8=; b=l+PTUnBkqP3hAn3PPqM8khQW61XCbkK+k96/Oe6xEf4/sLUzg9qRj2Ya+ixYRtF6lh Lv6vsoqaCfvwGx2/qIthwJeWNpO/5RmvX/IAD/hy5GDNEkW8zZ7xXLV7Kgxde9AnJsuv JdTy5hZN+uInG9MY4f9KZ+P7KKztE5+VZ9wK1MGoCNXAi8ASqL1LQ9hUdJ5Ut0/Txtjd BCUO5izRXvgklJcDl61RfWzHFUEk/I55RmjT9mxh3glj6lPl9G/Rsc+sATVIXYp7SEGa kUwtnVJssqmPpTBPlKlLSKTtQvvIhU/FNAkum8jJg8MxZrOQrSqjIwWiza9GXtho11Kr ayXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u4e0Hv5K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e14-20020a0562141d0e00b004735dc40465si4247270qvd.441.2022.07.12.03.18.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Jul 2022 03:18:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u4e0Hv5K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBCxt-00061t-Bd for patch@linaro.org; Tue, 12 Jul 2022 06:18:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBCfm-00069g-Pj for qemu-devel@nongnu.org; Tue, 12 Jul 2022 05:59:20 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:45012) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBCfl-0001IG-4N for qemu-devel@nongnu.org; Tue, 12 Jul 2022 05:59:18 -0400 Received: by mail-pj1-x1035.google.com with SMTP id o3-20020a17090a744300b001ef8f7f3dddso7438202pjk.3 for ; Tue, 12 Jul 2022 02:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8D+naDWZLCHEn9jSH25u5UsvgNBDEBh2df0ljLbC5x8=; b=u4e0Hv5Kg7MBRAfCMuwYwV0TjTaxj53Un2ahbzBKCHsEQe4MF5tYlIRBkoMJdCVCkh RWDhliFxYrOWgnb4FhY6pzUP6SQiaG3fSIMeSZFckB/U/YpWCwwrRteVHYaAA2XY0Tlp KCPOUPHq2fYxRef/oGsOZIYdZCHKKAegBwrAa88Au8zM1oAnnhSHAmgYHnEaEdqAs28V C+P65f6OOsCpIMJICHXL+KUTqzlYHEMVhJ+EXTZhb94kBAwgjPUKrob3ryMbJRv83hhC 8HslKdsvqb6cqCrZFMuuPaCogVj6xh2V4fl/w9PkNqOrCvRecGmayX3LdHFEFU9UJR6O CsIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8D+naDWZLCHEn9jSH25u5UsvgNBDEBh2df0ljLbC5x8=; b=BPgzdvQVucNYacHleNPjTHOAtZy87ujwF76PcDqlIKAzAyTlex+h0a01gYkL1937ZT SjLaEo2/kl0ZxABc7lQAqXLlyO8Dwp1fMU2bAwSPXqy9zH7pFfGFSMJlKqWMk/BTvq/q 6waNi7Au7IdKWpyVJn/LHv05Puc6IQjCxcuCeBvdrrFqmKcRecORaMeJzxZk3j8/UZYI dAgSqrXaV8RIkfcKmoyzRY73U4ldpxLw2pGigooGTyTa7lahCo8cW7pFbh+K2+GTVH9u 7khzBOnJMroVrIq99/i9VMzMf8n/GOysD/H1Q6sgycNYbkj3wKR1D2bzjTTEevxjdYY8 E/Rg== X-Gm-Message-State: AJIora89rFe3iA26V2MM97iXDqLrhNIW2v+iaSHoWy59xy0dQh2kwFj8 8EBmj3oUxnYtWL1qsCJ5+GziIWwvQaokTDQk X-Received: by 2002:a17:903:244d:b0:16c:52f1:ceb with SMTP id l13-20020a170903244d00b0016c52f10cebmr6218083pls.120.1657619955094; Tue, 12 Jul 2022 02:59:15 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id s18-20020a170902ea1200b0016bdb5a3e37sm6348990plg.250.2022.07.12.02.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 02:59:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Vladimir Sementsov-Ogievskiy , Thomas Huth Subject: [COMMITTED 3/3] iotests/copy-before-write: specify required_fmts Date: Tue, 12 Jul 2022 15:29:01 +0530 Message-Id: <20220712095901.212353-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220712095901.212353-1-richard.henderson@linaro.org> References: <20220712095901.212353-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Vladimir Sementsov-Ogievskiy Declare that we need copy-before-write filter to avoid failure when filter is not whitelisted. Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Thomas Huth Message-Id: <20220706170834.242277-1-vsementsov@yandex-team.ru> Signed-off-by: Richard Henderson --- tests/qemu-iotests/tests/copy-before-write | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/tests/copy-before-write b/tests/qemu-iotests/tests/copy-before-write index 56937b9dff..2ffe092b31 100755 --- a/tests/qemu-iotests/tests/copy-before-write +++ b/tests/qemu-iotests/tests/copy-before-write @@ -218,4 +218,5 @@ read failed: Permission denied if __name__ == '__main__': iotests.main(supported_fmts=['qcow2'], - supported_protocols=['file']) + supported_protocols=['file'], + required_fmts=['copy-before-write'])