From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069699; cv=none; d=zohomail.com; s=zohoarc; b=jrTYvCFcEdcvP2gP7rWrJLIkmGHPggVSj6oIkW4feGKrBShXR8A2AaCvB0nT7OueZq4E6l1p2lDaGM5ZwkgrWXEHlaVeQRukvoP+RAyXIYm1/qlPEhydM3n7aEOtYQhH9Nf8qa/nu5DkEwuXEi5i54mcs7MXG0vgRjNApHyeFyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069699; 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=xAI9peY/y5p9dVc6W035jPsyHtbIsgLa8iFPkn3MNGg=; b=M2yXsaopkRDvJN4nfeHpKPQzuI7XIApIkzJuhn+1MokX6y5pbi1e85yIIvXHL5clfLuzFZaHU83sTksr0KMuauN8IPAP4eaznVUpmbAF7zVhdufuJ1FyHJiDcbceVg+fpVVGf9MKDOQLr+9kuAOO06Ip/NXfazuqbSJdthpIaq8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069699376488.7636598919232; Fri, 21 Apr 2023 02:34:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn8w-00083N-94; Fri, 21 Apr 2023 05:33:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn8u-0007zZ-E1 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn8s-00030t-Bi for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:23 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-319-3GW4wyW3M5iH7zQKmAslGw-1; Fri, 21 Apr 2023 05:33:20 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-50692ecb3c5so1612841a12.0 for ; Fri, 21 Apr 2023 02:33:20 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id e6-20020a1709062c0600b0094ef2003581sm1821937ejh.153.2023.04.21.02.33.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xAI9peY/y5p9dVc6W035jPsyHtbIsgLa8iFPkn3MNGg=; b=DCBc4IKd67zTis5ChkgsQtCqCBu8PNOamoSqo1hhztxEWxd3/EGjMsdv3cBlS5hZUotE07 azs8FdjDZ/02tEk+Uz4HOoDGA9RzzdpfazPestTKjpEQdFnKy7QK8mlccfEFuAmXbIPnM8 LQqfn2Is17L7m4v5u72LTuZroPu1cpI= X-MC-Unique: 3GW4wyW3M5iH7zQKmAslGw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069599; x=1684661599; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xAI9peY/y5p9dVc6W035jPsyHtbIsgLa8iFPkn3MNGg=; b=aBJZXYQJpby/nSd7PVPQ6jntha8TRXeTYH2OMRbZpI1f3JGq553utY2NYp6BdJV0NV G6rIcawq1UaokEi8vj8+ORgs0y8y1Ojh5gxeI7aCJwWSMnWVfcEliWu76WpJq9QstNsK SBxStbA7eRx1lKCwYBU0JoLl6t5P6mPQ+iCoLJblMvE2AtEsCplBdhoAmCEPFkzCjqUw 7MKyq5MT+lpk26pIJpXzMiMbpT285/XJ+DU7yGFVAaQi4I7T9xhkux393P5M5ngS7gla pYjDQmit22G3NTvVb40ZJdvCrkaXpx+hRB90fNaIqSXe59bm7ambyow2aNDVEBvRgpyJ c3Ag== X-Gm-Message-State: AAQBX9d1JHr6OiaZibCcFLFvMmBeV7FXMe6hPlY0rSvVp0dXxJo+Vc3O gn+OPKVFwqusOLip3DIvKVtyqythVj3alMv/BWDWy4ZT4f+qWI161f+IHFXdrSjTqD0qJbPVxw0 e9HC/sksvw01FJ5pBpnPjWFmVu4mTqtvyU/AMbL1SnUsNF9b9kee1XkLnsf6n+6Bv4aEAx7Q8G6 Tfaw== X-Received: by 2002:a17:906:cb94:b0:94a:4ce3:8043 with SMTP id mf20-20020a170906cb9400b0094a4ce38043mr1757108ejb.52.1682069598880; Fri, 21 Apr 2023 02:33:18 -0700 (PDT) X-Google-Smtp-Source: AKy350YsP9TSjZDYKyeKtrkMbGeEKUf4R54tP76N9VuSAO8CzOwl3jzxwrF7b8vIBTTTdXMZDkvH2g== X-Received: by 2002:a17:906:cb94:b0:94a:4ce3:8043 with SMTP id mf20-20020a170906cb9400b0094a4ce38043mr1757091ejb.52.1682069598449; Fri, 21 Apr 2023 02:33:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 01/25] mtest2make.py: teach suite name that are just "PROJECT" Date: Fri, 21 Apr 2023 11:32:52 +0200 Message-Id: <20230421093316.17941-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069700526100005 From: Marc-Andr=C3=A9 Lureau A subproject test may be simply in the "PROJECT" suite (such as "qemu-common" with the following patches) Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20230302131848.1527460-2-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/mtest2make.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 0fe81efbbcec..179dd5487182 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -51,10 +51,11 @@ def process_tests(test, targets, suites): =20 test_suites =3D test['suite'] or ['default'] for s in test_suites: - # The suite name in the introspection info is "PROJECT:SUITE" - s =3D s.split(':')[1] - if s =3D=3D 'slow' or s =3D=3D 'thorough': - continue + # The suite name in the introspection info is "PROJECT" or "PROJEC= T:SUITE" + if ':' in s: + s =3D s.split(':')[1] + if s =3D=3D 'slow' or s =3D=3D 'thorough': + continue if s.endswith('-slow'): s =3D s[:-5] suites[s].speeds.append('slow') --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069920; cv=none; d=zohomail.com; s=zohoarc; b=MsZcsBJaEujeogVtVlNAeLxusmOvJnE3PrupWU8VJnYuoFbo9Ki12CiUvBGlnfWuEGETLQUrIasdPq5CP7nBRu4x6INhxSSOZz9txCpNh7YBXrTGij/0n+iHVUFGvGc8+PhmaMYgbtsxCioFMbm8hV8Uypy31xh4ewDlEF92WDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069920; 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=2Xx/pVvAIRfBuk5iIu8CGp8nTrUflufmiH8BoDTBF0c=; b=ZgYmK3Yahj4jfxDL6WN7TCGJyraqJo+MaRd29EwuIy8cWHHOjMzbQXjlySaTk2pde1d54PRfjNqAnBcy2KaKtNEvt+J4LfG2VrM5xJLTwCkZ7746pntrLcCDLfXId+8UU5Cif1HyPCAQ6loJWRrw+BhfiLSS+OvmAAfK1UqoaSc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168206992072334.07355995978537; Fri, 21 Apr 2023 02:38:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn8x-00084M-L5; Fri, 21 Apr 2023 05:33:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn8w-00083M-57 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn8u-00031B-KF for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:25 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-371-LU2jgpaBPhemLyStef21-Q-1; Fri, 21 Apr 2023 05:33:21 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-50489ad5860so1367924a12.1 for ; Fri, 21 Apr 2023 02:33:21 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id l22-20020aa7c3d6000000b00506be898998sm1650332edr.29.2023.04.21.02.33.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2Xx/pVvAIRfBuk5iIu8CGp8nTrUflufmiH8BoDTBF0c=; b=G8Ooq8GrRlxG6mZURORfBiKf1yaGA32azGGHGskwzYB000uMcl0bKveR6o0PIjgeczDhny AH0eN0/YU8xbvZNEfHPJHbte9etqlQEh1G2eE/Zdz7dnCyHZmEr1+ISlTEq1t6j4a687VS Ej2yzezv+2vO/yQUv8meqrLXllDtpF8= X-MC-Unique: LU2jgpaBPhemLyStef21-Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069600; x=1684661600; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2Xx/pVvAIRfBuk5iIu8CGp8nTrUflufmiH8BoDTBF0c=; b=IwkFl0IGUhPMy9OxtaAat/JE6idHX4HDgEfzWx/ilJtAZBID3mmt9XMGv/GgTuteMj rNrXSK0sMxlBHMFdJZs3hO4zbkT2Bth1T38zZbmHLB34I2Kc9HZ2Da23DJzj7lbr77Bx bUXEeuiVm5m4WxlkV9S4Pwm9XoH4BNikWZuS7wTEAtoDdcCIMoUWps3RZ8/n83klWg6F Y+isy784FTnT0IzjR4bxOtLKOIqhGKgk3k0t9hci2Qfi/tEykZjpi7aIYDcAnJAqEpRz gxdGoQcQFYbGJiKtT5uS+vOqt6Nh14wAUNed9xlFdjkxqSJ3nb64pNt8ba4dEdgjJKpe SO3A== X-Gm-Message-State: AAQBX9etkje6hyQtxjL19AgAhtYImQohVLeIbHXbqhlgntTXbe7WuE72 2iL7w20LgpQdgw9TsFZ0xQEcIifJRgcJXkxhonlToIlcqdTkb5aZz4i4FgYJI0t6cx2JR7zyKtG urAuxOPw/kb7KmyHcXC5fYp+YRPUkvyCMt+pSVdQPwBBurFAHU/Vk8il7ID6vji9wzJyvucnG2t xPXQ== X-Received: by 2002:a05:6402:b34:b0:506:6008:995f with SMTP id bo20-20020a0564020b3400b005066008995fmr4303750edb.39.1682069600125; Fri, 21 Apr 2023 02:33:20 -0700 (PDT) X-Google-Smtp-Source: AKy350Y8RJj0zlrNH1V776baByRX+hB/7cgLF1x4nTjkDpsYf7dS+nfWI2YRUHTkVd8ZyqzstxIFJA== X-Received: by 2002:a05:6402:b34:b0:506:6008:995f with SMTP id bo20-20020a0564020b3400b005066008995fmr4303735edb.39.1682069599744; Fri, 21 Apr 2023 02:33:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 02/25] build-sys: prevent meson from downloading wrapped subprojects Date: Fri, 21 Apr 2023 11:32:53 +0200 Message-Id: <20230421093316.17941-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069921697100003 From: Marc-Andr=C3=A9 Lureau The following patches are going to introduce meson wrap dependencies, which is a solution to download and build missing dependencies. The QEMU build-system would do network access with no way to avoid the fallback. As a start, hardcode "--wrap-mode=3Dnodownload" in configure, so that wraps would be used only after a conscious decision of the user to use "meson subprojects download" (before running configure). Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20230302131848.1527460-3-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index 800b5850f402..6ed66ec6abda 100755 --- a/configure +++ b/configure @@ -2615,6 +2615,10 @@ if test "$skip_meson" =3D no; then =20 rm -rf meson-private meson-info meson-logs =20 + # Prevent meson from automatically downloading wrapped subprojects when = missing. + # You can use 'meson subprojects download' before running configure. + meson_option_add "--wrap-mode=3Dnodownload" + # Built-in options test "$bindir" !=3D "bin" && meson_option_add "-Dbindir=3D$bindir" test "$default_feature" =3D no && meson_option_add -Dauto_features=3Ddis= abled --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069859; cv=none; d=zohomail.com; s=zohoarc; b=Da8O+zGhkdYQ8UWLhAX15EB1STRvSks1GwlPUWrT/IIzxF+yyDF5KuigetJrqms3Qw0f36TADfybk71o2mJ0S67h0f9+kxc7WP/gYqGTLYOIcdR8F4MbChaZsCkqtkAd8PWe3vWjjCXeNBxNtl8xN3yWfi+6xRrWmRI+eJM0MSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069859; 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=QHH/rhb7LzSAHW6poksuTPs4ZCgAMWLJKQD/UMNwHog=; b=jTN3JIpwI+FaqXGQHyL8h2rWEs7dXq8CpPuxLcTEfHJG6qA1AxFbhVI6bdRAlK5N+VYZgU7lL/D+i4pQ7KdVIqERM6/jHjDL8s8iq09vohVMRLi34TjdYs3ehA6jHGMx5QQKMLl5r9Rn8dyDBYqy2MOXswKSq21xOdNowGKHVHo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069859194716.0893039138381; Fri, 21 Apr 2023 02:37:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn8z-0008C8-9L; Fri, 21 Apr 2023 05:33:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn8x-000840-29 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn8v-00031M-Is for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:26 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-133-CJNN9PTpN5m4cl5DeMKIoA-1; Fri, 21 Apr 2023 05:33:23 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5069f2ae8eeso7116728a12.0 for ; Fri, 21 Apr 2023 02:33:23 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id g17-20020a1709063b1100b0094e6db4d4a1sm1817196ejf.186.2023.04.21.02.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QHH/rhb7LzSAHW6poksuTPs4ZCgAMWLJKQD/UMNwHog=; b=U9a8G3u1E3zhYIi9r52+kLyiiVwnwnXdIDacfYK6gdj47SWfMuJD2F2Gtrf3pzOzaY7olX JxbQzflrvX5CLgGXGEBHtIezS5iNcMVukcA70vD38Td/b0rYHN23lSnAfq4BxyWuD1Z/6+ 0SwwTze3IRl46NpkS82adDm0UZzX8e8= X-MC-Unique: CJNN9PTpN5m4cl5DeMKIoA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069601; x=1684661601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QHH/rhb7LzSAHW6poksuTPs4ZCgAMWLJKQD/UMNwHog=; b=D4obZ7AJ2CrDduDxCOeuHDWo9gABJ/l6exhJDInJNb1kl+UrU7Qq2MixtqHK2mqbrt D318l+r9QzUT0+HwjBKdoxhFcrGGBi3GsmYXok2LXfgY97vaGK3RpD5WOsfz6RXEEM3L PI5CBOWf6xZMy2RMqRPsRogqQJfdLAcClpvffh2kY4qjeJPoF3Xn/PSzdyrrnsWS9Zs+ 97hYqMykJU4FOcNUr3SoOibhinNxKmn3+y0rBn0wanU02i6VRkH6QHiHQnQtJrNQvuMN hbK5PYUVFY1XbtpqggeC+bvZNFoWZd5KNAX/6U8Om6+J2i/aFrbp+YGCPtQ8gAnFB2ok IORA== X-Gm-Message-State: AAQBX9csOjsSIMXViCQPv7ey3HhoLux66GUmNHtowGGG2dVfA7zbCCK7 4NrdcFMZeNn8HjxzAClzyE3gR0QuwXFqwxiOW2CIHYTabcxZVeMul0crdXassDzF9nqziQMmwQS pjFN0G3UtQlDDiVlsemcAJ2IYm6i6bDvn874n53JMNv2Rd3P96O97QRPtlaFshu3a9H2BmhH/Vq 2FxA== X-Received: by 2002:a17:906:1d51:b0:953:7d80:c40e with SMTP id o17-20020a1709061d5100b009537d80c40emr1938514ejh.0.1682069601700; Fri, 21 Apr 2023 02:33:21 -0700 (PDT) X-Google-Smtp-Source: AKy350bLzpWc6UmYsBc1DCaE2fWE+Lwt6FDtlUb/RsfH/oyFLyNq8yverdtj2s3TxwMoCc3m0LVhaQ== X-Received: by 2002:a17:906:1d51:b0:953:7d80:c40e with SMTP id o17-20020a1709061d5100b009537d80c40emr1938495ejh.0.1682069601406; Fri, 21 Apr 2023 02:33:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 03/25] build-sys: add slirp.wrap Date: Fri, 21 Apr 2023 11:32:54 +0200 Message-Id: <20230421093316.17941-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069861164100007 From: Marc-Andr=C3=A9 Lureau This allows to build with --enable-slirp / -D slirp=3Denabled, even when libslirp is not installed on the system. "meson subprojects download" will pull it from git in that case. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20230302131848.1527460-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- .gitignore | 2 ++ subprojects/slirp.wrap | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 subprojects/slirp.wrap diff --git a/.gitignore b/.gitignore index 61fa39967b54..1ea59f481921 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ GTAGS *.swp *.patch *.gcov + +/subprojects/slirp diff --git a/subprojects/slirp.wrap b/subprojects/slirp.wrap new file mode 100644 index 000000000000..ace4f26102f5 --- /dev/null +++ b/subprojects/slirp.wrap @@ -0,0 +1,6 @@ +[wrap-git] +url =3D https://gitlab.freedesktop.org/slirp/libslirp +revision =3D 15c52d697529eb3e78c5d8aa324d61715bce33b6 + +[provide] +slirp =3D libslirp_dep --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069807; cv=none; d=zohomail.com; s=zohoarc; b=fGmkUMdcqqEXfrZ7DHDrlJNT7I/JgUlhXYfxIrds79vBlFdRx+UqR+M6Wqn1DRkK5vuNRTowAhm9Ivj8dmcFc0pQFqx/g9Oy4ehJb/Lnf3FYrCLgyZsrAhC6cNXG8dK3e/PKheC9I90p40TH/I/Jn/OzDyHlW/jPlayZTY1cVus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069807; h=Content-Type: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=/63fz4Ph/jJK0ribSmtIQrNvkXgQl0x7w1TcAVvHFeA=; b=UxlSG1byfmKogNMdbtiNjj2sRsbRtAoGWJs3bYCyy3B5L8kGV48SVz8skVIjpFOwbpbdlu+VJV3tpmHRd/54tuwXeVutzNBvEg4hspiQ8GgyG493CUQS3vo2/lgQg8PR3F1l1Y8EKKveU1ryURIx9VdRGaj3YCE7Subpi7m1yqc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168206980746911.479499037949836; Fri, 21 Apr 2023 02:36:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn93-0008Dc-Gy; Fri, 21 Apr 2023 05:33:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn91-0008Cz-MC for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn8x-00031k-0A for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:31 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-622-bGxdxEU8MkKFcLue9xjyoQ-1; Fri, 21 Apr 2023 05:33:24 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-94eaa8f18eeso117433266b.1 for ; Fri, 21 Apr 2023 02:33:24 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id sd14-20020a170906ce2e00b0094f5d1bbb21sm1825232ejb.102.2023.04.21.02.33.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/63fz4Ph/jJK0ribSmtIQrNvkXgQl0x7w1TcAVvHFeA=; b=eO7PCCVC2mWJGThAWZzT/dqSeHPFRr5LzV0Qp1t4rjj9C/vdqyghVZKnoKoUW63vofHry5 FKgzsm7C9vVuvglZ3pst2DeximUTN2cQE8Tqixjk/t9abfaWfXpO9Ph84iJkVamT5Bo7Fm KMxag5C+Kimlgpb8W0Fc9rCx4C4fuzI= X-MC-Unique: bGxdxEU8MkKFcLue9xjyoQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069603; x=1684661603; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/63fz4Ph/jJK0ribSmtIQrNvkXgQl0x7w1TcAVvHFeA=; b=DSwZivC+7pcR1AJ0bNMURwvKwmIiVQLaQOCh+vsrOrSh+LGFdg7N86nhFxB6CCNWTS GtQRlg62bxQ2UCy/K2qzwCMQ24c2I+fl5S3Bbo8q8sIXLKpx/xIqdw/hjKy1XgUf0a5i WDqTL0Tp9e9iGQfudnMQuT2Z0IdW3/cVHCpGtk54RfE4xm9C+Wgp7nn/WTE+LiA42zrk ffKvlJlSDRLswOU4ksjBEJlA77f/SkVqA4X1GF4v7vjVMPrRBa66Z3dIgvrbg/h/diZY AVm+ccBtt4N37/0WXoGGS8gCLqMl0YXYXetX5/m+6SLegp5nHsyaNvAwpUsDqcP3w8wb LsCw== X-Gm-Message-State: AAQBX9dL6/dPaXsTbyIQp8wJl4x7NEi8S6MfCTowdBK/ucrgjxYj49os CTN0v7deC64T270/XCs0I1lz1jONOrhFZPvCX3G17tQRo2b8waRD2x9L1pN+b/D/slBsnJjYTUW E8M+0X5bf4GBEkXwRPwBkZXNzn/Q5t9RmODn7ztUOTK9DBfh4fKeqAlD5xrO2PXs6iLuPHap51Z hDOQ== X-Received: by 2002:a17:906:b0cf:b0:951:f54c:208c with SMTP id bk15-20020a170906b0cf00b00951f54c208cmr1578010ejb.41.1682069603391; Fri, 21 Apr 2023 02:33:23 -0700 (PDT) X-Google-Smtp-Source: AKy350Y5lu3eyxsi5D818qEh48I1XF5ayPbP8CXCBZ0Z+KqLUuzyv+5L8bADKHIa6bksduzScjVd2Q== X-Received: by 2002:a17:906:b0cf:b0:951:f54c:208c with SMTP id bk15-20020a170906b0cf00b00951f54c208cmr1577997ejb.41.1682069603050; Fri, 21 Apr 2023 02:33:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/25] nvme: remove constant argument to tracepoint Date: Fri, 21 Apr 2023 11:32:55 +0200 Message-Id: <20230421093316.17941-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069808092100003 Content-Type: text/plain; charset="utf-8" The last argument to -pci_nvme_err_startfail_virt_state is always "OFFLINE" due to the enclosing "if" condition requiring !sctrl->scs. Reported by Coverity. Signed-off-by: Paolo Bonzini --- hw/nvme/ctrl.c | 4 +--- hw/nvme/trace-events | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index ac24eeb5ed5a..f59dfe1cbe96 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -7158,9 +7158,7 @@ static int nvme_start_ctrl(NvmeCtrl *n) =20 if (pci_is_vf(PCI_DEVICE(n)) && !sctrl->scs) { trace_pci_nvme_err_startfail_virt_state(le16_to_cpu(sctrl->nvi), - le16_to_cpu(sctrl->nvq), - sctrl->scs ? "ONLINE" : - "OFFLINE"); + le16_to_cpu(sctrl->nvq)); return -1; } if (unlikely(n->cq[0])) { diff --git a/hw/nvme/trace-events b/hw/nvme/trace-events index 7f7837e1a281..9afddf3b951c 100644 --- a/hw/nvme/trace-events +++ b/hw/nvme/trace-events @@ -187,7 +187,7 @@ pci_nvme_err_startfail_asqent_sz_zero(void) "nvme_start= _ctrl failed because the pci_nvme_err_startfail_acqent_sz_zero(void) "nvme_start_ctrl failed becaus= e the admin completion queue size is zero" pci_nvme_err_startfail_zasl_too_small(uint32_t zasl, uint32_t pagesz) "nvm= e_start_ctrl failed because zone append size limit %"PRIu32" is too small, = needs to be >=3D %"PRIu32"" pci_nvme_err_startfail(void) "setting controller enable bit failed" -pci_nvme_err_startfail_virt_state(uint16_t vq, uint16_t vi, const char *st= ate) "nvme_start_ctrl failed due to ctrl state: vi=3D%u vq=3D%u %s" +pci_nvme_err_startfail_virt_state(uint16_t vq, uint16_t vi) "nvme_start_ct= rl failed due to ctrl state: vi=3D%u vq=3D%u" pci_nvme_err_invalid_mgmt_action(uint8_t action) "action=3D0x%"PRIx8"" pci_nvme_err_ignored_mmio_vf_offline(uint64_t addr, unsigned size) "addr 0= x%"PRIx64" size %d" =20 --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069628; cv=none; d=zohomail.com; s=zohoarc; b=LxGV5R7xmGrDxEyv0mbdKQ8ddZ2S0R8iErXH+UHAXbCq12l8aMo+DxOSDWRXIC+/7kpXNdVAumNDPXTtnCl8HDSl+JiqggSWpe9QukUTFwXW0HaNkDht58+EKKFCTTew+WiArSJArHecf6HjeThMnt9MTc7z0e3APv19CwfOUnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069628; h=Content-Type: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=0A1oNUBxSBJvG4Ve5ByHYqFUyNpEsrySK2IqWao6VYY=; b=M66g0lXomy1Kq3MLWilI2fTgiPQJXmwL6yfs6Y+ZZmkx2lImA4qRH5v2Vtl/Y0sbAKUDuWPF0TMh+shdYLBK7oehCuslXVjIVUTUbEmfl8cxG1LKKdr0FnytxCjrSOAOPUrTM5pDt+1vLeVYNkgyD2Mo2+gEamdOviI9fkPZUK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16820696285551013.0039427063766; Fri, 21 Apr 2023 02:33:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn90-0008Cr-Pt; Fri, 21 Apr 2023 05:33:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn8z-0008C9-Lv for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn8y-00031u-CK for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:29 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-543-JlQGzZg3PPanFI5esHpEig-1; Fri, 21 Apr 2023 05:33:25 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-953429dac27so122770766b.0 for ; Fri, 21 Apr 2023 02:33:25 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id y21-20020a17090614d500b0094b87711c9fsm1823908ejc.99.2023.04.21.02.33.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0A1oNUBxSBJvG4Ve5ByHYqFUyNpEsrySK2IqWao6VYY=; b=iOLQp8v5eK97vTmNGeGFT00C8hYHoHpyogcBKzgzTu/yGARtU4ThuDVnWEDy8nf8LwMKOD z3lVjjUj18f4THd3rhqMLoYJppQFlbjOk1+tp/HtGRoG2A6epFVUjzv+gjtLGVjzQWNxrk Ki3GaSENsbtqL6F5NwGT7BNejh7rRtY= X-MC-Unique: JlQGzZg3PPanFI5esHpEig-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069604; x=1684661604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0A1oNUBxSBJvG4Ve5ByHYqFUyNpEsrySK2IqWao6VYY=; b=Q9AB16j105to5FN4nQM5ypoYjB1CzJJ6iOAA6WBE80bK/qFt7ooBC116G+MgA1PO3T 6kUnxT/LIV6m6kqH33nKTf9O1zDCzE26oWhCGVw+It700/9dZ+8G0A6nL1OMTnp8np/T 05swBKsQpuj5IN8U35va9n6KCB7AVAVaV1/kdVAZHnp6xALBtESzi1NCML/b+VQ09nU2 HZYsujGZvBITuOpkuCQjRPnE7ND29xaw3k5MbWdMHfA2SD/L3OV3tFA6rascdu/2qfS6 ClbqVfs9331VZ79f2pdNId6ULc0G2/OFsy7QLi4kpY1hNtscLsWqmYvMfB6fOyHJIH82 P6zw== X-Gm-Message-State: AAQBX9eXHuTckeJ+zIaOBxk1yUgAkyJ2CeFVYuXTAFHd6uAescWMDZ2E +FrRAVuiILCideAe3QdtlS4xqznWxHMCIQhxNBoELNo0FMo4V3cAiivFuGxL4JLRTOTAsI3yAOt JVW4gpdmYVETGDn25AdkJ7Pzutc6HoblZiWF9BIntNYoM+Ut4sRIbDgT+qIhK8hcW6iX+ZhCEAb xLKA== X-Received: by 2002:a17:906:ce37:b0:957:800:912f with SMTP id sd23-20020a170906ce3700b009570800912fmr1777133ejb.71.1682069604555; Fri, 21 Apr 2023 02:33:24 -0700 (PDT) X-Google-Smtp-Source: AKy350bSG/nxI3WUX9Ws4704gdjeKQZ0WK1XC8GR+c4WOCET5QGPHbsQVZcRb1VScnClyh2KoVgfbQ== X-Received: by 2002:a17:906:ce37:b0:957:800:912f with SMTP id sd23-20020a170906ce3700b009570800912fmr1777119ejb.71.1682069604299; Fri, 21 Apr 2023 02:33:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/25] vnc: avoid underflow when accessing user-provided address Date: Fri, 21 Apr 2023 11:32:56 +0200 Message-Id: <20230421093316.17941-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069630348100001 Content-Type: text/plain; charset="utf-8" If hostlen is zero, there is a possibility that addrstr[hostlen - 1] underflows and, if a closing bracked is there, hostlen - 2 is passed to g_strndup() on the next line. If websocket=3D=3Dfalse then addrstr[0] would be a colon, but if websocket=3D=3Dtrue this could in principle happen. Fix it by checking hostlen. Reported by Coverity. Signed-off-by: Paolo Bonzini --- ui/vnc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/vnc.c b/ui/vnc.c index bbd8b6baaeca..9d8a24dd8a69 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3751,7 +3751,7 @@ static int vnc_display_get_address(const char *addrst= r, =20 addr->type =3D SOCKET_ADDRESS_TYPE_INET; inet =3D &addr->u.inet; - if (addrstr[0] =3D=3D '[' && addrstr[hostlen - 1] =3D=3D ']') { + if (hostlen && addrstr[0] =3D=3D '[' && addrstr[hostlen - 1] =3D= =3D ']') { inet->host =3D g_strndup(addrstr + 1, hostlen - 2); } else { inet->host =3D g_strndup(addrstr, hostlen); --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069852; cv=none; d=zohomail.com; s=zohoarc; b=OcNKhUw3r20WzP32YN4l5Abhxpo2SlNAv/OHMPW7SDpj/pOBrqgUZJJmCNFVB5EvoO95vQgSfScX5vzOglffAAFrYHIluFpwOz7a4Z/AQs6iouHG9LLw66IygL5fbvirqbl8+HCtukZzh3/5aBL1xiw3jl9liLzhdap4jHJw3K0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069852; 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=/Xg6B74lQi42FF0/EiEUhKHIks+R3MrRrX7HT5TNHyk=; b=HILElAPYlLhbvZuTiR3jW4FbaAWbzakdIs8YpEsYqrM8QupvEdhz06IaRbGWzm/DwNQd0Osu21Y1wMHiz7eUlglBId6DfWNL8PcIQQf21lSBhJ80d7qQAeFV84aM/9zPfewXghl+vxpJ0DehsN5czHilWuBSDQ/4HwEWFDl+LVw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069852045779.7488275258426; Fri, 21 Apr 2023 02:37:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn94-0008Ds-7E; Fri, 21 Apr 2023 05:33:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn92-0008DE-14 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn8z-00031z-PR for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:31 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-207-t3q610A8OUuXjOqGEt6qcQ-1; Fri, 21 Apr 2023 05:33:27 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9534238ffa6so143542666b.1 for ; Fri, 21 Apr 2023 02:33:27 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id r20-20020a170906705400b0094f05fee9d3sm1824384ejj.211.2023.04.21.02.33.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Xg6B74lQi42FF0/EiEUhKHIks+R3MrRrX7HT5TNHyk=; b=c0p9T+JpTjoIbS0UHYZOOvzUJeEAh0jmuBkdN2gjuKP6VpaOHuciGE0ceUBF3RitQAO6qY adfmcuN0JEGRSZinnyjuVbKtNFvCIURJQG18rbJdkV4seY4LNjUodpsxqUHPIsuI//cpFp ajouw2L72wM80SlywcsK3FYnZNKWiro= X-MC-Unique: t3q610A8OUuXjOqGEt6qcQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069606; x=1684661606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/Xg6B74lQi42FF0/EiEUhKHIks+R3MrRrX7HT5TNHyk=; b=IwwAY1VMdFCVOry8S9G8/9rwxrRdhmWY6zSPnO7ATMijYAY6CqkNtpdSTBNiKe7Vk+ 3VLgvXx0KKB9Mc1JJTD1AAAK6fC2M+HzduNQhh51UzZkePB4Y8KzpNXA6elh1skT1Jvx YQKwydMIXTcemayjcCHVNlhm/pxjmLhsh4GrTCxDxW9wXNOXdhPJ9UXcCt7DjOxi4wup emUaBbQIf9Jpu/6R5PJRvi1fSr/TPbeYvNt7TPuYSeTTzsPLI4Mdb2XwcApNDRfcD610 sWZBKPoucgcYmT1SJ0vDZSFIAIUo4mCg5rqbtXLTz2+4UrDNz5Hu107f0uwpzgZHdM7e Lh1g== X-Gm-Message-State: AAQBX9dS2whLuoRxN+vnNPdw/TgtEAqTeSocpLwlJaG4pjlM7xEyOX9C sVeE0Ph0gLufGSW3K/a7PAupg2ItiVTH1XJbzH6qUiSpMvnOT4WN0J1fLrzE01/fxba+uVieWTy kiNyi9FRwULDcQyAfuzsiq+4ywn0EYqeVX9LzGLO14fApx/M3Gd3K63PLIG2Hw30zG0JHbqRGUn qyYw== X-Received: by 2002:a17:906:c08c:b0:947:335f:5a0d with SMTP id f12-20020a170906c08c00b00947335f5a0dmr1565510ejz.62.1682069606063; Fri, 21 Apr 2023 02:33:26 -0700 (PDT) X-Google-Smtp-Source: AKy350ZAYuBkS7H75/NtlQMGPOez9Glkz6nWxVH7OGI8uRjRfvp4k3XGiyA+RURUWoefNf3r74fYjw== X-Received: by 2002:a17:906:c08c:b0:947:335f:5a0d with SMTP id f12-20020a170906c08c00b00947335f5a0dmr1565490ejz.62.1682069605622; Fri, 21 Apr 2023 02:33:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: "Michael S . Tsirkin" Subject: [PULL 06/25] tests: bios-tables-test: replace memset with initializer Date: Fri, 21 Apr 2023 11:32:57 +0200 Message-Id: <20230421093316.17941-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069852390100002 Content-Type: text/plain; charset="utf-8" Coverity complains that memset() writes over a const field. Use an initializer instead, so that the const field is left to zero. Tests that have to write the const field already use an initializer for the whole struct, here I am choosing the smallest possible patch (which is not that small already). Cc: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- tests/qtest/bios-tables-test.c | 123 ++++++++++++--------------------- 1 file changed, 43 insertions(+), 80 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 873358943784..464f87382e23 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -438,10 +438,9 @@ static void test_acpi_asl(test_data *data) { int i; AcpiSdtTable *sdt, *exp_sdt; - test_data exp_data; + test_data exp_data =3D {}; gboolean exp_err, err, all_tables_match =3D true; =20 - memset(&exp_data, 0, sizeof(exp_data)); exp_data.tables =3D load_expected_aml(data); dump_aml_files(data, false); for (i =3D 0; i < data->tables->len; ++i) { @@ -853,12 +852,11 @@ static uint8_t base_required_struct_types[] =3D { =20 static void test_acpi_piix4_tcg(void) { - test_data data; + test_data data =3D {}; =20 /* Supplying -machine accel argument overrides the default (qtest). * This is to make guest actually run. */ - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); @@ -868,9 +866,8 @@ static void test_acpi_piix4_tcg(void) =20 static void test_acpi_piix4_tcg_bridge(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".bridge"; data.required_struct_types =3D base_required_struct_types; @@ -906,9 +903,8 @@ static void test_acpi_piix4_tcg_bridge(void) =20 static void test_acpi_piix4_no_root_hotplug(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".roothp"; data.required_struct_types =3D base_required_struct_types; @@ -923,9 +919,8 @@ static void test_acpi_piix4_no_root_hotplug(void) =20 static void test_acpi_piix4_no_bridge_hotplug(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".hpbridge"; data.required_struct_types =3D base_required_struct_types; @@ -940,9 +935,8 @@ static void test_acpi_piix4_no_bridge_hotplug(void) =20 static void test_acpi_piix4_no_acpi_pci_hotplug(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".hpbrroot"; data.required_struct_types =3D base_required_struct_types; @@ -962,9 +956,8 @@ static void test_acpi_piix4_no_acpi_pci_hotplug(void) =20 static void test_acpi_q35_tcg(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); @@ -994,9 +987,8 @@ static void test_acpi_q35_tcg_core_count2(void) =20 static void test_acpi_q35_tcg_bridge(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".bridge"; data.required_struct_types =3D base_required_struct_types; @@ -1009,9 +1001,8 @@ static void test_acpi_q35_tcg_bridge(void) =20 static void test_acpi_q35_tcg_no_acpi_hotplug(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".noacpihp"; data.required_struct_types =3D base_required_struct_types; @@ -1105,9 +1096,8 @@ static void test_acpi_q35_tcg_mmio64(void) =20 static void test_acpi_piix4_tcg_cphp(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".cphp"; test_acpi_one("-smp 2,cores=3D3,sockets=3D2,maxcpus=3D6" @@ -1121,9 +1111,8 @@ static void test_acpi_piix4_tcg_cphp(void) =20 static void test_acpi_q35_tcg_cphp(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".cphp"; test_acpi_one(" -smp 2,cores=3D3,sockets=3D2,maxcpus=3D6" @@ -1141,9 +1130,8 @@ static uint8_t ipmi_required_struct_types[] =3D { =20 static void test_acpi_q35_tcg_ipmi(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".ipmibt"; data.required_struct_types =3D ipmi_required_struct_types; @@ -1156,9 +1144,8 @@ static void test_acpi_q35_tcg_ipmi(void) =20 static void test_acpi_q35_tcg_smbus_ipmi(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".ipmismbus"; data.required_struct_types =3D ipmi_required_struct_types; @@ -1171,12 +1158,11 @@ static void test_acpi_q35_tcg_smbus_ipmi(void) =20 static void test_acpi_piix4_tcg_ipmi(void) { - test_data data; + test_data data =3D {}; =20 /* Supplying -machine accel argument overrides the default (qtest). * This is to make guest actually run. */ - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".ipmikcs"; data.required_struct_types =3D ipmi_required_struct_types; @@ -1189,9 +1175,8 @@ static void test_acpi_piix4_tcg_ipmi(void) =20 static void test_acpi_q35_tcg_memhp(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".memhp"; test_acpi_one(" -m 128,slots=3D3,maxmem=3D1G" @@ -1205,9 +1190,8 @@ static void test_acpi_q35_tcg_memhp(void) =20 static void test_acpi_piix4_tcg_memhp(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".memhp"; test_acpi_one(" -m 128,slots=3D3,maxmem=3D1G" @@ -1221,9 +1205,8 @@ static void test_acpi_piix4_tcg_memhp(void) =20 static void test_acpi_piix4_tcg_nosmm(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".nosmm"; test_acpi_one("-machine smm=3Doff", &data); @@ -1232,9 +1215,8 @@ static void test_acpi_piix4_tcg_nosmm(void) =20 static void test_acpi_piix4_tcg_smm_compat(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".smm-compat"; test_acpi_one("-global PIIX4_PM.smm-compat=3Don", &data); @@ -1243,9 +1225,8 @@ static void test_acpi_piix4_tcg_smm_compat(void) =20 static void test_acpi_piix4_tcg_smm_compat_nosmm(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".smm-compat-nosmm"; test_acpi_one("-global PIIX4_PM.smm-compat=3Don -machine smm=3Doff", &= data); @@ -1254,9 +1235,8 @@ static void test_acpi_piix4_tcg_smm_compat_nosmm(void) =20 static void test_acpi_piix4_tcg_nohpet(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.machine_param =3D ",hpet=3Doff"; data.variant =3D ".nohpet"; @@ -1266,9 +1246,8 @@ static void test_acpi_piix4_tcg_nohpet(void) =20 static void test_acpi_q35_tcg_numamem(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".numamem"; test_acpi_one(" -object memory-backend-ram,id=3Dram0,size=3D128M" @@ -1278,9 +1257,8 @@ static void test_acpi_q35_tcg_numamem(void) =20 static void test_acpi_q35_kvm_xapic(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".xapic"; test_acpi_one(" -object memory-backend-ram,id=3Dram0,size=3D128M" @@ -1291,9 +1269,8 @@ static void test_acpi_q35_kvm_xapic(void) =20 static void test_acpi_q35_tcg_nosmm(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".nosmm"; test_acpi_one("-machine smm=3Doff", &data); @@ -1302,9 +1279,8 @@ static void test_acpi_q35_tcg_nosmm(void) =20 static void test_acpi_q35_tcg_smm_compat(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".smm-compat"; test_acpi_one("-global ICH9-LPC.smm-compat=3Don", &data); @@ -1313,9 +1289,8 @@ static void test_acpi_q35_tcg_smm_compat(void) =20 static void test_acpi_q35_tcg_smm_compat_nosmm(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".smm-compat-nosmm"; test_acpi_one("-global ICH9-LPC.smm-compat=3Don -machine smm=3Doff", &= data); @@ -1324,9 +1299,8 @@ static void test_acpi_q35_tcg_smm_compat_nosmm(void) =20 static void test_acpi_q35_tcg_nohpet(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.machine_param =3D ",hpet=3Doff"; data.variant =3D ".nohpet"; @@ -1336,9 +1310,8 @@ static void test_acpi_q35_tcg_nohpet(void) =20 static void test_acpi_q35_kvm_dmar(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".dmar"; test_acpi_one("-machine kernel-irqchip=3Dsplit -accel kvm" @@ -1348,9 +1321,8 @@ static void test_acpi_q35_kvm_dmar(void) =20 static void test_acpi_q35_tcg_ivrs(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".ivrs"; data.tcg_only =3D true, @@ -1360,9 +1332,8 @@ static void test_acpi_q35_tcg_ivrs(void) =20 static void test_acpi_piix4_tcg_numamem(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".numamem"; test_acpi_one(" -object memory-backend-ram,id=3Dram0,size=3D128M" @@ -1379,7 +1350,7 @@ static void test_acpi_tcg_tpm(const char *machine, co= nst char *tpm_if, machine, tpm_if); char *tmp_path =3D g_dir_make_tmp(tmp_dir_name, NULL); TPMTestState test; - test_data data; + test_data data =3D {}; GThread *thread; const char *suffix =3D tpm_version =3D=3D TPM_VERSION_2_0 ? "tpm2" : "= tpm12"; char *args, *variant =3D g_strdup_printf(".%s.%s", tpm_if, suffix); @@ -1399,7 +1370,6 @@ static void test_acpi_tcg_tpm(const char *machine, co= nst char *tpm_if, thread =3D g_thread_new(NULL, tpm_emu_ctrl_thread, &test); tpm_emu_test_wait_cond(&test); =20 - memset(&data, 0, sizeof(data)); data.machine =3D machine; data.variant =3D variant; =20 @@ -1434,9 +1404,8 @@ static void test_acpi_q35_tcg_tpm12_tis(void) =20 static void test_acpi_tcg_dimm_pxm(const char *machine) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D machine; data.variant =3D ".dimmpxm"; test_acpi_one(" -machine nvdimm=3Don,nvdimm-persistence=3Dcpu" @@ -1504,7 +1473,6 @@ static void test_acpi_virt_tcg_memhp(void) =20 static void test_acpi_microvm_prepare(test_data *data) { - memset(data, 0, sizeof(*data)); data->machine =3D "microvm"; data->required_struct_types =3D NULL; /* no smbios */ data->required_struct_types_len =3D 0; @@ -1513,7 +1481,7 @@ static void test_acpi_microvm_prepare(test_data *data) =20 static void test_acpi_microvm_tcg(void) { - test_data data; + test_data data =3D {}; =20 test_acpi_microvm_prepare(&data); test_acpi_one(" -machine microvm,acpi=3Don,ioapic2=3Doff,rtc=3Doff", @@ -1523,7 +1491,7 @@ static void test_acpi_microvm_tcg(void) =20 static void test_acpi_microvm_usb_tcg(void) { - test_data data; + test_data data =3D {}; =20 test_acpi_microvm_prepare(&data); data.variant =3D ".usb"; @@ -1534,7 +1502,7 @@ static void test_acpi_microvm_usb_tcg(void) =20 static void test_acpi_microvm_rtc_tcg(void) { - test_data data; + test_data data =3D {}; =20 test_acpi_microvm_prepare(&data); data.variant =3D ".rtc"; @@ -1545,7 +1513,7 @@ static void test_acpi_microvm_rtc_tcg(void) =20 static void test_acpi_microvm_pcie_tcg(void) { - test_data data; + test_data data =3D {}; =20 test_acpi_microvm_prepare(&data); data.variant =3D ".pcie"; @@ -1557,7 +1525,7 @@ static void test_acpi_microvm_pcie_tcg(void) =20 static void test_acpi_microvm_ioapic2_tcg(void) { - test_data data; + test_data data =3D {}; =20 test_acpi_microvm_prepare(&data); data.variant =3D ".ioapic2"; @@ -1622,9 +1590,8 @@ static void test_acpi_virt_tcg_pxb(void) =20 static void test_acpi_tcg_acpi_hmat(const char *machine) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D machine; data.variant =3D ".acpihmat"; test_acpi_one(" -machine hmat=3Don" @@ -1721,9 +1688,8 @@ static void test_acpi_virt_tcg_acpi_hmat(void) =20 static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void) { - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".acpihmat-noinitiator"; test_acpi_one(" -machine hmat=3Don" @@ -1772,9 +1738,8 @@ static void test_acpi_erst(const char *machine) { gchar *tmp_path =3D g_dir_make_tmp("qemu-test-erst.XXXXXX", NULL); gchar *params; - test_data data; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D machine; data.variant =3D ".acpierst"; params =3D g_strdup_printf( @@ -1802,7 +1767,7 @@ static void test_acpi_microvm_acpi_erst(void) { gchar *tmp_path =3D g_dir_make_tmp("qemu-test-erst.XXXXXX", NULL); gchar *params; - test_data data; + test_data data =3D {}; =20 test_acpi_microvm_prepare(&data); data.variant =3D ".pcie"; @@ -2003,10 +1968,9 @@ static void test_oem_fields(test_data *data) =20 static void test_acpi_piix4_oem_fields(void) { - test_data data; char *args; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); @@ -2022,10 +1986,9 @@ static void test_acpi_piix4_oem_fields(void) =20 static void test_acpi_q35_oem_fields(void) { - test_data data; char *args; + test_data data =3D {}; =20 - memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); @@ -2041,7 +2004,7 @@ static void test_acpi_q35_oem_fields(void) =20 static void test_acpi_microvm_oem_fields(void) { - test_data data; + test_data data =3D {}; char *args; =20 test_acpi_microvm_prepare(&data); --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069655; cv=none; d=zohomail.com; s=zohoarc; b=IZ2uk2EeDP4jSdQ+F/kug96BOVLieeKsnTMGCzkJ3AQjEVEWUSyTwHWeau7U87Cu3sgECe2MmyXkOTQg3b5Mb43i4vzJVv0GQflrcAbLcAunU/vzhzKu3YlKX9BNkRusuIKHJIuhWTpGelJghwc5v7XnLQBFeiKgvlHq4LuyRAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069655; 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=7nCz+pXj/zxPMGaWwNK8Sp0fglY+OmoVsYHlIqiSLV8=; b=S2S4G0NGmVhDzK9T6r/Uet7dWtxK2FhJ4u+473RYyDSvFAS2yCfRPdkqIGNZSYqg7Jok1NpZ4HtGmPQPciRaZlWHdwWsSctw2CyrCrcMq9scKhbcnl40fmBTorWPJKAB/5m8HTc0wgAq0QF6A7CFVqon8U12kgJLMjOdPBPOAWI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069655788386.64246683941144; Fri, 21 Apr 2023 02:34:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn96-0008EJ-M8; Fri, 21 Apr 2023 05:33:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn93-0008DN-12 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn91-000328-97 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:32 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-416-6jeGrnhsPMa8SVhIk_71Zw-1; Fri, 21 Apr 2023 05:33:29 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-50470d68f1eso1373437a12.0 for ; Fri, 21 Apr 2023 02:33:29 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id r2-20020a1709063d6200b00949691d3183sm1829779ejf.36.2023.04.21.02.33.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7nCz+pXj/zxPMGaWwNK8Sp0fglY+OmoVsYHlIqiSLV8=; b=I50XK6wdjCbsAuUSHlO3ARYEtGmchKuAmES64UhCaiJvR/6wjsxvcfDBtqeropsLDmqhRc FxsHS98cnQsncFNVQh4DWUG7j3gW6tUw87dB+7o7kJUXKDPG5NYt/gDxKwMvIl5TS/aUK7 /zjqU/X3cM0TdlmMR4SW3vLRZcZ6WI4= X-MC-Unique: 6jeGrnhsPMa8SVhIk_71Zw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069607; x=1684661607; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7nCz+pXj/zxPMGaWwNK8Sp0fglY+OmoVsYHlIqiSLV8=; b=k1CJiL28YPaVNxauXQ1Cau0w3nXgYKAnWtjpoHuebBH9jSpaQmkMg9g4+0KUJaQ8K3 FWWiS9+S2cisfF3Z6HlZ2AeZRVPQGTM4dFR5qgSQvSzs3gNqf4QOHtsAX7Kawch1aagt /iEJ3wZz5d2fkAa5wvaJM8qZ67xuQvTlEr0FYK+3UX5r2AQ7WlFk5WPU0vy3eEVUH/cy VzipFnkMOkRKwOA6fXit/+X14fkL0XsxeqQPPsEGVcmbZV8drvKl55CQ6RulPJ7e3pei vuo36n7ZWQyU9sUjXF1og2q75qUUtRuvj4DbKO7T4QR0z/6rVqHU+9yn1vuqSXAZ6MVl yzgw== X-Gm-Message-State: AAQBX9cMOSaPNi8+CRwOAyUkSzHsH/XyZKMjPA+fn+ZCzS0k1c8vieH9 3R6zeOLK9IU7+ECnjF9w9RfqR60GA8LCFmiG1Mh6UqIypYdsT/0aTE22l++2Y6o+F7+w4kwLj0U 55VQQUA3eU7JWS4Z2/Tw7dVyd9rbnJK5Ls5ZVGVBC5rVVHKwzLILK6wvBSTlRBUaF7eM+Ao+sPT qz1w== X-Received: by 2002:a17:907:9482:b0:953:93c1:e13 with SMTP id dm2-20020a170907948200b0095393c10e13mr1590274ejc.73.1682069607703; Fri, 21 Apr 2023 02:33:27 -0700 (PDT) X-Google-Smtp-Source: AKy350a20ET+zlNog5V8ZZS1Bb/RD9XmdgJWy/Frfl5jdH6o4G7zMAAsjr/RogIsZk6IGbyhE+DdWA== X-Received: by 2002:a17:907:9482:b0:953:93c1:e13 with SMTP id dm2-20020a170907948200b0095393c10e13mr1590256ejc.73.1682069607261; Fri, 21 Apr 2023 02:33:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Akihiko Odaki Subject: [PULL 07/25] configure: Avoid -Werror=maybe-uninitialized Date: Fri, 21 Apr 2023 11:32:58 +0200 Message-Id: <20230421093316.17941-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069656415100010 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki The configure script used to compile some code which dereferences memory with ubsan to verify the compiler can link with ubsan library which detects dereferencing of uninitialized memory. However, as the dereferenced memory was allocated in the same code, GCC can statically detect the unitialized memory dereference and emit maybe-uninitialized warning. If -Werror is set, this becomes an error, and the configure script incorrectly thinks the error indicates the compiler cannot use ubsan. Fix this error by replacing the code with another function which adds 1 to a signed integer argument. This brings in ubsan to detect if it causes signed integer overflow. As the value of the argument cannot be statically determined, the new function is also immune to compiler warnings. Signed-off-by: Akihiko Odaki Message-Id: <20230405070030.23148-1-akihiko.odaki@daynix.com> Signed-off-by: Paolo Bonzini --- configure | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 6ed66ec6abda..22b8553b8d70 100755 --- a/configure +++ b/configure @@ -1749,13 +1749,9 @@ if test "$sanitizers" =3D "yes" ; then # detect the static linking issue of ubsan, see also: # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D84285 cat > $TMPC << EOF -#include -int main(void) { - void *tmp =3D malloc(10); - if (tmp !=3D NULL) { - return *(int *)(tmp + 2); - } - return 1; +int main(int argc, char **argv) +{ + return argc + 1; } EOF if compile_prog "$CPU_CFLAGS -Werror -fsanitize=3Dundefined" ""; then --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069657; cv=none; d=zohomail.com; s=zohoarc; b=aVjI+zbOmoQP/jKokZWNlWO7T4Ttw8h6DjdPVvE99n9l/A6hNw5cDuMpaLLoqS+svjIl4vQIBXiqKr55jX7cutQR7ZHV+vOQ68RST386MX9q9blb5oMZa7isSdGHPxm1SIBQqOrMG88IQzmiSK5kMW0uP+mfv218cFPS7kVqSrg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069657; 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=/J2UWc60zpZAoalQ9qoSYz4mkciDC6lH/O28J3u9T3I=; b=QjJDktA69FaEwzE5cDlblmMtghgXwqxcCX4CwpWBKqM86cMEbVWf743G9WgI6KRPHfTShvg/7vxwbD3CzccUTsHhdKrYzEXw8n0AnERhf+WWdgOCYBSsXxUfmQS6PHDg/2V2k90IgHUl5GyFJbk97qZB1Npb5kBxbOKgLSRUrag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069657436405.60870387253044; Fri, 21 Apr 2023 02:34:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn98-0008Eh-O7; Fri, 21 Apr 2023 05:33:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn94-0008Dt-7H for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn92-00032P-Qp for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:33 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-473-4sfXuyOMN1S2owA3Hz700w-1; Fri, 21 Apr 2023 05:33:30 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5069f2ae8eeso7117200a12.0 for ; Fri, 21 Apr 2023 02:33:30 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id i15-20020a1709061e4f00b0094f3d700868sm1826389ejj.80.2023.04.21.02.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/J2UWc60zpZAoalQ9qoSYz4mkciDC6lH/O28J3u9T3I=; b=GYnwkO523EAXZmqcOxTTwFlTJsmyHVFhuDLySht983dTva6bwvTMNvsF6muMF2OkKQc141 YrdqDp8EsgUhFFgjZx+wm07c3Bz8FoUmomyjrXqm2+zTBL098GOWO/RsH4uXRS7gPvZ54Z IgHNMjU2syNOhW7EzTAXoAjF469OW1g= X-MC-Unique: 4sfXuyOMN1S2owA3Hz700w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069609; x=1684661609; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/J2UWc60zpZAoalQ9qoSYz4mkciDC6lH/O28J3u9T3I=; b=hXi2B9J8j7IqGJ2UMn3qaWg+8Enbrx4gfv1TUSzzZ2ErLiDIamuHRK9KoymvxWa1Sz PFCWkSK3hYXXsXXwQS6Nz1Z3pvjKsuJXHpZHYoJVnGUyIh+ji+hWoASpkCCC6wkw+Nib T6oA5UJ5oaLwdjwSA7LYboSxl8q4Uig+tCPvgPJTsCTUuCjqInT/Im9oTpfLxBipvi7w m5NmftDp1ZxouZp9inPZI9Gze5zY7yoVI6GqZRWY0oCgkoI4jkYd/JVS1JH2TEHgD8Yl 3zC4wJGtf9HflrE0QSqspx/1Immn442CvpWadmF9JajsIy93M6H7K+eINozTgoEp6Ss0 9bxg== X-Gm-Message-State: AAQBX9f0oG9Uh0j9Y386IXn5FfHmSd7jNEryQp7LZZqRfkC84nxUWhLl 1umsmp6hFT3T4rrxom2nFG+98ZJsJFirtKYydqCs3sZGg3pSifnUDSRhgPrnklSzlvOX4Nfbztr 96QvAhex1ekd6kz0xPx3LPNHOKjJi479uAGpDIv5oL8vAvdrgdINthjAHfGqrQDIhKDGAwMKTxA NV4g== X-Received: by 2002:a17:906:a007:b0:933:4d47:55b7 with SMTP id p7-20020a170906a00700b009334d4755b7mr1777269ejy.2.1682069609057; Fri, 21 Apr 2023 02:33:29 -0700 (PDT) X-Google-Smtp-Source: AKy350aFCwbGgzP9ZMNjVFXyHgkxB53/FYMgk6OVpHkflzK5cccy0OSlgWkUdU0y3YFa2GQIkGVo8w== X-Received: by 2002:a17:906:a007:b0:933:4d47:55b7 with SMTP id p7-20020a170906a00700b009334d4755b7mr1777258ejy.2.1682069608735; Fri, 21 Apr 2023 02:33:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 08/25] target/i386: Avoid unreachable variable declaration in mmu_translate() Date: Fri, 21 Apr 2023 11:32:59 +0200 Message-Id: <20230421093316.17941-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069658107100015 Content-Type: text/plain; charset="utf-8" From: Peter Maydell Coverity complains (CID 1507880) that the declaration "int error_code;" in mmu_translate() is unreachable code. Since this is only a declaration, this isn't actually a bug, but: * it's a bear-trap for future changes, because if it was changed to include an initialization 'int error_code =3D foo;' then the initialization wouldn't actually happen (being dead code) * it's against our coding style, which wants declarations to be at the start of blocks * it means that anybody reading the code has to go and look up exactly what the C rules are for skipping over variable declarations using a goto Move the declaration to the top of the function. Signed-off-by: Peter Maydell Message-Id: <20230406155946.3362077-1-peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini --- target/i386/tcg/sysemu/excp_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/tcg/sysemu/excp_helper.c b/target/i386/tcg/sysemu/= excp_helper.c index e87f90dbe3c7..b5f0abffa3de 100644 --- a/target/i386/tcg/sysemu/excp_helper.c +++ b/target/i386/tcg/sysemu/excp_helper.c @@ -147,6 +147,7 @@ static bool mmu_translate(CPUX86State *env, const Trans= lateParams *in, hwaddr pte_addr, paddr; uint32_t pkr; int page_size; + int error_code; =20 restart_all: rsvd_mask =3D ~MAKE_64BIT_MASK(0, env_archcpu(env)->phys_bits); @@ -467,7 +468,6 @@ do_check_protect_pse36: out->page_size =3D page_size; return true; =20 - int error_code; do_fault_rsvd: error_code =3D PG_ERROR_RSVD_MASK; goto do_fault_cont; --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069694; cv=none; d=zohomail.com; s=zohoarc; b=FF53ZI+EdKn4LbuUjgkWsmnlgaqONsI0+B32F9WH3ft8ixnYniA9iOrkXybC4MXPBV/A/FMTwHqZm3plWPbjJf2QBwMNVnr43FXM9EuBC3YXPxHdq+sCwAdTtkEzbJsS0hbB64SPDvQ6BsziLliO/Xeiaiac2XS1QNbLd+4yG78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069694; h=Content-Type: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=zDYjso0ZakIa3G5uIUxSOeGAQdn++vo4CDjqXvD8jMQ=; b=ehGg00Z2IdakF6rM8YZIteuQANfx79Ju8Ob8wNXOvEza1mDO+mBvfVajlAre4B3Thwu6ANeAMfuwKWB2LXiYqzieT6RVJPZ5Nz/JwmIREf3+WhhR1Im3a7MfABMzi9Ob3k7NDise7l7lDgbD+qehR/JKG6KYzRzT4Dlkmw7wRe0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069694950999.8004588896966; Fri, 21 Apr 2023 02:34:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9B-0008Ew-6B; Fri, 21 Apr 2023 05:33:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn96-0008EK-LK for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn94-00032a-5n for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:35 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-589-MDalOqEdPiaD8KrTBVX-Bg-1; Fri, 21 Apr 2023 05:33:32 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94a356c74e0so124173266b.2 for ; Fri, 21 Apr 2023 02:33:31 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id va2-20020a17090711c200b0093a0e5977e2sm1823556ejb.225.2023.04.21.02.33.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zDYjso0ZakIa3G5uIUxSOeGAQdn++vo4CDjqXvD8jMQ=; b=QHfdatekTrcc1Q1tKP8GhtmXaPHE1idnBe+ESKOpEFDW/lUO8sOal6NoxVw839mULNEKlu 6LNmmkszi0CzgkTjTcC94pwh/36RZUnmcQp9ZIr4Iqp6dqdQu6gAsgx+1Wv4D+Vy0sLwfZ EJ2Iv27u31twBSn2kA/ECVuuaUNL3fY= X-MC-Unique: MDalOqEdPiaD8KrTBVX-Bg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069610; x=1684661610; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zDYjso0ZakIa3G5uIUxSOeGAQdn++vo4CDjqXvD8jMQ=; b=QDLD98gnfM3c4yzKM2FjujVu8TCgVLbglByQATSeGcjhKNlkhl+2X2Pp/b2+dA4JBy lblxNhIPmJVk887Rcfew5P13gwdi9O5N3kH4IRkPh+g9WKxHFVfdAHK4iwBCpKsw4xcl lk558X0u4017GCcf39wDXoXPBNESh2G+pXUa3PPx9MG7dS/UKg5oYJFVpWZcBokGAtKm JOSOe3eRbhgJXHclhuhwoBj4EZavTKpgKfo9BYSxj3nR74wNE/vO9/+k4j7ka/HamxqC qtAM9vVGHcuJTOeamYQd6ERn9DOCmgzXXegJpfgLsv0iMdFB/0ch0q4jK54xwB6dF3vD 7M4A== X-Gm-Message-State: AAQBX9dw9nbvH1ZltUIAPrIUYCHVbJCFyrlOzExDo66la1zs+m6iiyZk vtWvNW1GUadNKZOeXvUtmNUH/F8tkG+4CQ/HZN+W+/p15m3VszNJDCu9qJ9mFiaX9pdjs7mBOo2 tf9sCucgv7jcAzQY9Bx1M3TJnptschcM3Vhl/4nktcgQ3Wc1XcoowSX+x0PhBZ50oT5vH2nSkDe aCZw== X-Received: by 2002:a17:906:4e88:b0:94f:6218:191f with SMTP id v8-20020a1709064e8800b0094f6218191fmr1533818eju.52.1682069610525; Fri, 21 Apr 2023 02:33:30 -0700 (PDT) X-Google-Smtp-Source: AKy350Zo1IpXu2MkDEpkltWos/0+v9bZPwInn7/eRQxLIbg952vDV55/Quimrw3Eqq+tGen9OlcOVw== X-Received: by 2002:a17:906:4e88:b0:94f:6218:191f with SMTP id v8-20020a1709064e8800b0094f6218191fmr1533808eju.52.1682069610218; Fri, 21 Apr 2023 02:33:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/25] lasi: fix RTC migration Date: Fri, 21 Apr 2023 11:33:00 +0200 Message-Id: <20230421093316.17941-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069695645100001 Content-Type: text/plain; charset="utf-8" Migrate rtc_ref (which only needs to be 32-bit because it is summed to a 32-bit register), which requires bumping the migration version. The HPPA machine does not have versioned machine types so it is okay to block migration to old versions of QEMU. While at it, drop the write-only field rtc from LasiState. Signed-off-by: Paolo Bonzini --- hw/misc/lasi.c | 4 ++-- include/hw/misc/lasi.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/misc/lasi.c b/hw/misc/lasi.c index 23a7634a8c3a..ff9dc893ae65 100644 --- a/hw/misc/lasi.c +++ b/hw/misc/lasi.c @@ -194,7 +194,7 @@ static const MemoryRegionOps lasi_chip_ops =3D { =20 static const VMStateDescription vmstate_lasi =3D { .name =3D "Lasi", - .version_id =3D 1, + .version_id =3D 2, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT32(irr, LasiState), @@ -204,6 +204,7 @@ static const VMStateDescription vmstate_lasi =3D { VMSTATE_UINT32(iar, LasiState), VMSTATE_UINT32(errlog, LasiState), VMSTATE_UINT32(amr, LasiState), + VMSTATE_UINT32_V(rtc_ref, LasiState, 2), VMSTATE_END_OF_LIST() } }; @@ -233,7 +234,6 @@ static void lasi_reset(DeviceState *dev) s->iar =3D 0xFFFB0000 + 3; /* CPU_HPA + 3 */ =20 /* Real time clock (RTC), it's only one 32-bit counter @9000 */ - s->rtc =3D time(NULL); s->rtc_ref =3D 0; } =20 diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h index ecc7065ce858..0a8c7352be21 100644 --- a/include/hw/misc/lasi.h +++ b/include/hw/misc/lasi.h @@ -69,8 +69,7 @@ struct LasiState { =20 uint32_t errlog; uint32_t amr; - uint32_t rtc; - time_t rtc_ref; + uint32_t rtc_ref; =20 MemoryRegion this_mem; }; --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069666; cv=none; d=zohomail.com; s=zohoarc; b=nnIYK2RHzQW2dyYbN2sqO3JeLfCCq5wDhTPGR3F07wZM8obPg6hzCI+i68TAtWcphe+Qwnr0qmuqj3ODHql05qxrgsIvvY32q3JYFI9LE/kGNj/v1OacuGjvSyyAglp+chrs7JM1wKRk+FyhIDkE39T5CrKyDDBb/MgTmdtrQ/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069666; h=Content-Type: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=miZ3caixvSzIMJGCwUwQ5pmV5rVaoDsa/ATAW82Zcww=; b=bBi9WZj4Zh06AicgRK1TAUvG13Q6jUZSgtr7R5oLUkGWi80nJDUcW3E8s994RxXSfjpaYuxIFVxzkPD+Hsx0QWgA8Lh3pxuLmB9WRnK7075KUI+gSWDU4wBo9JRzi48ndWvC1FPMwiAvCcIXDJcmoMfC9yFo7M//+7ebOshEV1s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069666741682.9463416916378; Fri, 21 Apr 2023 02:34:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9E-0008Fk-2P; Fri, 21 Apr 2023 05:33:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9B-0008Ey-3b for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn99-00033L-Qk for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:40 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-247-vSl9lE9-PmeJMkW3PhOlqw-1; Fri, 21 Apr 2023 05:33:33 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94a34e35f57so117086666b.3 for ; Fri, 21 Apr 2023 02:33:33 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id v26-20020a170906b01a00b009538cee14dasm1831172ejy.93.2023.04.21.02.33.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=miZ3caixvSzIMJGCwUwQ5pmV5rVaoDsa/ATAW82Zcww=; b=W2KwJe4PV9P0S/RZ+r0Tuk9pPU/akUbyylNF73emnmcOY+tzYpQlnqiDOWuHGrao3144lb N8jci0jVe+sSYpZkOr+gmJVvXbOuHV0ApRzexdEx94lSkgOBixTBuomxV5GueHw0fCeEX+ nMUvwNAAKud4OmJx13zus7Zft2Ou8/Q= X-MC-Unique: vSl9lE9-PmeJMkW3PhOlqw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069612; x=1684661612; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=miZ3caixvSzIMJGCwUwQ5pmV5rVaoDsa/ATAW82Zcww=; b=im1vP5h36ULmYJeTvOcWMT+PjYAFyDfvQHZKBEi8frktjWl/ECFPwy/hm0dxvvDNVU tjs+I7H3d6fms7FcjUip0ap4lEJdIMmLa+osAK/OzNBYOVqbeGv0dnZX0fHcFp3GHImL ElYgRrg9JTTRe94t5IeXQaOPCMTARGl7NVrwW8aJy2tri9vNP0Zo450mxwE9lrONkLuD 8sci1uJz2fCKpaUr5CvXN0Sm2GktmbfXk6+5T7Kyy4ae9GhZADxfc/l4sVlzi1s/xQ2R dLONV/ZAoSdRPKgSmwN2CWb3lzt0PZLZasfyji6Sh1cG4wNBcp2xFoLi+q3AavjnfRV9 +HYA== X-Gm-Message-State: AAQBX9eoXG1a3KQ2mksHXNTlwcjnr7/06tSd3FdX0o3WLV5S9JBF+rx9 cQPg1d/p53Toc3GUkaDnHBTLYHJab9EcVDDZMQZBJVkq5GaXLCbOqRiQSYzJC9za8jOv6VdwVCH MA3F7ktq8zgczDOCauQWgskSLJrj52Auh9gK2ljDBQvkusyOafa9za1eQW4R77WxFAWC2sj6JfM vVpw== X-Received: by 2002:a17:907:a684:b0:933:3814:e0f4 with SMTP id vv4-20020a170907a68400b009333814e0f4mr1748413ejc.16.1682069611920; Fri, 21 Apr 2023 02:33:31 -0700 (PDT) X-Google-Smtp-Source: AKy350bi8Q1nfXVqjwH8KE6Yz4+3UdkrZQhz8DbfiiLire2HB3S7qXyKt+KgLac74PMQopOY4zDjmg== X-Received: by 2002:a17:907:a684:b0:933:3814:e0f4 with SMTP id vv4-20020a170907a68400b009333814e0f4mr1748393ejc.16.1682069611440; Fri, 21 Apr 2023 02:33:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/25] coverity: update COMPONENTS.md Date: Fri, 21 Apr 2023 11:33:01 +0200 Message-Id: <20230421093316.17941-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069668165100001 Content-Type: text/plain; charset="utf-8" Hexagon is split into two components because it has hundreds of false posit= ives in the generated files. capstone and slirp have been removed. hw/nvme is added to block. Signed-off-by: Paolo Bonzini --- scripts/coverity-scan/COMPONENTS.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/coverity-scan/COMPONENTS.md b/scripts/coverity-scan/CO= MPONENTS.md index 639dcee45a01..7c48e0f1d215 100644 --- a/scripts/coverity-scan/COMPONENTS.md +++ b/scripts/coverity-scan/COMPONENTS.md @@ -12,6 +12,9 @@ avr cris ~ (/qemu)?((/include)?/hw/cris/.*|/target/cris/.*) =20 +hexagon-gen (component should be ignored in analysis) + ~ (/qemu)?(/target/hexagon/.*generated.*) + hexagon ~ (/qemu)?(/target/hexagon/.*) =20 @@ -64,14 +67,11 @@ audio ~ (/qemu)?((/include)?/(audio|hw/audio)/.*) =20 block - ~ (/qemu)?(/block.*|(/include?)(/hw)?/(block|storage-daemon)/.*|(/includ= e)?/hw/ide/.*|/qemu-(img|io).*|/util/(aio|async|thread-pool).*) + ~ (/qemu)?(/block.*|(/include?)/(block|storage-daemon)/.*|(/include)?/hw= /(block|ide|nvme)/.*|/qemu-(img|io).*|/util/(aio|async|thread-pool).*) =20 char ~ (/qemu)?(/qemu-char\.c|/include/sysemu/char\.h|(/include)?/hw/char/.*) =20 -capstone - ~ (/qemu)?(/capstone/.*) - crypto ~ (/qemu)?((/include)?/crypto/.*|/hw/.*/crypto.*) =20 @@ -108,9 +108,6 @@ qemu-ga scsi ~ (/qemu)?(/scsi/.*|/hw/scsi/.*|/include/hw/scsi/.*) =20 -slirp (component should be ignored in analysis) - ~ (/qemu)?(/slirp/.*) - tcg ~ (/qemu)?(/accel/tcg/.*|/replay/.*|/(.*/)?softmmu.*) =20 --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069654; cv=none; d=zohomail.com; s=zohoarc; b=XbYyGM3/9FBdQa8fLHt+dd5n4cdzQexEhgiKDwYud63FrSxQn3cWlYet2Y+eFi2eHS5qbs+py5yx6MMS/jk7akN3uVOY4hlB2VcS/kZBMgAirTnzSUqJLTwPsON8ZTMk0m9XdbIna5RjuetAGlXscuTurLxN9TpsjMGLagkfr+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069654; 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=X3A9++hQqz+KlNyqBz9ikcaFaIzOEE3nV7V+VgiSLlc=; b=i/QLe5FvAyJXuUxinulAWJEDa2mOInCK4kNAVZR6w9oJnhGDCGJNqngb8fmcLYHpCiotDvY1oq3am6A2EKm+FiQYRonQthswjKp8dWwiK8noCVvEHAv/tiZUd+N/U7XBHOaFsmCvHfk09jkcG5u8twRHaD6zorsrhnSRUpIVAL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069654907208.38032132505282; Fri, 21 Apr 2023 02:34:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9E-0008Fp-8R; Fri, 21 Apr 2023 05:33:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn98-0008Ef-1S for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn96-00032r-NS for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:37 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-651-n9LkV6_eOECYQMYxq-0Vjg-1; Fri, 21 Apr 2023 05:33:34 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94a342f6516so144187966b.0 for ; Fri, 21 Apr 2023 02:33:34 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id g21-20020a170906539500b0094efdfe60dcsm1780428ejo.206.2023.04.21.02.33.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X3A9++hQqz+KlNyqBz9ikcaFaIzOEE3nV7V+VgiSLlc=; b=DBj62XN9+ecCD530gUFDRTXICZnq32GLLFg1o4LPHOLFsoEEr0i+zZadb56/sVWXd9RE2W +wDv4GcG46E4roCt+bQqDxRiPHje6YgRHSyZU4tXDVx/wVwM66dyVWCkFUQnpJPBXx6a65 Tm66rQLHVZmlXYA9hUeCbX2G71SfVlk= X-MC-Unique: n9LkV6_eOECYQMYxq-0Vjg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069613; x=1684661613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X3A9++hQqz+KlNyqBz9ikcaFaIzOEE3nV7V+VgiSLlc=; b=AwnNWBGUsHxnrk3e2rz8LOPco/IMouh1PqFAe1xum9quB0PLr+8sjXLkVpnpfqMJAw K/WgzOkid0R88roKQm7ix7I2Yfza92MjJIfAFC/o8IOBmOCWsyR0bfnkmMWM7unhyu48 7UElrb7T7IIfETPyNzgXCmc5Aw/3VL8bl/3dKbXj3YCWnbhhhNlx3AO2mKI4KWRo9u7N xZZbalIOjhpCP6tWbxaAJ2uUStY8k1Tu82z9CC52IDjwZtP/ob6ozjPk+4a4WjjSn1yb L1ZlZsFf/62UV9zgTPNGyvMU3zZrcqq0IjhjiBaxKHpPcRfyBjrcMYu/ZhxSgGNSN4/j tIuA== X-Gm-Message-State: AAQBX9dw5gHOpHsZt4dC1Bn3zmvwlwCsoZ/1RYYu+AgrMwh0/bfE44c/ 9Eh6i2XyON6EEa+LcU+E1uvoFqkp5ThbMNPCPstdP1QAbuNj/a57JXsdONI7R8/LOJw9IPUcD8J j1rg0Xb/nhKyMqCGYlv4WEjmFC37BRjifM9fG11u+pp52mp5hTDcndzTzWT+FcJDXLz8T6vODW8 IsIA== X-Received: by 2002:a17:906:72cd:b0:94f:8118:d74b with SMTP id m13-20020a17090672cd00b0094f8118d74bmr1590494ejl.40.1682069613119; Fri, 21 Apr 2023 02:33:33 -0700 (PDT) X-Google-Smtp-Source: AKy350ZCfvw0houpZFkLkQl9/ctYrVQWcx/nyiv2LaVENZSAD0FSI4JDf+EMdaizVxGtpKuQAbhFTw== X-Received: by 2002:a17:906:72cd:b0:94f:8118:d74b with SMTP id m13-20020a17090672cd00b0094f8118d74bmr1590475ejl.40.1682069612774; Fri, 21 Apr 2023 02:33:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 11/25] target/mips: tcg: detect out-of-bounds accesses to cpu_gpr and cpu_gpr_hi Date: Fri, 21 Apr 2023 11:33:02 +0200 Message-Id: <20230421093316.17941-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069655631100001 Content-Type: text/plain; charset="utf-8" In some cases (for example gen_compute_branch_nm in nanomips_translate.c.inc) registers can be unused on some paths and a negative value is passed in that case: gen_compute_branch_nm(ctx, OPC_BPOSGE32, 4, -1, -2, imm << 1); To avoid an out of bounds access in those cases, introduce assertions. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- target/mips/tcg/translate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 1fb4ef712729..999fbb7cc1c0 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -1223,6 +1223,7 @@ static const char regnames_LO[][4] =3D { /* General purpose registers moves. */ void gen_load_gpr(TCGv t, int reg) { + assert(reg >=3D 0 && reg <=3D ARRAY_SIZE(cpu_gpr)); if (reg =3D=3D 0) { tcg_gen_movi_tl(t, 0); } else { @@ -1232,6 +1233,7 @@ void gen_load_gpr(TCGv t, int reg) =20 void gen_store_gpr(TCGv t, int reg) { + assert(reg >=3D 0 && reg <=3D ARRAY_SIZE(cpu_gpr)); if (reg !=3D 0) { tcg_gen_mov_tl(cpu_gpr[reg], t); } @@ -1240,6 +1242,7 @@ void gen_store_gpr(TCGv t, int reg) #if defined(TARGET_MIPS64) void gen_load_gpr_hi(TCGv_i64 t, int reg) { + assert(reg >=3D 0 && reg <=3D ARRAY_SIZE(cpu_gpr_hi)); if (reg =3D=3D 0) { tcg_gen_movi_i64(t, 0); } else { @@ -1249,6 +1252,7 @@ void gen_load_gpr_hi(TCGv_i64 t, int reg) =20 void gen_store_gpr_hi(TCGv_i64 t, int reg) { + assert(reg >=3D 0 && reg <=3D ARRAY_SIZE(cpu_gpr_hi)); if (reg !=3D 0) { tcg_gen_mov_i64(cpu_gpr_hi[reg], t); } --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069763; cv=none; d=zohomail.com; s=zohoarc; b=LQ32rCjc9ApFWT1yf4G4oXcKXR1BUomRXgAQ0qCHWcU4AwrVSQ/nflg2vZi+SGKcuR8nuftPTCPb6U6rNUEYwBXEUIknAukjlyUD1Zd7aWcc5Pwb+RIguW6z9duK+smPWFBf9iNcGvQP60p6qcR7j+xbjmvyWHOD1/SZ098EOD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069763; 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=iO/1n+pcKS6FRHfkbmdImpIrBTesk7jNxOCOpPvcGVo=; b=OiLN1mNbWpG34Br/vF1bBGhzdt8027xm84TDP7EPJ3Q81txzRKV/O0R3I2w8cBZ1/kOn3jokljQN+BjT/+wEQ9u6XzKP/lLiVGdR30roOWSUTabmZ39I+pJB7w5aFX8PjHrsMSa27J65YPe6aNsBvniqyYNcu9ptPg8FGSnaGnU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069763164272.7064335542244; Fri, 21 Apr 2023 02:36:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9E-0008Fo-93; Fri, 21 Apr 2023 05:33:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9A-0008Ex-Hh for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn99-00033H-06 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:40 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-WgTx5zhxNQilyfujbbCKRA-1; Fri, 21 Apr 2023 05:33:36 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-506a7b4f141so1625544a12.2 for ; Fri, 21 Apr 2023 02:33:35 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id jt20-20020a170906ca1400b008e54ac90de1sm1804717ejb.74.2023.04.21.02.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iO/1n+pcKS6FRHfkbmdImpIrBTesk7jNxOCOpPvcGVo=; b=A5HO0Akx7FpJLYRJYDU55XgufgAV2n0pz7/1R7/Daoc7czdrF6ILAqXO1OZEhRzVuzwwFw WVGE66CXuc21+bssN20gZYElG56NMgL6Z+RlwU3XEKNBdkWVo/VDQwuv50IVHRUTuk75dg 1ZfGdTFsfdRQOQYCIicoWDUw3qqi5tk= X-MC-Unique: WgTx5zhxNQilyfujbbCKRA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069614; x=1684661614; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iO/1n+pcKS6FRHfkbmdImpIrBTesk7jNxOCOpPvcGVo=; b=NGWL3BEBosWiaVSfYL10bPrhDHjI/9uG95imA2LEJ+3p4U4PVZv1J+3egMMcM42k5K nrLVAG96GW6w0csJICt7FH1R1x8hbxukHl1A4tVKuMuZZ5jadv3EbwLNFvqrc5xXpy1N iGdGu+89Jdr97/G5omZI2hMEv6ihnyZJFDrNBaTf3EZaTa7gmMvBIlxAm0GETptYi4UR cxEDzvw2/4FBXstKuQiSNGOKioJdUgB5meoCqhQug/pNEg4ZhBNBOSQ3G07RhxfUy+uw oxZGY2EH710+8AVDodq1xKhCCmfzdasr1It6Bz8anzqS2En59Z5DJtmA91uV/Qdqi8m4 yVGA== X-Gm-Message-State: AAQBX9cR+3J4Fx3qAsOzQvGittbKWiOv8TigiYR/+k9WASBtdXpC0wzZ TtILtJHxyEriokHEpFBF3SBUIePVQcj7z/Nr2nTO4fsQcgZg1nA/n5H73DyFr8MGK2e2RjdCUwj 9mvcek8j2CrnM/rs9zoN+hHmxsiBoR9W2XIVNq5n75Z3ZKpCk/JIt61uRtoN7W7qLUQZxdeMzyo Fn+w== X-Received: by 2002:a17:906:805a:b0:94e:fa56:a74f with SMTP id x26-20020a170906805a00b0094efa56a74fmr1777586ejw.14.1682069614521; Fri, 21 Apr 2023 02:33:34 -0700 (PDT) X-Google-Smtp-Source: AKy350YVK19mRfWae5ZitbeFIh31eAAobQOeBVPMdF8qt6803rCJl952uRw7nmHz7EXo7I0izFvxDA== X-Received: by 2002:a17:906:805a:b0:94e:fa56:a74f with SMTP id x26-20020a170906805a00b0094efa56a74fmr1777576ejw.14.1682069614257; Fri, 21 Apr 2023 02:33:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Markus Armbruster Subject: [PULL 12/25] qapi-gen: mark coroutine QMP command functions as coroutine_fn Date: Fri, 21 Apr 2023 11:33:03 +0200 Message-Id: <20230421093316.17941-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069764653100001 Content-Type: text/plain; charset="utf-8" Coroutine commands have to be declared as coroutine_fn, but the marker does not show up in the qapi-comands-* headers; likewise, the marshaling function calls the command and therefore must be coroutine_fn. Static analysis would want coroutine_fn to match between prototype and declaration, because in principle coroutines might be compiled to a completely different calling convention. So we would like to add the marker to the header. Reviewed-by: Markus Armbruster Signed-off-by: Paolo Bonzini --- scripts/qapi/commands.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py index 79c5e5c3a989..a079378d1b8d 100644 --- a/scripts/qapi/commands.py +++ b/scripts/qapi/commands.py @@ -41,11 +41,13 @@ def gen_command_decl(name: str, arg_type: Optional[QAPISchemaObjectType], boxed: bool, - ret_type: Optional[QAPISchemaType]) -> str: + ret_type: Optional[QAPISchemaType], + coroutine: bool) -> str: return mcgen(''' -%(c_type)s qmp_%(c_name)s(%(params)s); +%(c_type)s %(coroutine_fn)sqmp_%(c_name)s(%(params)s); ''', c_type=3D(ret_type and ret_type.c_type()) or 'void', + coroutine_fn=3D'coroutine_fn ' if coroutine else '', c_name=3Dc_name(name), params=3Dbuild_params(arg_type, boxed, 'Error **errp')) =20 @@ -157,16 +159,21 @@ def gen_marshal_output(ret_type: QAPISchemaType) -> s= tr: c_type=3Dret_type.c_type(), c_name=3Dret_type.c_name()) =20 =20 -def build_marshal_proto(name: str) -> str: - return ('void qmp_marshal_%s(QDict *args, QObject **ret, Error **errp)' - % c_name(name)) +def build_marshal_proto(name: str, + coroutine: bool) -> str: + return ('void %(coroutine_fn)sqmp_marshal_%(c_name)s(%(params)s)' % { + 'coroutine_fn': 'coroutine_fn ' if coroutine else '', + 'c_name': c_name(name), + 'params': 'QDict *args, QObject **ret, Error **errp', + }) =20 =20 -def gen_marshal_decl(name: str) -> str: +def gen_marshal_decl(name: str, + coroutine: bool) -> str: return mcgen(''' %(proto)s; ''', - proto=3Dbuild_marshal_proto(name)) + proto=3Dbuild_marshal_proto(name, coroutine)) =20 =20 def gen_trace(name: str) -> str: @@ -181,7 +188,8 @@ def gen_marshal(name: str, arg_type: Optional[QAPISchemaObjectType], boxed: bool, ret_type: Optional[QAPISchemaType], - gen_tracing: bool) -> str: + gen_tracing: bool, + coroutine: bool) -> str: have_args =3D boxed or (arg_type and not arg_type.is_empty()) if have_args: assert arg_type is not None @@ -195,7 +203,7 @@ def gen_marshal(name: str, bool ok =3D false; Visitor *v; ''', - proto=3Dbuild_marshal_proto(name)) + proto=3Dbuild_marshal_proto(name, coroutine)) =20 if ret_type: ret +=3D mcgen(''' @@ -387,10 +395,11 @@ def visit_command(self, self._genh, self._genc): self._genc.add(gen_marshal_output(ret_type)) with ifcontext(ifcond, self._genh, self._genc): - self._genh.add(gen_command_decl(name, arg_type, boxed, ret_typ= e)) - self._genh.add(gen_marshal_decl(name)) + self._genh.add(gen_command_decl(name, arg_type, boxed, + ret_type, coroutine)) + self._genh.add(gen_marshal_decl(name, coroutine)) self._genc.add(gen_marshal(name, arg_type, boxed, ret_type, - self._gen_tracing)) + self._gen_tracing, coroutine)) if self._gen_tracing: self._gen_trace_events.add(gen_trace(name)) with self._temp_module('./init'): --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069898; cv=none; d=zohomail.com; s=zohoarc; b=aqSarFEi+upXwqPkvmSx/TvMGUtHOpJbk5vf8ZmvlgglEl7arW3rOiOAz0jhx2obpnvkllkG4WQMQPKWJdLiWORBfmuNngROjxoAKkvww12KrLJbeOSJb2TQG8kTiVm2GNgGyYxzatltpSAfU3z6Mq7EBzBxCrnQszRZamw6bTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069898; h=Content-Type: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=uoqHZwp6ZDuBBp7HlO2FvItIj6HYt1hKP7ytMavVzfo=; b=TTxqY4pRDSshqUQ/yzfra2uCcvNn96UxB7a+Pf0YFF9z7/4/pfS+63XiAtEUGs+2o/acuyjMbZQF48C7W9oq8WD9bm31k8uG3TK/vdVByNEf0xtmZ2xmNvMAPVo1uYQ7eLZWoLnrPgLJ8bcah9x8AKz/21vGtHuiSBNez9uynpI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168206989821948.442492372825654; Fri, 21 Apr 2023 02:38:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9I-0008If-Fc; Fri, 21 Apr 2023 05:33:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9C-0008FN-2U for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9A-00033O-2z for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:41 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-390-tipoV1CWN3-G4y8sEdzysg-1; Fri, 21 Apr 2023 05:33:38 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-94a348facbbso158077966b.1 for ; Fri, 21 Apr 2023 02:33:37 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id o19-20020a1709062e9300b0094f281bd279sm1801428eji.198.2023.04.21.02.33.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uoqHZwp6ZDuBBp7HlO2FvItIj6HYt1hKP7ytMavVzfo=; b=a0HmnvSkyyWcU1OBJ1Y/5yB0qDsqsFKADXvWLH8IKBoyDUP3m1RK6lU7ME+G0d14689cim 3ygUAbHjh9JQg8j8pEKqRs6dtHDAwwiy+wiNc2N32h1GWAjKK9GVJZPnLb9+aOl55gY+bl a5xluaT4x7xfdx3uxg+HLAxYcBlbXCg= X-MC-Unique: tipoV1CWN3-G4y8sEdzysg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069616; x=1684661616; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uoqHZwp6ZDuBBp7HlO2FvItIj6HYt1hKP7ytMavVzfo=; b=HkwWsWEWVIBPz5aNiM0K72wB/8DwO5Zh/C+a+Yne50rgVRDpyVVXtkHjCRzpnmM45k jdsAkuW/VK+sK4xAFszkbb01kiUufhZvoKLeINFP84N+fgUyPfSxO1GcstvRJ559ut2S foyaPZ/QAZPXmecCtvt1Cb7a3MVkZ/jucofR6Hb/z778ULzP8KzPyfWG40wb7vqSXl07 CSYHmkCKgK952SDlWQ3ehHHu8OYV3XlcWPCMfjtyjaxB1RbG/r6nSqZbns+6j2cp0WCy j8hewHlJPfgk19xhS3SZBtSQ3IoqR28KviZWaYGnaLi+YHsOO4/TCwOWs+Fi5b2S9BZv vmGw== X-Gm-Message-State: AAQBX9eC3WGabfBDr5vlRZdyWjV+vO2OXtIyJopeJxP6u34yFzIYNH29 LOxCPPY9TedU80cVesokxkYSkAVVRB35LD4OdSyioAo7yPBCJkTlohGfDHd6sfqTEZ7sBkvwR4T yuou1H++csDn5XX5QgFFhAtFBZw+mxwhuc0QHTROcCXiOxPkNkutevEQw7/9sHwRnoWyAo3Oqkw BYLA== X-Received: by 2002:a17:906:b197:b0:94c:b183:bb6f with SMTP id w23-20020a170906b19700b0094cb183bb6fmr1599082ejy.18.1682069616257; Fri, 21 Apr 2023 02:33:36 -0700 (PDT) X-Google-Smtp-Source: AKy350bsr5duKBidqpKIxeEvVJQBZ8Uq1Y3PiYfO1raiBch5cBKLyppbBx7EpL+dzK6TqckSp/3mCQ== X-Received: by 2002:a17:906:b197:b0:94c:b183:bb6f with SMTP id w23-20020a170906b19700b0094cb183bb6fmr1599067ejy.18.1682069615874; Fri, 21 Apr 2023 02:33:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/25] io: mark mixed functions that can suspend Date: Fri, 21 Apr 2023 11:33:04 +0200 Message-Id: <20230421093316.17941-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069898572100003 Content-Type: text/plain; charset="utf-8" There should be no paths from a coroutine_fn to aio_poll, however in practice coroutine_mixed_fn will call aio_poll in the !qemu_in_coroutine() path. By marking mixed functions, we can track accurately the call paths that execute entirely in coroutine context, and find more missing coroutine_fn markers. This results in more accurate checks that coroutine code does not end up blocking. If the marking were extended transitively to all functions that call these ones, static analysis could be done much more efficiently. However, this is a start and makes it possible to use vrc's path-based searches to find potential bugs where coroutine_fns call blocking functions. Signed-off-by: Paolo Bonzini --- include/io/channel.h | 78 ++++++++++++++++++++++---------------------- io/channel.c | 78 ++++++++++++++++++++++---------------------- 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/include/io/channel.h b/include/io/channel.h index 153fbd29049f..446a566e5e1b 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -301,10 +301,10 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc, * Returns: 1 if all bytes were read, 0 if end-of-file * occurs without data, or -1 on error */ -int qio_channel_readv_all_eof(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - Error **errp); +int coroutine_mixed_fn qio_channel_readv_all_eof(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **errp); =20 /** * qio_channel_readv_all: @@ -328,10 +328,10 @@ int qio_channel_readv_all_eof(QIOChannel *ioc, * * Returns: 0 if all bytes were read, or -1 on error */ -int qio_channel_readv_all(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - Error **errp); +int coroutine_mixed_fn qio_channel_readv_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **errp); =20 =20 /** @@ -353,10 +353,10 @@ int qio_channel_readv_all(QIOChannel *ioc, * * Returns: 0 if all bytes were written, or -1 on error */ -int qio_channel_writev_all(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - Error **errp); +int coroutine_mixed_fn qio_channel_writev_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **errp); =20 /** * qio_channel_readv: @@ -437,10 +437,10 @@ ssize_t qio_channel_write(QIOChannel *ioc, * Returns: 1 if all bytes were read, 0 if end-of-file occurs * without data, or -1 on error */ -int qio_channel_read_all_eof(QIOChannel *ioc, - char *buf, - size_t buflen, - Error **errp); +int coroutine_mixed_fn qio_channel_read_all_eof(QIOChannel *ioc, + char *buf, + size_t buflen, + Error **errp); =20 /** * qio_channel_read_all: @@ -457,10 +457,10 @@ int qio_channel_read_all_eof(QIOChannel *ioc, * * Returns: 0 if all bytes were read, or -1 on error */ -int qio_channel_read_all(QIOChannel *ioc, - char *buf, - size_t buflen, - Error **errp); +int coroutine_mixed_fn qio_channel_read_all(QIOChannel *ioc, + char *buf, + size_t buflen, + Error **errp); =20 /** * qio_channel_write_all: @@ -476,10 +476,10 @@ int qio_channel_read_all(QIOChannel *ioc, * * Returns: 0 if all bytes were written, or -1 on error */ -int qio_channel_write_all(QIOChannel *ioc, - const char *buf, - size_t buflen, - Error **errp); +int coroutine_mixed_fn qio_channel_write_all(QIOChannel *ioc, + const char *buf, + size_t buflen, + Error **errp); =20 /** * qio_channel_set_blocking: @@ -812,11 +812,11 @@ void qio_channel_set_aio_fd_handler(QIOChannel *ioc, * occurs without data, or -1 on error */ =20 -int qio_channel_readv_full_all_eof(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - int **fds, size_t *nfds, - Error **errp); +int coroutine_mixed_fn qio_channel_readv_full_all_eof(QIOChannel *ioc, + const struct iovec *= iov, + size_t niov, + int **fds, size_t *n= fds, + Error **errp); =20 /** * qio_channel_readv_full_all: @@ -838,11 +838,11 @@ int qio_channel_readv_full_all_eof(QIOChannel *ioc, * Returns: 0 if all bytes were read, or -1 on error */ =20 -int qio_channel_readv_full_all(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - int **fds, size_t *nfds, - Error **errp); +int coroutine_mixed_fn qio_channel_readv_full_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + int **fds, size_t *nfds, + Error **errp); =20 /** * qio_channel_writev_full_all: @@ -872,11 +872,11 @@ int qio_channel_readv_full_all(QIOChannel *ioc, * Returns: 0 if all bytes were written, or -1 on error */ =20 -int qio_channel_writev_full_all(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - int *fds, size_t nfds, - int flags, Error **errp); +int coroutine_mixed_fn qio_channel_writev_full_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + int *fds, size_t nfds, + int flags, Error **errp= ); =20 /** * qio_channel_flush: diff --git a/io/channel.c b/io/channel.c index a8c7f1164901..375a130a398d 100644 --- a/io/channel.c +++ b/io/channel.c @@ -109,27 +109,27 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc, } =20 =20 -int qio_channel_readv_all_eof(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - Error **errp) +int coroutine_mixed_fn qio_channel_readv_all_eof(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **errp) { return qio_channel_readv_full_all_eof(ioc, iov, niov, NULL, NULL, errp= ); } =20 -int qio_channel_readv_all(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - Error **errp) +int coroutine_mixed_fn qio_channel_readv_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **errp) { return qio_channel_readv_full_all(ioc, iov, niov, NULL, NULL, errp); } =20 -int qio_channel_readv_full_all_eof(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - int **fds, size_t *nfds, - Error **errp) +int coroutine_mixed_fn qio_channel_readv_full_all_eof(QIOChannel *ioc, + const struct iovec *= iov, + size_t niov, + int **fds, size_t *n= fds, + Error **errp) { int ret =3D -1; struct iovec *local_iov =3D g_new(struct iovec, niov); @@ -215,11 +215,11 @@ next_iter: return ret; } =20 -int qio_channel_readv_full_all(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - int **fds, size_t *nfds, - Error **errp) +int coroutine_mixed_fn qio_channel_readv_full_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + int **fds, size_t *nfds, + Error **errp) { int ret =3D qio_channel_readv_full_all_eof(ioc, iov, niov, fds, nfds, = errp); =20 @@ -234,19 +234,19 @@ int qio_channel_readv_full_all(QIOChannel *ioc, return ret; } =20 -int qio_channel_writev_all(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - Error **errp) +int coroutine_mixed_fn qio_channel_writev_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + Error **errp) { return qio_channel_writev_full_all(ioc, iov, niov, NULL, 0, 0, errp); } =20 -int qio_channel_writev_full_all(QIOChannel *ioc, - const struct iovec *iov, - size_t niov, - int *fds, size_t nfds, - int flags, Error **errp) +int coroutine_mixed_fn qio_channel_writev_full_all(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + int *fds, size_t nfds, + int flags, Error **errp) { int ret =3D -1; struct iovec *local_iov =3D g_new(struct iovec, niov); @@ -325,30 +325,30 @@ ssize_t qio_channel_write(QIOChannel *ioc, } =20 =20 -int qio_channel_read_all_eof(QIOChannel *ioc, - char *buf, - size_t buflen, - Error **errp) +int coroutine_mixed_fn qio_channel_read_all_eof(QIOChannel *ioc, + char *buf, + size_t buflen, + Error **errp) { struct iovec iov =3D { .iov_base =3D buf, .iov_len =3D buflen }; return qio_channel_readv_all_eof(ioc, &iov, 1, errp); } =20 =20 -int qio_channel_read_all(QIOChannel *ioc, - char *buf, - size_t buflen, - Error **errp) +int coroutine_mixed_fn qio_channel_read_all(QIOChannel *ioc, + char *buf, + size_t buflen, + Error **errp) { struct iovec iov =3D { .iov_base =3D buf, .iov_len =3D buflen }; return qio_channel_readv_all(ioc, &iov, 1, errp); } =20 =20 -int qio_channel_write_all(QIOChannel *ioc, - const char *buf, - size_t buflen, - Error **errp) +int coroutine_mixed_fn qio_channel_write_all(QIOChannel *ioc, + const char *buf, + size_t buflen, + Error **errp) { struct iovec iov =3D { .iov_base =3D (char *)buf, .iov_len =3D buflen = }; return qio_channel_writev_all(ioc, &iov, 1, errp); --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069858; cv=none; d=zohomail.com; s=zohoarc; b=W4Pb6BmwbpwSWyh9L99sWbQ9SsPNYhYiHE1oyDArBqFZsHr1U3ivejdcZPtPVslY41QgvNbRAQNRa3cd9ZYvVIZy2Y4rJnL5sSQq5bgB6AW+E3TFuLsok5OzLBXzlBg35SHIm7App2d+E052X36/HF/0kpHwVbuOw4Ne0aEQp40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069858; h=Content-Type: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=kolV6k6KV+OnqIqcWjNOq80wXVVZSZ4N43rvUGxnG0E=; b=ODiFXZGc6GaIFmJpCYpEu+SFlQzOrZS2udmYtY+Rt12mnC45oRgJZ5YsCHDSQimdvP6nazTPigqN/8MAyepOIq3DlzytAvHHspETEyhcmNiZOL2kkHz6F3jm/r6IM827Ux3/5qs4S339LkwZxcy6c2+qU87AbEz9uB+dE3YYbxw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069858696711.1469868667068; Fri, 21 Apr 2023 02:37:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9I-0008Hv-23; Fri, 21 Apr 2023 05:33:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9C-0008FX-Kd for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9A-00033Y-Rq for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:42 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-49-MwQkM-HYNZ2ZGv3AspGmkQ-1; Fri, 21 Apr 2023 05:33:38 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94f5a1fa123so149650866b.0 for ; Fri, 21 Apr 2023 02:33:38 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id fx21-20020a170906b75500b009531d9efcc4sm1810311ejb.133.2023.04.21.02.33.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kolV6k6KV+OnqIqcWjNOq80wXVVZSZ4N43rvUGxnG0E=; b=Kqoq+qe+5UXyzx7zaKZeH7tdpNL6JHdhS8/tpN7vBezJaCTJqPv9o0uqbRR0ghu/D8uUgj gql6pCYuCrHYCJ842fFVnS6aMm+ZJUPnUspkr8YQhJv7DLXoiA/noZc3ghU9kz2TZer9pk H+z014xsdnZK1EL7S4JQ2mOnqAlr+40= X-MC-Unique: MwQkM-HYNZ2ZGv3AspGmkQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069617; x=1684661617; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kolV6k6KV+OnqIqcWjNOq80wXVVZSZ4N43rvUGxnG0E=; b=agtn0Bcgyrg5YNLwumXWyjt5SbnIh/xmc5SImtOTUcLnotTsXcD+APMKL3OOewXm0T SS+Q74BosUNjakrzrVfz6PQnDmKi/MDrMq2nqcITlXiF9OwfPpWOcDp7kxv998axrvuw X0nR6KcLZsZQ+cyd/DoIjZ14301PkfThfVld+0hFrpdyVZTaVn/oDF4BxGZ9V90w0+08 Ufy/tSfLFO+EQv5jF/x+6W9E1BunJ540FVw5dKgK9JLT+sCLu3znmIGtyYh74Yt3xbg6 F+7Cc3uB4z1DJddNnq8wamzWdUMQmnxUNExChnE6Xs6YU03+RdJWTpOn9rMevbfIje8T nPMA== X-Gm-Message-State: AAQBX9fqerGxVVJh1rtwfvLamCIOwpQ15p7+1wyNDr9EGptXEAuiv1lm oPgdUF477lg46Y7S4tKAIL5oMlumraNwyCfwyUm6K9Alc/b4hWyouYtChEoECVgLGXcYPBkJK21 JqEaU4+OznCOP+qnkYYWilNCJ5hTE4v7qxs0MzEU3qbmZx1NHrRbHUgxBECkQQGmCtmXCynLjR6 mKbA== X-Received: by 2002:a17:906:4915:b0:94a:5d16:a280 with SMTP id b21-20020a170906491500b0094a5d16a280mr1858736ejq.9.1682069617172; Fri, 21 Apr 2023 02:33:37 -0700 (PDT) X-Google-Smtp-Source: AKy350YCXB0WrskQJnfXwqICc7o5oGt7wK/hoW57BkV46VEc5dcNYQPGGpFYmlzpI1oIV2EB1H3ydg== X-Received: by 2002:a17:906:4915:b0:94a:5d16:a280 with SMTP id b21-20020a170906491500b0094a5d16a280mr1858722ejq.9.1682069616887; Fri, 21 Apr 2023 02:33:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/25] migration: mark mixed functions that can suspend Date: Fri, 21 Apr 2023 11:33:05 +0200 Message-Id: <20230421093316.17941-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069860345100003 Content-Type: text/plain; charset="utf-8" There should be no paths from a coroutine_fn to aio_poll, however in practice coroutine_mixed_fn will call aio_poll in the !qemu_in_coroutine() path. By marking mixed functions, we can track accurately the call paths that execute entirely in coroutine context, and find more missing coroutine_fn markers. This results in more accurate checks that coroutine code does not end up blocking. If the marking were extended transitively to all functions that call these ones, static analysis could be done much more efficiently. However, this is a start and makes it possible to use vrc's path-based searches to find potential bugs where coroutine_fns call blocking functions. Signed-off-by: Paolo Bonzini --- include/migration/qemu-file-types.h | 4 ++-- migration/qemu-file.c | 14 +++++++------- migration/qemu-file.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/migration/qemu-file-types.h b/include/migration/qemu-f= ile-types.h index 2867e3da84ab..1436f9ce92f3 100644 --- a/include/migration/qemu-file-types.h +++ b/include/migration/qemu-file-types.h @@ -35,7 +35,7 @@ void qemu_put_byte(QEMUFile *f, int v); void qemu_put_be16(QEMUFile *f, unsigned int v); void qemu_put_be32(QEMUFile *f, unsigned int v); void qemu_put_be64(QEMUFile *f, uint64_t v); -size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size); +size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_= t size); =20 int qemu_get_byte(QEMUFile *f); =20 @@ -161,7 +161,7 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t= *pv) qemu_get_be64s(f, (uint64_t *)pv); } =20 -size_t qemu_get_counted_string(QEMUFile *f, char buf[256]); +size_t coroutine_mixed_fn qemu_get_counted_string(QEMUFile *f, char buf[25= 6]); =20 void qemu_put_counted_string(QEMUFile *f, const char *name); =20 diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 102ab3b4392c..ee04240a21ba 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -392,7 +392,7 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t bl= ock_offset, * case if the underlying file descriptor gives a short read, and that can * happen even on a blocking fd. */ -static ssize_t qemu_fill_buffer(QEMUFile *f) +static ssize_t coroutine_mixed_fn qemu_fill_buffer(QEMUFile *f) { int len; int pending; @@ -585,7 +585,7 @@ void qemu_file_skip(QEMUFile *f, int size) * return as many as it managed to read (assuming blocking fd's which * all current QEMUFile are) */ -size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t of= fset) +size_t coroutine_mixed_fn qemu_peek_buffer(QEMUFile *f, uint8_t **buf, siz= e_t size, size_t offset) { ssize_t pending; size_t index; @@ -633,7 +633,7 @@ size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, siz= e_t size, size_t offset) * return as many as it managed to read (assuming blocking fd's which * all current QEMUFile are) */ -size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size) +size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_= t size) { size_t pending =3D size; size_t done =3D 0; @@ -674,7 +674,7 @@ size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_= t size) * Note: Since **buf may get changed, the caller should take care to * keep a pointer to the original buffer if it needs to deallocate i= t. */ -size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size) +size_t coroutine_mixed_fn qemu_get_buffer_in_place(QEMUFile *f, uint8_t **= buf, size_t size) { if (size < IO_BUF_SIZE) { size_t res; @@ -696,7 +696,7 @@ size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **= buf, size_t size) * Peeks a single byte from the buffer; this isn't guaranteed to work if * offset leaves a gap after the previous read/peeked data. */ -int qemu_peek_byte(QEMUFile *f, int offset) +int coroutine_mixed_fn qemu_peek_byte(QEMUFile *f, int offset) { int index =3D f->buf_index + offset; =20 @@ -713,7 +713,7 @@ int qemu_peek_byte(QEMUFile *f, int offset) return f->buf[index]; } =20 -int qemu_get_byte(QEMUFile *f) +int coroutine_mixed_fn qemu_get_byte(QEMUFile *f) { int result; =20 @@ -894,7 +894,7 @@ int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src) * else 0 * (Note a 0 length string will return 0 either way) */ -size_t qemu_get_counted_string(QEMUFile *f, char buf[256]) +size_t coroutine_fn qemu_get_counted_string(QEMUFile *f, char buf[256]) { size_t len =3D qemu_get_byte(f); size_t res =3D qemu_get_buffer(f, (uint8_t *)buf, len); diff --git a/migration/qemu-file.h b/migration/qemu-file.h index 9d0155a2a12e..d16cd504482a 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -108,8 +108,8 @@ bool qemu_file_is_writable(QEMUFile *f); =20 #include "migration/qemu-file-types.h" =20 -size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t of= fset); -size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size); +size_t coroutine_mixed_fn qemu_peek_buffer(QEMUFile *f, uint8_t **buf, siz= e_t size, size_t offset); +size_t coroutine_mixed_fn qemu_get_buffer_in_place(QEMUFile *f, uint8_t **= buf, size_t size); ssize_t qemu_put_compression_data(QEMUFile *f, z_stream *stream, const uint8_t *p, size_t size); int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src); @@ -119,7 +119,7 @@ int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src= ); * is; you aren't guaranteed to be able to peak to +n bytes unless you've * previously peeked +n-1. */ -int qemu_peek_byte(QEMUFile *f, int offset); +int coroutine_mixed_fn qemu_peek_byte(QEMUFile *f, int offset); void qemu_file_skip(QEMUFile *f, int size); /* * qemu_file_credit_transfer: --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069745; cv=none; d=zohomail.com; s=zohoarc; b=cJCIb4ruR6Ul79cijEefltt5aEi7LraK6eUKG9BTzMRbqVkGWJ79hujH9t5ORf9S6PcxC+Ql/sZ5SgRhmyj6yq5r73atdb2Layb/hx7IO4QBCs2BVTWtayzB30sKFeo8IucDQut9jGvv1QSMwI3YFV7BLX1zTP77WL1Nd7rH/jc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069745; h=Content-Type: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=WQid9SROIKamNzQkR2bAn4ObWBtAmtuNk7Y/JwduSh0=; b=Y+4JCcRJcXjCWX7yQUtXWvfJQqtowBzGqhnkg4W0BzTWDzcopUMo23PcvS5/lDevWV7bDA4fMtioaV0uKZ+GBAy4YoMPqgG2p+XYj6g6ItwBWVjl69OiGiMkkukjjPb534Imo4WIfYPa4HoTK1tgGgw3/F5utVg63uo+8M9LLLg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069745101924.7385475821078; Fri, 21 Apr 2023 02:35:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9L-0008MH-Ux; Fri, 21 Apr 2023 05:33:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9D-0008Fl-NJ for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9C-00033l-AD for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:43 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-531-7mlE5-qoM2-OOJASZL5oqQ-1; Fri, 21 Apr 2023 05:33:40 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9537db54c94so127358066b.2 for ; Fri, 21 Apr 2023 02:33:39 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id r2-20020a1709063d6200b00949691d3183sm1829954ejf.36.2023.04.21.02.33.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WQid9SROIKamNzQkR2bAn4ObWBtAmtuNk7Y/JwduSh0=; b=BI+aq3dE//s0N87c4CX2E22kFnCCvJvOJCeAX2dF07go4QP9fcvO3cGETaX2hUxkBGxZNE VhTyW9sS0lg6L+iUmRxVqeXujg9zru2vTE3qZCkZWrV7NcIKBJVJLTEYoHJX5EFvLUPY3Z 0vrFhHeVc839bLWz25t+KLFkod8jHkQ= X-MC-Unique: 7mlE5-qoM2-OOJASZL5oqQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069618; x=1684661618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WQid9SROIKamNzQkR2bAn4ObWBtAmtuNk7Y/JwduSh0=; b=ZEUosCOJbtcmVyD5PXrVHGsCY9daUyFCbfXMMW36LBlEhnYV/jWZ270AHTcUUayy/K xJG3wYQ9BS+C5QqSvPpyCdrYV4G5pMtH/XLQBQUDV9K73wX2Lxli9vO/6hfNtp+K1R8f m+5wj70Uv/VHBStIdgDi1pHVDuRBXNO9L1aZev3ZB4KhcsK+49F1SOWpptdqAmD9bSBh 25iW9Z7Rkkayh12G3MsBv5x0hHTE7yfJgOtn7ZqZpjr0aaCRLr8M9qUGqvu3ZZ/tOr2a RIHG7cBjPTiVDKCLbNs/drQEACUMXgPkRMl5pUAquZHfl1/LdRRF45X9uPZwO0GEItGR JA7w== X-Gm-Message-State: AAQBX9c8jf5BlwaU/asWRZy/etRxUyjc40QvtqWKKmomHaUQKJhUWoKi I8/O2bpNRrA7Erz7iWIzBWz2Nd6ohDmOdL8j6cz5ynjm8LPCryidELGCy0Sb6mNjt8efZNqHayT Zpm9VWmG1lWiNE1tcs7anQ7hTyqUhrV6TrH/ieAPLOvCM6qq5/gigSA39NJCfZ4pzg8hjOZgFIx MkRA== X-Received: by 2002:a17:906:b046:b0:92f:33ca:c9a3 with SMTP id bj6-20020a170906b04600b0092f33cac9a3mr1761443ejb.71.1682069618667; Fri, 21 Apr 2023 02:33:38 -0700 (PDT) X-Google-Smtp-Source: AKy350bvwSLn2gaCQqs+SSortlmNsBc5IJhEkqrFF0dYzT1u7OwssHUwiNdmt2rdiBcHP+ZfrDkykw== X-Received: by 2002:a17:906:b046:b0:92f:33ca:c9a3 with SMTP id bj6-20020a170906b04600b0092f33cac9a3mr1761427ejb.71.1682069618290; Fri, 21 Apr 2023 02:33:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/25] monitor: mark mixed functions that can suspend Date: Fri, 21 Apr 2023 11:33:06 +0200 Message-Id: <20230421093316.17941-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069746655100003 Content-Type: text/plain; charset="utf-8" There should be no paths from a coroutine_fn to aio_poll, however in practice coroutine_mixed_fn will call aio_poll in the !qemu_in_coroutine() path. By marking mixed functions, we can track accurately the call paths that execute entirely in coroutine context, and find more missing coroutine_fn markers. This results in more accurate checks that coroutine code does not end up blocking. If the marking were extended transitively to all functions that call these ones, static analysis could be done much more efficiently. However, this is a start and makes it possible to use vrc's path-based searches to find potential bugs where coroutine_fns call blocking functions. Signed-off-by: Paolo Bonzini --- include/qapi/qmp/dispatch.h | 4 ++-- qapi/qmp-dispatch.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h index 1e4240fd0dbc..f2e956813a14 100644 --- a/include/qapi/qmp/dispatch.h +++ b/include/qapi/qmp/dispatch.h @@ -55,8 +55,8 @@ bool qmp_command_available(const QmpCommand *cmd, Error *= *errp); const char *qmp_command_name(const QmpCommand *cmd); bool qmp_has_success_response(const QmpCommand *cmd); QDict *qmp_error_response(Error *err); -QDict *qmp_dispatch(const QmpCommandList *cmds, QObject *request, - bool allow_oob, Monitor *cur_mon); +QDict *coroutine_mixed_fn qmp_dispatch(const QmpCommandList *cmds, QObject= *request, + bool allow_oob, Monitor *cur_mon); bool qmp_is_oob(const QDict *dict); =20 typedef void (*qmp_cmd_callback_fn)(const QmpCommand *cmd, void *opaque); diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 0990873ec8ec..555528b6bbd3 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -134,8 +134,8 @@ static void do_qmp_dispatch_bh(void *opaque) * Runs outside of coroutine context for OOB commands, but in coroutine * context for everything else. */ -QDict *qmp_dispatch(const QmpCommandList *cmds, QObject *request, - bool allow_oob, Monitor *cur_mon) +QDict *coroutine_mixed_fn qmp_dispatch(const QmpCommandList *cmds, QObject= *request, + bool allow_oob, Monitor *cur_mon) { Error *err =3D NULL; bool oob; --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069739; cv=none; d=zohomail.com; s=zohoarc; b=CmbOH8aCdUnI7lBTOC4xXRz2bZWU+psef7jf1kSjncwj5pNVrrqOPff25SX0RedAtIBlEFNlmr67MF+5eSwxuACOX3KhUjOFRQUfYqj6vssoPthuRcON+K1ceFwD+5j3w4kOn7m9NZU4IQ4B9p8rF1p5uKxLnRjNX7Lv16fwzBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069739; 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=Fs7iulYBxjCOdYhH2yBORd8NhOEEc+Lg3CbfTMDDLNk=; b=kVruiZPz0fX8mvN6mCqiBtvw1AaZ69e6sxD9wZm/ha2DVT2Ds8qRYEeBC+HHc5Yzr+X8Z869ahOvA2eNRFIAqs1sYRtnRl8gLDVVKra3ZiYE0gNTjS/XDN4NJfUDu8QzfdE5t5j8IhEJ6vwI1LhbN1C1fuF0bTkHV4rvLBDbUV8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069739843681.1946369526694; Fri, 21 Apr 2023 02:35:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9L-0008NZ-TX; Fri, 21 Apr 2023 05:33:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9G-0008Fw-LR for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9F-000346-7R for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:46 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-675-OwRbQvJFNYGiuEEQPT3Bbw-1; Fri, 21 Apr 2023 05:33:41 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-94eaa8f18eeso117462666b.1 for ; Fri, 21 Apr 2023 02:33:41 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id e14-20020a170906504e00b0094a90d3e385sm1835516ejk.30.2023.04.21.02.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fs7iulYBxjCOdYhH2yBORd8NhOEEc+Lg3CbfTMDDLNk=; b=EWT3zk3Hz4FL4I5QjSa7FIQZOQ/f0PXHT1vB/q0dhBdIpcUs8Ezsa+z+VtKN0UbkoS9oWl PEB/9xsdsCKulz+Xt6k93FTTGs1EoSxmrxWUTVz24sh1pZm7VH34GgZ+qKbQo4GjwlbQgF 6S6iTdR/mEb0SZDa89Iiclim1qXVoRQ= X-MC-Unique: OwRbQvJFNYGiuEEQPT3Bbw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069620; x=1684661620; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fs7iulYBxjCOdYhH2yBORd8NhOEEc+Lg3CbfTMDDLNk=; b=G1qFAJpKWfAEaS+kU4V2HPzf1PSgNjpB+un93NzIbT1IG3ED6bv30bLJi1u+kkHEf+ zGZPFGqwpht4luNoxHg9R3VORzPrnYFC8aq4qkklcIIfKvxGcK4pFGpl//1L+h+BVhyU 9d0AmVDP7xixbBLs/+/EEQp1XxaI6kKU6fx0+sxxGdHVPH3kMp0ZDRj1LUdmzRe66gvx JqObuPwNId9Csl7e+S4ASSme9bR8OkhWgdHM0YBchPTlRyN3rfnvIx5qW+S0HX8iUcQk wY49TO04fe3HFQqLm97WvJMN3uv/Pk74zymQ5sNG3mLgYIModqbNwCJE/qCexsL6ODGl 9fbw== X-Gm-Message-State: AAQBX9fgFsdli34nAPtgkXrH68ML50pxl/uwlE9TIz4cJ/s5YqWvxeWh 02XX0rcB6ziPaofWORyciBfWX0BzittiebVkkVVsimIYIY5nJgey4Ds6pKbNXd+vBR0JoYIbfdn S42ABtzUvxyYkZdXmKEegoqlnY6GO4EYjSzlI0hcUPc++9BtiHkQTVG8h6JK1B8seN7jXEXzeJ7 b6qg== X-Received: by 2002:a17:906:2dd1:b0:94f:788:6bc with SMTP id h17-20020a1709062dd100b0094f078806bcmr1496765eji.37.1682069619973; Fri, 21 Apr 2023 02:33:39 -0700 (PDT) X-Google-Smtp-Source: AKy350YjrO//qeQmbuwLmQN2KQsXm8xakzh0fLZAGBDt5h5ArKIOiA8uwotux+lZA1j3HdbMGylD1w== X-Received: by 2002:a17:906:2dd1:b0:94f:788:6bc with SMTP id h17-20020a1709062dd100b0094f078806bcmr1496755eji.37.1682069619691; Fri, 21 Apr 2023 02:33:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Yang Zhong , Kai Huang Subject: [PULL 16/25] target/i386: Change wrong XFRM value in SGX CPUID leaf Date: Fri, 21 Apr 2023 11:33:07 +0200 Message-Id: <20230421093316.17941-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069740629100003 From: Yang Zhong The previous patch wrongly replaced FEAT_XSAVE_XCR0_{LO|HI} with FEAT_XSAVE_XSS_{LO|HI} in CPUID(EAX=3D12,ECX=3D1):{ECX,EDX}. As a result, SGX enclaves only supported SSE and x87 feature (xfrm=3D0x3). Fixes: 301e90675c3f ("target/i386: Enable support for XSAVES based features= ") Signed-off-by: Yang Zhong Reviewed-by:=C2=A0Yang Weijiang Reviewed-by: Kai Huang Message-Id: <20230406064041.420039-1-yang.zhong@linux.intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6576287e5b6c..f083ff4335ac 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5718,8 +5718,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, = uint32_t count, } else { *eax &=3D env->features[FEAT_SGX_12_1_EAX]; *ebx &=3D 0; /* ebx reserve */ - *ecx &=3D env->features[FEAT_XSAVE_XSS_LO]; - *edx &=3D env->features[FEAT_XSAVE_XSS_HI]; + *ecx &=3D env->features[FEAT_XSAVE_XCR0_LO]; + *edx &=3D env->features[FEAT_XSAVE_XCR0_HI]; =20 /* FP and SSE are always allowed regardless of XSAVE/XCR0. */ *ecx |=3D XSTATE_FP_MASK | XSTATE_SSE_MASK; --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069699; cv=none; d=zohomail.com; s=zohoarc; b=VfN/qL0qo/E+VXbRBbY0Y9M/fnbDOcV9fDNX1/6QqZKfx2QuZBKeBFEDeRfa78gd8CH3NIq2cmlQ0MqiWuFPmS7E29VHUc06E6isXx/NGKLrNw28sV+yt1BLgyplRET0d9FGOrHKcJTxO9L2Id/JfPnoQAet+pBOpMTuaz4JvSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069699; 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=ifgJJqm+ixiCLlygxPOWvcvQIIN1wnaUxQPNxTfWYyY=; b=WG008Ud0AhAPQs+m5rO6YkK9iRVzQtohthbK8h/7Nbxz7+4VY/bgeBrEr4lWyUJcj2Hyebb4EL3t7AGpA0bVDl4pO8PilK3tz4uVfYVjhz4uWlLOzgtT2QMfXv6SG0BYmWBrzXOOQvHRHJp1yQJ+Pjukvd6vL/WZyiX8NDcjcSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069699024403.59001715109173; Fri, 21 Apr 2023 02:34:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9P-0008TO-Ak; Fri, 21 Apr 2023 05:33:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9H-0008G3-1w for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9F-000347-In for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:46 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-613-RBF5-8qTPLqJXKdx0gBNsA-1; Fri, 21 Apr 2023 05:33:43 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5084807fb63so1369858a12.0 for ; Fri, 21 Apr 2023 02:33:42 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id o10-20020aa7c50a000000b0050504648fc4sm1652219edq.80.2023.04.21.02.33.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ifgJJqm+ixiCLlygxPOWvcvQIIN1wnaUxQPNxTfWYyY=; b=VLIbo+qUhPalfHUblcgURK82tYKNndnq58A8zmEeeDx3QqI2QeLJoYBT9RBoR5VCWVXUdy O7Wq+/D1YOyhwMKNncKSUtcn8cjQgaAWc90eVrNm5GJ4heGlxozepQgcSiHGKyxFA8crKa 3vBrn1g3la43eREH4zwWq4kwZKCUa1I= X-MC-Unique: RBF5-8qTPLqJXKdx0gBNsA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069621; x=1684661621; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ifgJJqm+ixiCLlygxPOWvcvQIIN1wnaUxQPNxTfWYyY=; b=QVpSr4ppOb775ZnyqYsKyRpdXyFIQRXTVj3tBFopUBrWZNxb7ae8LYRCqekcE1qu/9 /VKUZ9N7JYq+brGXkdf9CLLyuAnldf6xqByG+g3I5DmASMvsG+tT+RjP/fmSpL4sE6f5 dIhqHrGbI+ruRmpvqk5Znk6l5uGMCufEEeInB98xdJsLPutZPPNesgweiuLiqUCuSv4d JMx7JAEYYmcN4voAW43cVVk6R+0NAnLD65QRpSF+cixcPW7REEH+n+D6vKWk47R3YkcB 0M1NPxTJVawhZ+NCYx7HQSxmQVb/1nddZKPINJBwiG3H6sl1FvemtxtkNn1Prj93qAzU jibw== X-Gm-Message-State: AAQBX9dSDMJvA3rTIy3bbJs3voi/Hq67S882xk+LyD7yPt5dJK6zFQph UXj4l6keoYynOGz24CU+wgK69cuXv/aoTKPy3ERtfeurBkL/FKpsbLz4yidVWTV6FoPeRZ8tJMU UTlq1L6jrJPhQfZqkIDdgTUewi4VBZET516aFjegN4kW4z/82WD5d6Ko1fJiMHeD2n2Gw8w7g6J iNcQ== X-Received: by 2002:a05:6402:31f3:b0:4fb:aa0a:5b72 with SMTP id dy19-20020a05640231f300b004fbaa0a5b72mr4463828edb.5.1682069621561; Fri, 21 Apr 2023 02:33:41 -0700 (PDT) X-Google-Smtp-Source: AKy350ag4E5heZRwrCaqyegRBtXevEwfkLQG/FAt/0SbboijEpgBebXe2TIXrT2szZ+KW8X0EOsNUA== X-Received: by 2002:a05:6402:31f3:b0:4fb:aa0a:5b72 with SMTP id dy19-20020a05640231f300b004fbaa0a5b72mr4463811edb.5.1682069621185; Fri, 21 Apr 2023 02:33:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi Subject: [PULL 17/25] block-backend: remove qatomic_mb_read() Date: Fri, 21 Apr 2023 11:33:08 +0200 Message-Id: <20230421093316.17941-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069700528100006 Content-Type: text/plain; charset="utf-8" There is already a barrier in AIO_WAIT_WHILE_INTERNAL(), thus the qatomic_mb_read() is not adding anything. Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- block/block-backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 55efc735b442..5566ea059d55 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1845,7 +1845,7 @@ void blk_drain(BlockBackend *blk) =20 /* We may have -ENOMEDIUM completions in flight */ AIO_WAIT_WHILE(blk_get_aio_context(blk), - qatomic_mb_read(&blk->in_flight) > 0); + qatomic_read(&blk->in_flight) > 0); =20 if (bs) { bdrv_drained_end(bs); @@ -1867,7 +1867,7 @@ void blk_drain_all(void) aio_context_acquire(ctx); =20 /* We may have -ENOMEDIUM completions in flight */ - AIO_WAIT_WHILE(ctx, qatomic_mb_read(&blk->in_flight) > 0); + AIO_WAIT_WHILE(ctx, qatomic_read(&blk->in_flight) > 0); =20 aio_context_release(ctx); } --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069878; cv=none; d=zohomail.com; s=zohoarc; b=ikCdODXGgw8vqB05StlPJMBfzge9uz4WvgleiTOJvTWjK5htoLJztUfl1KJdspantIE+q/h/OOuJqtElyvD9XEoDC/ID7+JB0Qr6fgIFBQK0X2Bu8LlQC5LMLjO/f+PU78EAP3LQb+fDkSq2ndOk7ZtC4Vc7ClptRAT52oNBYlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069878; h=Content-Type: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=3okjpQrzd2vKlmxaZaYJ75/Yj5JiTgNQDSKdkZNOneI=; b=RqbGDYR9TXgwVyPlvgQw7Lw56YW9STWEoD+n2ZdFEkMIOuDGdfiEgtg+vP99M9J08slbYWvi7+T5rOq+v20KZs+DrY95FtOWWSL+Gu9bDCDZSkQW8jQrveYYgbRZNbEuXXxuIQoHNt6O7jV+KAVgf0F4UNTo8FoZukXkuH3qNfM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069878245144.29758578643907; Fri, 21 Apr 2023 02:37:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9R-0008VM-4V; Fri, 21 Apr 2023 05:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9I-0008I6-6N for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9G-00034H-RE for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:47 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-86-X2caud0zMd2ltzxFFVj2_g-1; Fri, 21 Apr 2023 05:33:44 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-50692ecb46fso1627238a12.0 for ; Fri, 21 Apr 2023 02:33:44 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id j15-20020aa7c40f000000b0050488d1d376sm1709175edq.0.2023.04.21.02.33.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3okjpQrzd2vKlmxaZaYJ75/Yj5JiTgNQDSKdkZNOneI=; b=Gy+D0vK2pmQZXpVoUEd8ObPptApj9R9flV1oUb6NHlWbtiYYyYn4NH+prAKpcSoUrtP8j7 33QqfFbcNLxL7PwqfDtKoxTCGQE5lZBwnIxDu8SkeyTsM6poygZQrhm+6ZcK0/oxJUl2aE 3tN9iCMFMTcKQsCks+yXbKSaSXCh/AY= X-MC-Unique: X2caud0zMd2ltzxFFVj2_g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069623; x=1684661623; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3okjpQrzd2vKlmxaZaYJ75/Yj5JiTgNQDSKdkZNOneI=; b=d1ZyKNQ4cvfT+OiQQg3Bpc6q5EIvDXlLu8ClINYv2YvalOb8GVFyR27msXuaDL3f+t Uvkg33qojHqrLl2+vP0aFsW96mNjBv0D9ADbfULsrvPlvgJAZrJhd0YPNY/I/S8Y4UMG 7rFu37JsJju12bMnQfBRWbIiZHT6nzE8Ij9A5EHKYxOKZ46rnQr9xb6W/GBdPcMl0K7V v7CzIRMmreret/QkcFsFnGZfCuXtVk8xzwPYC3o4oQSDMzlNyuMJmps6Px9cKcr8yM3C e3Ov0n1rB3h5YPozSioUgcXwUEHK5IE0cb0UwGUbr/FysQtl1sEHWKFBD4oIit0dZ/E5 37Ng== X-Gm-Message-State: AAQBX9d3yTR6Jns3C3z4HJLQpcMygLtPuZ5u+8f/+URODHK7WZCcAyVx U6A2r5HOi7JjlcbfUApSyd6JVIX9dtQQpkZFzCXAo5idpeb70Y00C4n/9QPhYaO1EH0UfIhbzgL C3/u1lWBlsVQxEPzC0rneXcE+AEd1zTZ7Vo3hQLiofDvZM+40xvIUglQ2u5yR3GFtTdQa0fGvSV Ppkg== X-Received: by 2002:aa7:da93:0:b0:508:3ff5:a306 with SMTP id q19-20020aa7da93000000b005083ff5a306mr3627482eds.37.1682069623065; Fri, 21 Apr 2023 02:33:43 -0700 (PDT) X-Google-Smtp-Source: AKy350ZiVLPTUW+GEAyFcMCPUKNAst015tVhsGH7ajewHag/qevn/bEZQ5L8aCFluYaIdnJd8gxHjQ== X-Received: by 2002:aa7:da93:0:b0:508:3ff5:a306 with SMTP id q19-20020aa7da93000000b005083ff5a306mr3627467eds.37.1682069622683; Fri, 21 Apr 2023 02:33:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/25] postcopy-ram: do not use qatomic_mb_read Date: Fri, 21 Apr 2023 11:33:09 +0200 Message-Id: <20230421093316.17941-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069879257100001 Content-Type: text/plain; charset="utf-8" It does not even pair with a qatomic_mb_set(), so it is clearer to use load-acquire in this case; they are synonyms. Signed-off-by: Paolo Bonzini --- migration/postcopy-ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 93f39f8e06b8..7d24dac39728 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -1500,7 +1500,7 @@ static PostcopyState incoming_postcopy_state; =20 PostcopyState postcopy_state_get(void) { - return qatomic_mb_read(&incoming_postcopy_state); + return qatomic_load_acquire(&incoming_postcopy_state); } =20 /* Set the state and return the old state */ --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069655; cv=none; d=zohomail.com; s=zohoarc; b=mv6B+yrS3VSojHXMfqHJPWeU+4j08bk5sofTARoOJnGkcFyBj6oRy4thu9jsibmlOHwDy4AOUM7HjZfK464kUT2QkdeafsxF5LWZTpaZWr7P+ATrKuAorHcmtKYfdAp9GbD49MPTuonuODDV8q8pQwYE1jiUjK2VfrLT8WV4CtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069655; 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=hYlTiTgp+ce3V9rnKNZfaOq5gwkISE66nwZwyLssxLg=; b=HweB86MBwzfOfz6UtdDlMqScS85SyJZY+CAZl0tEF40fVbnB1hOM+DWVkiXs9U3LHmpJCIACjopvTHFCOheZKZygrgw7AY8TFX6fCA+n38dODBbViUlZMvwvlErRd3Pi8/qAh0lfWDvDbw1CRd+A1AJzO6Ws37lAm5VTjEMLFgk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069655673114.76915979724333; Fri, 21 Apr 2023 02:34:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9P-0008TW-9h; Fri, 21 Apr 2023 05:33:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9J-0008LM-DL for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9I-00034Z-2x for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:49 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-225-8qjNPkTyOV61xj5NcN9kyw-1; Fri, 21 Apr 2023 05:33:45 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94a342f6516so144204166b.0 for ; Fri, 21 Apr 2023 02:33:45 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id qf19-20020a1709077f1300b0094ef923a6ccsm1794758ejc.219.2023.04.21.02.33.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hYlTiTgp+ce3V9rnKNZfaOq5gwkISE66nwZwyLssxLg=; b=QZbuozmSw5eqz498Dmw0vL8s8P7AXMDIR3pX7SpwkaZ9lILBAxeHKvb/jAVviP3OMV/Pwu AIEa6tegafwkk95CyL+5mwWgQAONmARuTycmKig/7tuLos6v3lC5rsJbEtwISWjU+bJmPD WVGUtxGiDqX/eUv2x3UwblARj+qher0= X-MC-Unique: 8qjNPkTyOV61xj5NcN9kyw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069624; x=1684661624; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hYlTiTgp+ce3V9rnKNZfaOq5gwkISE66nwZwyLssxLg=; b=LdTTC3qNZKmeQFoOT9skPjvpLPjK2dxZnnvB5Hp6Y7o2MKIEPEtM/8FJKRn9vlGLEI 8w+CWLXN/U2W/rtSBCXDJCbr8qn7hqhqvelTEG5B6L09GBlFPaeMU0ea9hkdM+PdYFj1 IvhlmOrDw1aUqUNk9CH6IvAm5DcyLEcgZN566BDOwsvwSOjj094yR4ZBiw+IjtZxIfMK oAQUfK1MwONCVOJdYv9Pq3aPm0s/o0sW0QyToQYbbprel/O4DI+MWCOz6am+Zc0eVglB yUcTeg7yIgOlOMGaAw5B1yfJIR8dhTMySA7+fjrF8JMYklwVW4Y9SEMtY3V9I/cjCedl fWng== X-Gm-Message-State: AAQBX9dWRpaJJkSGtX4fZanjVtqXUyVa1i5ZFPcb9nD3NWHxiXPCKm0h hoOlX9D35UcGF+CuLKzxjn5kN7DzfZ57UZUDJrUYt4gKq6R7KEWA5iyoWqCsuzvjyJ3EF6RivQT Wof+UZVUynuC63eoTsdgKjg93laODwiUhrIeCn/IHNwgq4AomKyTs3Ed5Sh7gzskEzuGYFYbstG AI6A== X-Received: by 2002:a17:906:488b:b0:94e:56c4:59f2 with SMTP id v11-20020a170906488b00b0094e56c459f2mr1637565ejq.26.1682069624262; Fri, 21 Apr 2023 02:33:44 -0700 (PDT) X-Google-Smtp-Source: AKy350aiB6PKt5Apr6zvKUWLYjAMElWsrQ5f4ElFyzXlZsukpkSNihc29vqtxgqQ0RhcKwR+g0UFYA== X-Received: by 2002:a17:906:488b:b0:94e:56c4:59f2 with SMTP id v11-20020a170906488b00b0094e56c459f2mr1637549ejq.26.1682069623894; Fri, 21 Apr 2023 02:33:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi Subject: [PULL 19/25] qemu-coroutine: remove qatomic_mb_read() Date: Fri, 21 Apr 2023 11:33:10 +0200 Message-Id: <20230421093316.17941-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069656407100009 Content-Type: text/plain; charset="utf-8" Replace with an explicit barrier and a comment. Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- util/qemu-coroutine.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c index 849452369201..17a88f65053e 100644 --- a/util/qemu-coroutine.c +++ b/util/qemu-coroutine.c @@ -127,9 +127,13 @@ void qemu_aio_coroutine_enter(AioContext *ctx, Corouti= ne *co) Coroutine *to =3D QSIMPLEQ_FIRST(&pending); CoroutineAction ret; =20 - /* Cannot rely on the read barrier for to in aio_co_wake(), as the= re are - * callers outside of aio_co_wake() */ - const char *scheduled =3D qatomic_mb_read(&to->scheduled); + /* + * Read to before to->scheduled; pairs with qatomic_cmpxchg in + * qemu_co_sleep(), aio_co_schedule() etc. + */ + smp_read_barrier_depends(); + + const char *scheduled =3D qatomic_read(&to->scheduled); =20 QSIMPLEQ_REMOVE_HEAD(&pending, co_queue_next); =20 --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069758; cv=none; d=zohomail.com; s=zohoarc; b=V1iQlW4npBneuq8tneiNaLjP3sih1Jrifd9uwXCCXKJcINbsZ3W7/ssw9PKNFKiNPev+lLXa12w7Ls8WM/U9qOOypJE86hV5HqpVsqntbjnrWgih5CIMKEj+IGKzwUdjMNQPPFnPdURTe+dYth4qUGNwgt8vCrDfF6rEcllTxlU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069758; 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=OetGYPfPxJMX1vKYs3QBB+jEsG19ZgvlvTT8oBfC3uY=; b=E5nO1rzMoo8L4AoH916xlGh4uGAywGCCCNC63pBi3zt5KURlP70WsLTZFp+dIxikfXFykyP4Q5to5yCiKnb90EkSWnO81GWjIOHuompZCoLQAnIZ04l5S5rtcPkrFn29o5sX3hJKYvDpj/854UH4a/klxs1xCMXK1ByRz3tqqpY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069758363753.6233009535952; Fri, 21 Apr 2023 02:35:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9Q-0008V0-0W; Fri, 21 Apr 2023 05:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9L-0008Mm-2R for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9J-00034t-J6 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:50 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-271--eQutY5pNIK9QeKFYH5xuw-1; Fri, 21 Apr 2023 05:33:47 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5069f2ae8eeso7118264a12.0 for ; Fri, 21 Apr 2023 02:33:47 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id v1-20020aa7dbc1000000b005029c47f814sm1663577edt.49.2023.04.21.02.33.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OetGYPfPxJMX1vKYs3QBB+jEsG19ZgvlvTT8oBfC3uY=; b=egr1+mD9lEsAAV6Buw3LJuUEilajdxpFr3wUeYe7FipYBaKYyzFhk1Gyaae8nNI1X/M1El LtKa7A+lHeUxvPSQr2LVs8kR0Ebq3SS3dveIDjDvMsXCVQF5Ld6Alg/hAONAdafAAX4AyS gsuyZFYk359vOO5J0/puroDRhOhm1sc= X-MC-Unique: -eQutY5pNIK9QeKFYH5xuw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069625; x=1684661625; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OetGYPfPxJMX1vKYs3QBB+jEsG19ZgvlvTT8oBfC3uY=; b=bDhd8CjTV7tgMUEovSloJvG/WgGGF6y31i51ySDdF+sg80CcaPn4S4iKY5Xj7rz7Yk zhDLNV0jk/D35fHy4G6f4+BMgx14e1gYiYqUkB9zjWGPPKM1NZpEz1F0GQHmvBQIdudW 2mmHyAd2Y2Hf5CiNQHoEoZVcFHcIpFO4pgkHnpTLwh7sJ18qj+AuQ1hdscCRJpporWTq mNg2+TJJ6Sij9977TYYMTQWIjbhpEp/7mJH856W/C65vHzG/2kiT643sMwMM97Lxe7y/ mgmyrKEckQ8bDAlQEuKVy6w9O7IXqLUVpgYyDGTzMIz95+/VCaXML2e+a4qpbHxTpcxy /H/w== X-Gm-Message-State: AAQBX9dTmFmSUR5SJNntvQ3emjT0QnMDmgsy9MOxB2kyFd5AtQk7sFPz 2k0myJn4+otY2b8Ta9MrisF/TJmssaUvS2q4XFpk8lsV58VwTAPwPsVFTlPxwevl8D/2+QcrFPX CuvZbu7cDu3v5RUspW9eiHd2/MlFfHPL/bDfif6JprZHR6IfC/Qyjma9bNcKJgWM8daoyDu8DYX 1ivA== X-Received: by 2002:a05:6402:d1:b0:506:c238:4067 with SMTP id i17-20020a05640200d100b00506c2384067mr4317763edu.8.1682069625659; Fri, 21 Apr 2023 02:33:45 -0700 (PDT) X-Google-Smtp-Source: AKy350YKFZJIa7cqCtsL4+p1rnKpIAWR3fO3rNx2w+FDyLpPys2u1kJ7s2sQQYDRBKqxiKAXSKiSnQ== X-Received: by 2002:a05:6402:d1:b0:506:c238:4067 with SMTP id i17-20020a05640200d100b00506c2384067mr4317751edu.8.1682069625351; Fri, 21 Apr 2023 02:33:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi Subject: [PULL 20/25] docs: explain effect of smp_read_barrier_depends() on modern architectures Date: Fri, 21 Apr 2023 11:33:11 +0200 Message-Id: <20230421093316.17941-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069758547100005 Content-Type: text/plain; charset="utf-8" The documentation for smp_read_barrier_depends() does not mention the archi= tectures for which it is an optimization, for example ARM and PPC. As a result, it = is not clear to the reader why one would use it. Relegate Alpha to a footnote tog= ether with other architectures where it is equivalent to smp_rmb(). Suggested-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- docs/devel/atomics.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/devel/atomics.rst b/docs/devel/atomics.rst index 81ec26be1771..248076375bfe 100644 --- a/docs/devel/atomics.rst +++ b/docs/devel/atomics.rst @@ -220,10 +220,9 @@ They come in six kinds: retrieves the address to which the second load will be directed), the processor will guarantee that the first LOAD will appear to happen before the second with respect to the other components of the system. - However, this is not always true---for example, it was not true on - Alpha processors. Whenever this kind of access happens to shared - memory (that is not protected by a lock), a read barrier is needed, - and ``smp_read_barrier_depends()`` can be used instead of ``smp_rmb()``. + Therefore, unlike ``smp_rmb()`` or ``qatomic_load_acquire()``, + ``smp_read_barrier_depends()`` can be just a compiler barrier on + weakly-ordered architectures such as Arm or PPC[#]_. =20 Note that the first load really has to have a _data_ dependency and not a control dependency. If the address for the second load is dependent @@ -231,6 +230,10 @@ They come in six kinds: than actually loading the address itself, then it's a _control_ dependency and a full read barrier or better is required. =20 +.. [#] The DEC Alpha is an exception, because ``smp_read_barrier_depends()= `` + needs a processor barrier. On strongly-ordered architectures such + as x86 or s390, ``smp_rmb()`` and ``qatomic_load_acquire()`` can + also be compiler barriers only. =20 Memory barriers and ``qatomic_load_acquire``/``qatomic_store_release`` are mostly used when a data structure has one thread that is always a writer --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069907; cv=none; d=zohomail.com; s=zohoarc; b=MXvPhxYpOO2GWJ+MOq6fiBZyKEFnRN1eFfyXPdNXE7deQBnJgbqwBB1fOLAtQQ/wW9DQyYc0P67zz1GDbTOqr1+LRpSwYW+YBVKEmI1mn7KUod5nb7xkUw2jBO1kXMDZwNA0jHOwntLpw+J4Vwvsc4IIF4E+JoSBK/fuJknVYsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069907; 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=okad+PcFVQMByyo2KeLFQxi04FPrrcM5w65u5q8ERwU=; b=bTOldeKF1l+738SfS48NFm7GRTp0/3JLMDS4boEcS3xtPESHF4Y02EyqsJJSU3QxNHQPLlteayMtAKUITx0aPqb1LANPr69kxHPglbhytrDVJUmrdTwXYgS1KVMonNb5ftnvI67qSpIs4t/tUiRyqSbBB9O3SnqFtfS+Gr6t2w8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069907382369.84095453313637; Fri, 21 Apr 2023 02:38:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9R-0008WT-Od; Fri, 21 Apr 2023 05:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9P-0008UW-Md for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9N-00035B-EI for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:55 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-3c76D2ArPrKW-uN5X6moMg-1; Fri, 21 Apr 2023 05:33:48 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-506a455ee4cso1360640a12.3 for ; Fri, 21 Apr 2023 02:33:48 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id w2-20020a1709067c8200b0094f2d38896esm1834463ejo.65.2023.04.21.02.33.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=okad+PcFVQMByyo2KeLFQxi04FPrrcM5w65u5q8ERwU=; b=N7EqmnxOOF8q54cQWTjQpCLrBz0vAw7GQJXCrWGLe4jzeM0vLtRSm2OhSL04czYw0Uqb2m Wn1mI8Nz7G7QGEZ5bBIsMjn0fw8jiXRaJRjR7rxbzqrjQDy29YIsybMQPzeTgLm1iXvTRS GpMLxGYFcKgYi4bTe1WlYVQx4niq8bY= X-MC-Unique: 3c76D2ArPrKW-uN5X6moMg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069627; x=1684661627; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=okad+PcFVQMByyo2KeLFQxi04FPrrcM5w65u5q8ERwU=; b=l+3CynzxvGVscIWz0HaAnRTAQtORNIBNzk0u2oLbZ/iypsi9D/lzlizBMpWNQJiXHd OMvNcDBTemAwKzQ+KF8X2vWBAV7irsv5mo+aeLGwidTpiIyfnhpwKxfWJMLk13BgZxRf kAJwutsczT3D4uDCfKwtAtKzEW11jqEAnYKeZ7lZFsSUwGpai27cXay8v5Ikepb3Mxpz 8MiB2m7rD201ttKrtOYFY93R7MnCqfd38ivp2/3wbhXGer1ZsGJP/mkkd7jcyzwIfu0E GHOAUNKXgsezySCw59hNk0O7hApxDgvmfvD6NNLGnXd8zh8GfM2XMVpKRJmGww5agarb m2LQ== X-Gm-Message-State: AAQBX9eWCyH07AlmsRtP3FQTa4SUx1LpX5prnabyYjjnSK7y7+BpB8NR zxMKqETvq/MQjYweYh3s41o3wh4dDQAnhUI9Mw3ZIZuoILfNlnSe4zIhvQB8U0ULcb9X0Nvcb7U KrgNtyWkXhRT9Emk8PZtbrG9X5a8UOqUcYqBd16IIv7C/XBcapAwHBlcK+CsxUXOGkc7d1hUEuS aZRQ== X-Received: by 2002:a17:907:1003:b0:94f:49a2:619a with SMTP id ox3-20020a170907100300b0094f49a2619amr1705963ejb.11.1682069627241; Fri, 21 Apr 2023 02:33:47 -0700 (PDT) X-Google-Smtp-Source: AKy350Z0+ZSQQubXyXi7UGvvd0FDTZC94HOULxEPikGy5XeY1+tnnz2HKJnbQaUw8OWAZT5avzKskg== X-Received: by 2002:a17:907:1003:b0:94f:49a2:619a with SMTP id ox3-20020a170907100300b0094f49a2619amr1705949ejb.11.1682069626891; Fri, 21 Apr 2023 02:33:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Eric Blake Subject: [PULL 21/25] nbd: a BlockExport always has a BlockBackend Date: Fri, 21 Apr 2023 11:33:12 +0200 Message-Id: <20230421093316.17941-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069909280100003 Content-Type: text/plain; charset="utf-8" exp->common.blk cannot be NULL, nbd_export_delete() is only called (through a bottom half) from blk_exp_unref() and in turn that can only happen after blk_exp_add() has asserted exp->blk !=3D NULL. Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini --- nbd/server.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/nbd/server.c b/nbd/server.c index 3d8d0d81df22..4f5c42f84d9e 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1847,15 +1847,13 @@ static void nbd_export_delete(BlockExport *blk_exp) g_free(exp->description); exp->description =3D NULL; =20 - if (exp->common.blk) { - if (exp->eject_notifier_blk) { - notifier_remove(&exp->eject_notifier); - blk_unref(exp->eject_notifier_blk); - } - blk_remove_aio_context_notifier(exp->common.blk, blk_aio_attached, - blk_aio_detach, exp); - blk_set_disable_request_queuing(exp->common.blk, false); + if (exp->eject_notifier_blk) { + notifier_remove(&exp->eject_notifier); + blk_unref(exp->eject_notifier_blk); } + blk_remove_aio_context_notifier(exp->common.blk, blk_aio_attached, + blk_aio_detach, exp); + blk_set_disable_request_queuing(exp->common.blk, false); =20 for (i =3D 0; i < exp->nr_export_bitmaps; i++) { bdrv_dirty_bitmap_set_busy(exp->export_bitmaps[i], false); --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069754; cv=none; d=zohomail.com; s=zohoarc; b=UpNZ84goXNQyCHckuR9d7vWM3Q50zTdAUhjvwbUeWY0F4f1wqsC2lKa0PK5vAVBGqAw3XKKXjvTt9AwLSQvnhVn2LhuVDdzxGciUUDEkeJcQZbhU4NJbxJ7Pmdh3QCOncDb+Ap5n6kURm439KlsfneeBsjZCyK1fnNip18id4pg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069754; h=Content-Type: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=+PTFHqqlU3/xSLss1G2SG/vMkPEIyxDAqDr4X3EZpbY=; b=PqtspN3b/mirk0vmHWax1ZW0MvEPyYG5MqkmspQtrq3BLDqEWG8H0N6wAImUHp194d4Sj0PsXtIon0E543Kr9iHi1pF728W9gQZ4IF6HHALsCH23ClMjSspjImL93GQPZm7wW9tAY8h7oxL0AzEfkGO6zd432VMV/wwtvhK47oc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069754748186.12314668670103; Fri, 21 Apr 2023 02:35:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9S-00005D-An; Fri, 21 Apr 2023 05:33:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9R-0008Vl-2x for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9N-00035g-4t for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:55 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-407-a_-NOxrbPyCSXw4hp0q1mw-1; Fri, 21 Apr 2023 05:33:50 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-94f2d9389afso116958366b.2 for ; Fri, 21 Apr 2023 02:33:49 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id f5-20020a170906494500b0094eaa31aa63sm1824418ejt.77.2023.04.21.02.33.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+PTFHqqlU3/xSLss1G2SG/vMkPEIyxDAqDr4X3EZpbY=; b=dLE+gj5Tr7tkFONq06CB/WvKRQ4dLfzyQXPZ5D2NK1FMRFNF8xuFL2oUL9zF8uBfZGGDIv OKVjf2U6p2K/eTVhxBRIL2aYAQg74SX5A+4zcbGkGI/cQVgyMiL497Qaquuy+x0nLEtJQL j4NPyGIqw1ovqAoKmGkO7O6vUI8T6rc= X-MC-Unique: a_-NOxrbPyCSXw4hp0q1mw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069628; x=1684661628; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+PTFHqqlU3/xSLss1G2SG/vMkPEIyxDAqDr4X3EZpbY=; b=eGVswDa9F78dxFv486nQwtEYfYai/ChXXpRx08/O/vl8Bg32XMKzj4NYIpV7ccb41g thbbrfZDW57Vh8IXPvIs9KPNCV4XrYMVLyyJ8vKZMESsHRjF61Kzkh3/EDwmNSsFTcmK cAgmEHDHEp9/Bv/CWFDa9CJsoCb2dyhvC5PpHMO/1duzQzF9dLDzNc10eBnbOH8apeN0 dGV7e/SEfpUO/G2DkCfuHiHDkaYJiRFsVYyb9OC0V2FbvDW75njiCxM46rGfR2fSK+cx 8g5IeS+uPzEDhr1QlfnILbgI7l+DQLvM+6gPBjNwi4dUU0Z1yOy47T2oa+JLFQ5BU9HZ C/0w== X-Gm-Message-State: AAQBX9eE72eR/fMmd3Ciqhk7TBgFNtTP1N7/hgQcumc/IswG0YVxWu0H y7+pVqv2npzGNG4l8saVHuu8HnRQ3rk90GBzBAKvZfleO1xqFk/EsvXsgcdSBEZA43LawsBc/Yb D0AvQisPxJqn7SWMEH+t7MU64ivM0OuNOTMLzZWSIOIHpuUqMgoip7tOgYUPLvWNmqwpkZBxX4q S8sQ== X-Received: by 2002:a17:906:3fc4:b0:94e:be0:97 with SMTP id k4-20020a1709063fc400b0094e0be00097mr1583819ejj.26.1682069628633; Fri, 21 Apr 2023 02:33:48 -0700 (PDT) X-Google-Smtp-Source: AKy350ZKb/QoEtC04whwvfimUGuvoOdMQ31YvfVrngXcWYeev3FNJVlcmudv7xVD77rQ+Y6tAOzsow== X-Received: by 2002:a17:906:3fc4:b0:94e:be0:97 with SMTP id k4-20020a1709063fc400b0094e0be00097mr1583812ejj.26.1682069628304; Fri, 21 Apr 2023 02:33:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 22/25] coverity: unify Fedora dockerfiles Date: Fri, 21 Apr 2023 11:33:13 +0200 Message-Id: <20230421093316.17941-23-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069756600100001 Content-Type: text/plain; charset="utf-8" The Fedora CI and coverity runs are using a slightly different set of packages. Copy most of the content over from tests/docker while keeping the commands at the end that unpack the tools. Signed-off-by: Paolo Bonzini Message-Id: <20230331174844.376300-1-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/coverity-scan/coverity-scan.docker | 250 ++++++++++++--------- 1 file changed, 145 insertions(+), 105 deletions(-) diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-= scan/coverity-scan.docker index 6f60a52d2315..a349578526da 100644 --- a/scripts/coverity-scan/coverity-scan.docker +++ b/scripts/coverity-scan/coverity-scan.docker @@ -15,112 +15,152 @@ # The work of actually doing the build is handled by the # run-coverity-scan script. =20 -FROM fedora:30 -ENV PACKAGES \ - alsa-lib-devel \ - bc \ - brlapi-devel \ - bzip2 \ - bzip2-devel \ - ccache \ - clang \ - curl \ - cyrus-sasl-devel \ - dbus-daemon \ - device-mapper-multipath-devel \ - findutils \ - gcc \ - gcc-c++ \ - gettext \ - git \ - glib2-devel \ - glusterfs-api-devel \ - gnutls-devel \ - gtk3-devel \ - hostname \ - libaio-devel \ - libasan \ - libattr-devel \ - libblockdev-mpath-devel \ - libcap-devel \ - libcap-ng-devel \ - libcurl-devel \ - libepoxy-devel \ - libfdt-devel \ - libgbm-devel \ - libiscsi-devel \ - libjpeg-devel \ - libpmem-devel \ - libnfs-devel \ - libpng-devel \ - librbd-devel \ - libseccomp-devel \ - libssh-devel \ - libubsan \ - libudev-devel \ - libusbx-devel \ - libzstd-devel \ - llvm \ - lzo-devel \ - make \ - mingw32-bzip2 \ - mingw32-curl \ - mingw32-glib2 \ - mingw32-gmp \ - mingw32-gnutls \ - mingw32-gtk3 \ - mingw32-libjpeg-turbo \ - mingw32-libpng \ - mingw32-libtasn1 \ - mingw32-nettle \ - mingw32-nsis \ - mingw32-pixman \ - mingw32-pkg-config \ - mingw32-SDL2 \ - mingw64-bzip2 \ - mingw64-curl \ - mingw64-glib2 \ - mingw64-gmp \ - mingw64-gnutls \ - mingw64-gtk3 \ - mingw64-libjpeg-turbo \ - mingw64-libpng \ - mingw64-libtasn1 \ - mingw64-nettle \ - mingw64-pixman \ - mingw64-pkg-config \ - mingw64-SDL2 \ - ncurses-devel \ - nettle-devel \ - numactl-devel \ - perl \ - perl-Test-Harness \ - pixman-devel \ - pulseaudio-libs-devel \ - python3 \ - python3-sphinx \ - PyYAML \ - rdma-core-devel \ - SDL2-devel \ - snappy-devel \ - sparse \ - spice-server-devel \ - systemd-devel \ - systemtap-sdt-devel \ - tar \ - usbredir-devel \ - virglrenderer-devel \ - vte291-devel \ - wget \ - which \ - xen-devel \ - xfsprogs-devel \ - zlib-devel -ENV QEMU_CONFIGURE_OPTS --python=3D/usr/bin/python3 +FROM registry.fedoraproject.org/fedora:37 =20 -RUN dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt -ENV PATH $PATH:/usr/libexec/python3-sphinx/ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ + SDL2-devel \ + SDL2_image-devel \ + alsa-lib-devel \ + bash \ + bc \ + bison \ + brlapi-devel \ + bzip2 \ + bzip2-devel \ + ca-certificates \ + capstone-devel \ + ccache \ + clang \ + ctags \ + cyrus-sasl-devel \ + daxctl-devel \ + dbus-daemon \ + device-mapper-multipath-devel \ + diffutils \ + findutils \ + flex \ + fuse3-devel \ + gcc \ + gcc-c++ \ + gcovr \ + genisoimage \ + gettext \ + git \ + glib2-devel \ + glib2-static \ + glibc-langpack-en \ + glibc-static \ + glusterfs-api-devel \ + gnutls-devel \ + gtk3-devel \ + hostname \ + jemalloc-devel \ + json-c-devel \ + libaio-devel \ + libasan \ + libattr-devel \ + libbpf-devel \ + libcacard-devel \ + libcap-ng-devel \ + libcmocka-devel \ + libcurl-devel \ + libdrm-devel \ + libepoxy-devel \ + libfdt-devel \ + libffi-devel \ + libgcrypt-devel \ + libiscsi-devel \ + libjpeg-devel \ + libnfs-devel \ + libpmem-devel \ + libpng-devel \ + librbd-devel \ + libseccomp-devel \ + libselinux-devel \ + libslirp-devel \ + libssh-devel \ + libtasn1-devel \ + libubsan \ + liburing-devel \ + libusbx-devel \ + libzstd-devel \ + llvm \ + lttng-ust-devel \ + lzo-devel \ + make \ + mesa-libgbm-devel \ + meson \ + ncurses-devel \ + nettle-devel \ + ninja-build \ + nmap-ncat \ + numactl-devel \ + openssh-clients \ + pam-devel \ + pcre-static \ + pixman-devel \ + pkgconfig \ + pulseaudio-libs-devel \ + python3 \ + python3-PyYAML \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx_rtd_theme \ + rdma-core-devel \ + rpm \ + sed \ + snappy-devel \ + socat \ + sparse \ + spice-protocol \ + spice-server-devel \ + systemd-devel \ + systemtap-sdt-devel \ + tar \ + tesseract \ + tesseract-langpack-eng \ + usbredir-devel \ + util-linux \ + virglrenderer-devel \ + vte291-devel \ + which \ + xen-devel \ + xfsprogs-devel \ + zlib-devel \ + zlib-static \ + zstd && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV QEMU_CONFIGURE_OPTS --meson=3Dinternal + +RUN dnf install -y curl wget ENV COVERITY_TOOL_BASE=3D/coverity-tools COPY coverity_tool.tgz coverity_tool.tgz RUN mkdir -p /coverity-tools/coverity_tool && cd /coverity-tools/coverity_= tool && tar xf /coverity_tool.tgz --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069898; cv=none; d=zohomail.com; s=zohoarc; b=Hiy0Zovtiar3ChUE3KgZ8vlJgTJVTUZAnA0RTvfsKhe8i/+E8ghZzQlQRyAo+rSD+9VG9oRctfQTWDlZa0Gdr53g8Qj+w22fIT4LqGgSVv2Ts2r6ATLL1SwQJ1wB1Hfz3lW6uPKOmVnVj7IqjY/RJRUqKmNJ7vEn982yrJhxIFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069898; 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=gJKGv83T2S7mG0eDuSjytY2fJO/y/FRyf9NVrDOvjxE=; b=DLDkX9Xn9TvyJyN5kQAS3e6dTgAzukVIziZGlaUh1oJrbdwI0yrIHJXIMDKsBDX/z65xk43rRqclZS+p1WdBPMB93fV4TpKsETnVicpt4nhDid6301MSLtHW0RqtFNTNP4rsUghAdhQ4fNeA6/EsGAsV+xHKWr34KURuiTkpY3s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069898171590.3478289460046; Fri, 21 Apr 2023 02:38:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9R-0008WP-NO; Fri, 21 Apr 2023 05:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9Q-0008VF-1y for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9N-00035m-JS for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:55 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-611-F4vNWVX6O1yN12oDbydqEA-1; Fri, 21 Apr 2023 05:33:51 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94f271ebbc2so148724766b.2 for ; Fri, 21 Apr 2023 02:33:51 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id r2-20020a1709063d6200b00949691d3183sm1830140ejf.36.2023.04.21.02.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gJKGv83T2S7mG0eDuSjytY2fJO/y/FRyf9NVrDOvjxE=; b=A/OWeHPx2OpudQ8gf/ApT26AfpmgNpRA0bxU0yIEJKzPMC3XWw5ctXh/kG3AkaVP1lAcKk +TtETjadfKmmXbWf3ImCsZ6yx6FlePId/AM57GBK1xQbHrLk4OKxJkUPE9F5rA0ieEO8qT FQJq1rHF2R9uABmz0mAV9Vmk7O3iq+s= X-MC-Unique: F4vNWVX6O1yN12oDbydqEA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069630; x=1684661630; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gJKGv83T2S7mG0eDuSjytY2fJO/y/FRyf9NVrDOvjxE=; b=VlEts0HWywG54MVfLCEw6B/43yKygtY2b266Od/UA+ejQ3Tl8HGE7F5u20cmsTDP83 jBErgPpSs0g59bAeeqEw23TEW92z7GD2eqweqbPgK2hqs8W99Gyf6CYfOSc33ZJBfJyb nm/TWRNkqYwtzRddlwpQ8SrSW7A+snDbAS31iGjlGgF7GnQClGP1oddhz/9PI3jwSvox ww/BFtI8p2ZiYJtWXx8QmyTUYlmiykcHFm+nDQYVYlwFRV+ezkM1YtoW0mhuYZ24g5SY Y6R3MYPR7Gz1nNpffiIffA8dA4phd80BcjP8pK/iVww/VfRZg3urmQqONgpZZjBq4gqS VXSA== X-Gm-Message-State: AAQBX9eauwW2sFctDW4d91WmhDuRdhDyLzRIkltZvAAYvEmXEvbcamU8 VFEjR6YV8gR5jlBrQkgwXzhrDCA7CQzNytVyhp/IOIfapKleqFGl6l53XVh/JMsB8lUw4gwfTEL ILKaenist2JX0BriU8HImNc6ieMyWEYGB/trmkwWbK0Ok73+FxRBdBHw7gi0as6NMy+yujX5+aF dUgQ== X-Received: by 2002:a17:906:40f:b0:94f:a8fd:b69f with SMTP id d15-20020a170906040f00b0094fa8fdb69fmr1851182eja.18.1682069629855; Fri, 21 Apr 2023 02:33:49 -0700 (PDT) X-Google-Smtp-Source: AKy350aakeUI62Oe39n9bw7JOwCeiTsZD3C2abS8HiDAq4fruThrmWMJ4ub4HuQ9S5drUBvxgKYaDQ== X-Received: by 2002:a17:906:40f:b0:94f:a8fd:b69f with SMTP id d15-20020a170906040f00b0094fa8fdb69fmr1851170eja.18.1682069629555; Fri, 21 Apr 2023 02:33:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 23/25] configure: Honour cross-prefix when finding ObjC compiler Date: Fri, 21 Apr 2023 11:33:14 +0200 Message-Id: <20230421093316.17941-24-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069898547100001 Content-Type: text/plain; charset="utf-8" From: Peter Maydell Currently when configure picks an ObjectiveC compiler it doesn't pay attention to the cross-prefix. This isn't a big deal in practice, because we only use ObjC on macos and you can't cross-compile to macos. But it's a bit inconsistent. Rearrange the handling of objcc in configure so that we do the same thing that we do with cc and cxx. This means that the logic for picking the ObjC compiler goes from: if --objcc is specified, use that otherwise if clang is available, use that otherwise use $cc to: if --objcc is specified, use that otherwise if --cross-prefix is specified, use ${cross_prefix}clang otherwise if clang is available, use that otherwise use $cc Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1185 Signed-off-by: Peter Maydell Message-Id: <20230418161554.744834-1-peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini --- configure | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 22b8553b8d70..77c03315f820 100755 --- a/configure +++ b/configure @@ -316,6 +316,8 @@ for opt do ;; --cxx=3D*) CXX=3D"$optarg" ;; + --objcc=3D*) objcc=3D"$optarg" + ;; --cpu=3D*) cpu=3D"$optarg" ;; --extra-cflags=3D*) @@ -361,6 +363,21 @@ else cxx=3D"${CXX-${cross_prefix}g++}" fi =20 +# Preferred ObjC compiler: +# $objcc (if set, i.e. via --objcc option) +# ${cross_prefix}clang (if cross-prefix specified) +# clang (if available) +# $cc +if test -z "${objcc}${cross_prefix}"; then + if has clang; then + objcc=3Dclang + else + objcc=3D"$cc" + fi +else + objcc=3D"${objcc-${cross_prefix}clang}" +fi + ar=3D"${AR-${cross_prefix}ar}" as=3D"${AS-${cross_prefix}as}" ccas=3D"${CCAS-$cc}" @@ -647,13 +664,6 @@ do fi done =20 -# Default objcc to clang if available, otherwise use CC -if has clang; then - objcc=3Dclang -else - objcc=3D"$cc" -fi - if test "$mingw32" =3D "yes" ; then EXESUF=3D".exe" # MinGW needs -mthreads for TLS and macro _MT. @@ -713,7 +723,7 @@ for opt do ;; --cxx=3D*) ;; - --objcc=3D*) objcc=3D"$optarg" + --objcc=3D*) ;; --make=3D*) make=3D"$optarg" ;; --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069844; cv=none; d=zohomail.com; s=zohoarc; b=k4SHn9S5yyeqXbpPNrZ4IcDhmxBkanjHNR1BviFZNsaaN6jP1aPXyRKXW6pPHJ8q9kVQ3QSa+XI0T7eJGkL/Q4YycMVn5wr7tNpk6l7vFjvdyDyOjO/W90paBVhJ1RciPb1lFprzYpNpuDXwmAUruzPKKLHcJ1h+adIuBJgeoVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069844; 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=kIB/QotKeT2p8OO4tQ9BKrq03nO9wZG4in3EzRy+oUA=; b=gOsBqAXuHFQIk0htbJ5HIBYxgmpY4Wy//z3KJ8vzkwOb2+AGjh2iLP2rfvFcI9CCDygVRtkWcwDTJLeV5isoZ2VexkzOM+/Mxv44AR9fjZ87CI/MwgSn7GDa33ob7esPQnVBgepJwM44tp6O0TY8gB9Yjd/X82EZB96Mvyrb+hE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069844624496.18854538317055; Fri, 21 Apr 2023 02:37:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9d-0000Wg-ES; Fri, 21 Apr 2023 05:34:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9b-0000W3-LQ for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:34:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9P-00036O-T4 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:34:07 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-637-s8WJQJaGNKWI03Ei1KyrcA-1; Fri, 21 Apr 2023 05:33:53 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-506e62603f6so1384616a12.2 for ; Fri, 21 Apr 2023 02:33:53 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id s16-20020a056402165000b0050477decdfasm1669327edx.3.2023.04.21.02.33.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kIB/QotKeT2p8OO4tQ9BKrq03nO9wZG4in3EzRy+oUA=; b=VquH0u4N+dDbKvdgvEjj8d8JcA7n/U+Pvwob5aY/x5sUoyfapQFA6ElsfUPqLGt1ofAlab e1RPnoEyvCLXcpps9mXmzGcQDTImQ/qDwLqk7U775c9rLD9vqD6mafDwRtWJYyoa1TLskm F7xoxI+mM+cz4SsNUNfQbWXo0emsk/E= X-MC-Unique: s8WJQJaGNKWI03Ei1KyrcA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069632; x=1684661632; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kIB/QotKeT2p8OO4tQ9BKrq03nO9wZG4in3EzRy+oUA=; b=ZtBoIAGlghxizjcZvAT/YsQpcoUvE80pvL3ebepZ5KrOsanf/3sQnlbsfnYg5gQi+k qoqA2WCPMBt67yJSYgSgLLuUpaw2N7RWHPXeWmvsZegG2VIwYPRqXfUSvlupmNh99Jpk norwd/qitbPVn/c/fBKbQCaOIWuPO0NJEk5uYFi5HHMwCjrhEqw+Jn0GNcsCwA23BaBO KDaY4YWDSvo0ZYEtExCcw15LscNYJdMjtlNBOsuYlH5KUeW7UjbdIZajkj9/qAzdJsoO hCiVbzrIf8OcxfzVcqHby9NJgweNQ7O3fSTu2d2h6uhvLVA8oBllceEjS8yYBFWusOPt 3y1g== X-Gm-Message-State: AAQBX9fsk/Z+DotWTQrSFo4RiDHZCe1cibqKvpxTLDej2CAzhgjyy6Ki G8T86vQ1y1CwVgUTxk8QVw1KAFhEs2CshF5F6Rj97ft5xE6B8sqmyn+N88IBaDpwiIzOZSSt2HF i+Qg40dnaCxz1GwgpD2ai3seCgqM7kEu9ryEZXIk7n4qbBKycN+59uIZ3eI5Z7E3+bp5esLHDJT GYMQ== X-Received: by 2002:a05:6402:8d1:b0:506:84e0:a78b with SMTP id d17-20020a05640208d100b0050684e0a78bmr3677343edz.17.1682069631845; Fri, 21 Apr 2023 02:33:51 -0700 (PDT) X-Google-Smtp-Source: AKy350bWXCcdhTUUFL+TNwAgN4kAuuHhj3nJb8jen++eVCSJ0zxm2QbUHKeCTzBx3ilChFuYi66X2g== X-Received: by 2002:a05:6402:8d1:b0:506:84e0:a78b with SMTP id d17-20020a05640208d100b0050684e0a78bmr3677333edz.17.1682069631469; Fri, 21 Apr 2023 02:33:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Krempa Subject: [PULL 24/25] tests: libvirt-ci: Update to commit '2fa24dce8bc' Date: Fri, 21 Apr 2023 11:33:15 +0200 Message-Id: <20230421093316.17941-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069845511100003 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Update to commit which has fixes needed for OpenSUSE 15.4 and re-generate output files. Signed-off-by: Peter Krempa Message-Id: Signed-off-by: Paolo Bonzini --- tests/docker/dockerfiles/centos8.docker | 1 - tests/docker/dockerfiles/debian-amd64-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-arm64-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-armel-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-armhf-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-mips64el-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-mipsel-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora-win32-cross.docker | 5 ++--- tests/docker/dockerfiles/fedora-win64-cross.docker | 5 ++--- tests/docker/dockerfiles/fedora.docker | 5 ++--- tests/docker/dockerfiles/opensuse-leap.docker | 1 - tests/lcitool/libvirt-ci | 2 +- 14 files changed, 23 insertions(+), 28 deletions(-) diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index 7e3a6217ae2d..1a6a9087c11f 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -100,7 +100,6 @@ RUN dnf distro-sync -y && \ python38-setuptools \ python38-wheel \ rdma-core-devel \ - rpm \ sed \ snappy-devel \ socat \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index afb1cbd04638..2e7eb445f161 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -148,7 +148,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/x86_64-linux-gnu-gcc'\n\ ar =3D '/usr/bin/x86_64-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/x86_64-linux-gnu-strip'\n\ @@ -158,7 +158,7 @@ pkgconfig =3D '/usr/bin/x86_64-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'x86_64'\n\ cpu =3D 'x86_64'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/x86_64-linux-gnu && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/x86_64-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-c+= + && \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index b4f7a7f903ee..f558770f845a 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -147,7 +147,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/aarch64-linux-gnu-gcc'\n\ ar =3D '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/aarch64-linux-gnu-strip'\n\ @@ -157,7 +157,7 @@ pkgconfig =3D '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'aarch64'\n\ cpu =3D 'aarch64'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu &&= \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c= ++ && \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/doc= ker/dockerfiles/debian-armel-cross.docker index 4b4191f82474..f3d7e07cce5a 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -146,7 +146,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabi-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabi-strip'\n\ @@ -156,7 +156,7 @@ pkgconfig =3D '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'arm'\n\ cpu =3D 'arm'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi &&= \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c= ++ && \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index c9b6b2e56377..531c556ad5aa 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -147,7 +147,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabihf-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabihf-strip'\n\ @@ -157,7 +157,7 @@ pkgconfig =3D '/usr/bin/arm-linux-gnueabihf-pkg-config'= \n\ system =3D 'linux'\n\ cpu_family =3D 'arm'\n\ cpu =3D 'armhf'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf &&= \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf = && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -c++ && \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index cfe4f9a0d7fb..816dbd29113f 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -144,7 +144,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ @@ -154,7 +154,7 @@ pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-con= fig'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips64'\n\ cpu =3D 'mips64el'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi6= 4 && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-c++ && \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index 8e521fc9eec9..b115b29af3d6 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -144,7 +144,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mipsel-linux-gnu-gcc'\n\ ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/mipsel-linux-gnu-strip'\n\ @@ -154,7 +154,7 @@ pkgconfig =3D '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips'\n\ cpu =3D 'mipsel'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c+= + && \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index b1b8277f3f32..301bddb5367a 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -146,7 +146,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ ar =3D '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/powerpc64le-linux-gnu-strip'\n\ @@ -156,7 +156,7 @@ pkgconfig =3D '/usr/bin/powerpc64le-linux-gnu-pkg-confi= g'\n\ system =3D 'linux'\n\ cpu_family =3D 'ppc64'\n\ cpu =3D 'powerpc64le'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu = && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gn= u && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-c++ && \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index af39568ce53f..5d27c91c171a 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -145,7 +145,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/s390x-linux-gnu-gcc'\n\ ar =3D '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/s390x-linux-gnu-strip'\n\ @@ -155,7 +155,7 @@ pkgconfig =3D '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 's390x'\n\ cpu =3D 's390x'\n\ -endian =3D 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ +endian =3D 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++= && \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index 1fc4c987f751..e7966ec7fd28 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 =20 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ @@ -50,7 +50,6 @@ exec "$@"' > /usr/bin/nosync && \ python3-pip \ python3-sphinx \ python3-sphinx_rtd_theme \ - rpm \ sed \ socat \ sparse \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 39a0617a9dcf..86c3a8f2ac04 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 =20 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ @@ -50,7 +50,6 @@ exec "$@"' > /usr/bin/nosync && \ python3-pip \ python3-sphinx \ python3-sphinx_rtd_theme \ - rpm \ sed \ socat \ sparse \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index e030c5fb1e4a..b698b7595de1 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 =20 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ @@ -110,7 +110,6 @@ exec "$@"' > /usr/bin/nosync && \ python3-sphinx \ python3-sphinx_rtd_theme \ rdma-core-devel \ - rpm \ sed \ snappy-devel \ socat \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 8e9500e44318..28f153b77b56 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -93,7 +93,6 @@ RUN zypper update -y && \ python39-pip \ python39-setuptools \ rdma-core-devel \ - rpm \ sed \ snappy-devel \ sndio-devel \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 232f41f160d4..2fa24dce8bc2 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 232f41f160d4567b8c82dd52aa96c2bc3a5b75c1 +Subproject commit 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae95 --=20 2.40.0 From nobody Tue May 14 12:41:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682069738; cv=none; d=zohomail.com; s=zohoarc; b=Xi3dt5R/o1xGT8wAlu5p5812LvDy6UevTgV/ClayeLL+G+WdRKykHcKnoflzus27AhAwOBLaHdIGeTbIaPBCGuE8sRfRJw8e2AVzDlP+ugCzlMxTSqNKm/g1AZODK2nr6n7FCy2+q7+h1/twApAsTCl2l8Ku3oGq7Sd+5IMDhAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682069738; 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=HpiB6sxC3DohqxrKYpC94Jz3RHHqCyDuIsL7iXn2uv0=; b=i3oxDVkYFMHbcn0Rj40EQUFb03inefcUGfUBJ8P+sroo8RHKj8aIJr72fiwuat9t0GXGXya669F2LPBTfOPhi9WcZZNhPsqMwFB0Aj5DHjC/pnr4LrIyNJKGyDGQ4s92ZSsFeDNKX+XxXks3QK1ukPIOuWxJGFO4f5SV7g/sbF4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682069738976863.2765995639708; Fri, 21 Apr 2023 02:35:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppn9U-0000FS-L4; Fri, 21 Apr 2023 05:34:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9S-00005M-Il for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppn9Q-00036s-Q9 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 05:33:58 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-444-lm1MrSfgOT-JDmjgG_9azw-1; Fri, 21 Apr 2023 05:33:55 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-95707df1f05so101289566b.3 for ; Fri, 21 Apr 2023 02:33:54 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id w15-20020a170906b18f00b0094f2c74401csm1791335ejy.203.2023.04.21.02.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 02:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682069636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HpiB6sxC3DohqxrKYpC94Jz3RHHqCyDuIsL7iXn2uv0=; b=hZqkzeeTnXT2EUqYwYwMQTuFTFrBKXGp/TNFZyb29e0PULU31MD8qFgi8jHmbnDphilyJc lcnWTs36HqAd9Ym4UD/yq+ugQDluAHteCuZwtqxEpOQnCFTdmg0SpbYvVl4ztQjHZWlgRQ bIwXy6jTPiNIR8nXuD+i0aafZX0/RHc= X-MC-Unique: lm1MrSfgOT-JDmjgG_9azw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682069633; x=1684661633; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HpiB6sxC3DohqxrKYpC94Jz3RHHqCyDuIsL7iXn2uv0=; b=M2v3XJQJfiG/7STJGKeSOD2z9CoN4z7NbONStjGZFgsDRfVsoASPgY1Tk6bGObXrQO cqZXYi5qssnljEVkjVUrt80f2JkK5aJj661HWUDdKxQWKzhal5BYu4Xn2kJbASLFQHOZ JMmg2jGGmNnl547/yUDkYwRBxSAYqaYcqx5pGGrKJ6QOIiyCfM6Vyzl9PLwrRTBfWkX3 r6yMq+sknu533+WApwyAL6dNsOhKbWrKXNWdk591GGW08WgsEXYXwZT2EBJ7ULPIxpwL sxokX4VNTiIXp6aDFPORNR2QiXc1RxBC/1UTtJFPX3O48F0Q5CSdVJw/OQjmTpkQrRZ9 hXHA== X-Gm-Message-State: AAQBX9cKX13DOcR9zlu/5TWjZGS6ruMvUfQ019kvIxqOtpKJHHne5sxl O/5vWrNXf3idr5qdMWHee7CqDFlVlv1KY9nLOyKmuNulw15ZbYMMOxSxbIQupbPEYKy4/wl7GJj 97aWiW8ChaMDNsWjL8jFHU8BlDNbSJSo1n4gh/IRqMmVcgnCKi/O4h+mozixbYr4xtOWi1A6xPn oGpg== X-Received: by 2002:a17:906:2a81:b0:957:811:e88f with SMTP id l1-20020a1709062a8100b009570811e88fmr1415644eje.26.1682069633469; Fri, 21 Apr 2023 02:33:53 -0700 (PDT) X-Google-Smtp-Source: AKy350aBiqqRyCqPjJd5a3UtfZtrINDyKCwFSO+YF9HRKCSDb1FwZT+KEZq8dgQAxCdUEBeUUjzwkw== X-Received: by 2002:a17:906:2a81:b0:957:811:e88f with SMTP id l1-20020a1709062a8100b009570811e88fmr1415636eje.26.1682069633232; Fri, 21 Apr 2023 02:33:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Krempa , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 25/25] tests: lcitool: Switch to OpenSUSE Leap 15.4 Date: Fri, 21 Apr 2023 11:33:16 +0200 Message-Id: <20230421093316.17941-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421093316.17941-1-pbonzini@redhat.com> References: <20230421093316.17941-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682069740499100001 From: Peter Krempa Since OpenSUSE Leap 15 counts as a single major release of an LTS distribut= ion, lcitool has changed the target name to remove the minor version. Adjust the mappings and refresh script. This also updates the dockerfile to 15.4, since the 15.3 version is EOL now: https://get.opensuse.org/leap/15.3 Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: [Adjust for target name change and reword commit message. - Paolo] Signed-off-by: Paolo Bonzini --- tests/docker/dockerfiles/opensuse-leap.docker | 4 +-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/mappings.yml | 36 +++++++++---------- tests/lcitool/refresh | 2 +- ...suse-leap-153.yml =3D> opensuse-leap-15.yml} | 0 5 files changed, 22 insertions(+), 22 deletions(-) rename tests/lcitool/targets/{opensuse-leap-153.yml =3D> opensuse-leap-15.= yml} (100%) diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 28f153b77b56..afb9f5419f5c 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all opensuse-leap-153 qemu +# $ lcitool dockerfile --layers all opensuse-leap-15 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM registry.opensuse.org/opensuse/leap:15.3 +FROM registry.opensuse.org/opensuse/leap:15.4 =20 RUN zypper update -y && \ zypper install -y \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 2fa24dce8bc2..85487e140415 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae95 +Subproject commit 85487e140415b2ac54b01a9a6b600fd7c21edc2f diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index e4719e45516c..454963f07b86 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -1,71 +1,71 @@ mappings: flake8: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 meson: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3: CentOSStream8: python38 - OpenSUSELeap153: python39-base + OpenSUSELeap15: python39-base =20 python3-PyYAML: CentOSStream8: python38-PyYAML - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-devel: CentOSStream8: python38-devel - OpenSUSELeap153: python39-devel + OpenSUSELeap15: python39-devel =20 python3-docutils: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-numpy: CentOSStream8: python38-numpy - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-opencv: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-pillow: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-pip: CentOSStream8: python38-pip - OpenSUSELeap153: python39-pip + OpenSUSELeap15: python39-pip =20 python3-pillow: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-selinux: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-setuptools: CentOSStream8: python38-setuptools - OpenSUSELeap153: python39-setuptools + OpenSUSELeap15: python39-setuptools =20 python3-sphinx: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-sphinx-rtd-theme: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-venv: CentOSStream8: python38 - OpenSUSELeap153: python39-base + OpenSUSELeap15: python39-base =20 python3-wheel: CentOSStream8: python38-wheel - OpenSUSELeap153: python39-pip + OpenSUSELeap15: python39-pip =20 pypi_mappings: # Request more recent version @@ -74,4 +74,4 @@ pypi_mappings: =20 # Drop packages that need devel headers python3-numpy: - OpenSUSELeap153: + OpenSUSELeap15: diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index c0d7ad551649..33ef1282dac4 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -120,7 +120,7 @@ try: generate_dockerfile("debian-amd64", "debian-11", trailer=3D"".join(debian11_extras)) generate_dockerfile("fedora", "fedora-37") - generate_dockerfile("opensuse-leap", "opensuse-leap-153") + generate_dockerfile("opensuse-leap", "opensuse-leap-15") generate_dockerfile("ubuntu2004", "ubuntu-2004") generate_dockerfile("ubuntu2204", "ubuntu-2204") =20 diff --git a/tests/lcitool/targets/opensuse-leap-153.yml b/tests/lcitool/ta= rgets/opensuse-leap-15.yml similarity index 100% rename from tests/lcitool/targets/opensuse-leap-153.yml rename to tests/lcitool/targets/opensuse-leap-15.yml --=20 2.40.0