From nobody Wed Nov 27 02:33:52 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=1700839571; cv=none; d=zohomail.com; s=zohoarc; b=gR/lODoHq/5cErddCRw9cpM7R3QiLG8ANHApBA82k9EBtakdr21aMJndsAkJ8FxIctmoSUMl/UFROxiuiil98hTAd61wYPs3t2G78D6d0varPpLKGGdO8Lq/DDqZQX3BcSjtBqKuCGZuG/CJk8CLSjQO5m6DI3aniDohMurP4MY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700839571; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KAf9bM3eocErEa/U7AKj4Rew1Pss0mi+PtX9HD85dNU=; b=ncuLhTbCltnT3VPm86Mg4dWw6ZYXNSrNpFLUi8VkXKL7q27yNZ02WwBiYnfRnxFIwXF6caZN1S/UIerYerCt3guGi3mIZHooDU7jCTZbgyp7usZJ7hc0YB0PN0OkaZZC2h0UWkehwk4AcuJXo5Cp4ivK58wlp0PSGlyOsFASI0k= 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 1700839571800303.83434497674614; Fri, 24 Nov 2023 07:26:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2X-0004dY-Cx; Fri, 24 Nov 2023 10:24:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2V-0004cj-2z for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:19 -0500 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 1r6Y2T-00048N-FF for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:18 -0500 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-216-Anr1tm9YPGC5RqdmRrDgKg-1; Fri, 24 Nov 2023 10:24:15 -0500 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-77d6854a3f9so217903685a.3 for ; Fri, 24 Nov 2023 07:24:15 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id ee17-20020a05620a801100b0077d84ad9744sm233508qkb.36.2023.11.24.07.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839456; 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=KAf9bM3eocErEa/U7AKj4Rew1Pss0mi+PtX9HD85dNU=; b=O8W4ClSRlbqbsV+kJt2rNN2ybNJD8NrG/tk+BqAfqigyUjUMk92JCc82sVRarqLOqI5mV+ 1Ab+dU9qmP00ydXz5aQ/uGJotP7W9TMMEu9kyEHAoVkTACGk7owaJGxcu51PfNAiRI7Qr7 K9i6ASGfpXEWugX83mtbYXZRBd/D1eI= X-MC-Unique: Anr1tm9YPGC5RqdmRrDgKg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839454; x=1701444254; 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=KAf9bM3eocErEa/U7AKj4Rew1Pss0mi+PtX9HD85dNU=; b=vsYrZ0vbXxgGZrM5GteVa460VUttY9DXVAmkKzIXWbvoA2Ei3O5u8kKQzzMAG4m9x6 qCaWwRlc80lVBQw7RQ910MdmXxQx/8kh+toS0GyabYzG2U2KaBkM3THjt1LeaBZsJSso RzWccBbpAkCoK1HI3z2u0UXuIbus0GE54XiAVLgVr+FyoCikb/oclZ/ByWPP3scjQcxk UKBxV66yzgWeLiIQlEOVHdvAwdBkzWuWjFmUW3GApYO6eZU4YbyDkbKMeS0UKvheKx2z ujiL/3HVXzEuVE85Q5bW9HfPEn9nPooF8C+aMIUkDAGx7Pw3Z/jMqHWZ54AOhz/090u+ Ib3w== X-Gm-Message-State: AOJu0YzHFbkgLuVY1FrunIVc6H6aiVctmL9GrX60hiSNSgXKd9oE7Ieh qjDAXqlS0IjpBTEULFsDHjv/GxEB8PMFgncBcFwBKfPbP/xSslH9eiMUrU9d9t93ybbu9zF6fy4 bkKaqqITWsAIMKFdaEA+KE3xwzmtJRToW0Kxao17l6WS68JjBj9cFTy6Iy6dg1ywWE5J9jOKdjq k= X-Received: by 2002:a05:620a:3a4c:b0:76f:24bd:fef2 with SMTP id sk12-20020a05620a3a4c00b0076f24bdfef2mr2564410qkn.68.1700839453883; Fri, 24 Nov 2023 07:24:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmdcP3ovBrn54VDDwvWCphg+z7eUFUXE2UWGxfmftZ2yIv6rUFAm1GUCPuITuz/0OHFxphXw== X-Received: by 2002:a05:620a:3a4c:b0:76f:24bd:fef2 with SMTP id sk12-20020a05620a3a4c00b0076f24bdfef2mr2564379qkn.68.1700839453460; Fri, 24 Nov 2023 07:24:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Vladimir Sementsov-Ogievskiy , David Hildenbrand Subject: [PULL 01/10] coverity: physmem: use simple assertions instead of modelling Date: Fri, 24 Nov 2023 16:23:59 +0100 Message-ID: <20231124152408.140936-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1700839574061100002 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Unfortunately Coverity doesn't follow the logic aroung "len" and "l" variables in stacks finishing with flatview_{read,write}_continue() and generate a lot of OVERRUN false-positives. When small buffer (2 or 4 bytes) is passed to mem read/write path, Coverity assumes the worst case of sz=3D8 in stn_he_p()/ldn_he_p() (defined in include/qemu/bswap.h), and reports buffer overrun. To silence these false-positives we have model functions, which hide real logic from Coverity. However, it turned out that these new two assertions are enough to quiet Coverity. Assertions are better than hiding the logic, so let's drop the modelling and move to assertions for memory r/w call stacks. After patch, the sequence cov-make-library --output-file /tmp/master.xmldb \ scripts/coverity-scan/model.c cov-build --dir ~/covtmp/master make -j9 cov-analyze --user-model-file /tmp/master.xmldb \ --dir ~/covtmp/master --all --strip-path "$(pwd) cov-format-errors --dir ~/covtmp/master \ --html-output ~/covtmp/master_html_report Generate for me the same big set of CIDs excepept for 6 disappeared (so it becomes even better). Signed-off-by: Vladimir Sementsov-Ogievskiy Acked-by: David Hildenbrand Message-ID: <20231005140326.332830-1-vsementsov@yandex-team.ru> Signed-off-by: Paolo Bonzini --- scripts/coverity-scan/model.c | 88 ----------------------------------- system/physmem.c | 22 +++++++++ 2 files changed, 22 insertions(+), 88 deletions(-) diff --git a/scripts/coverity-scan/model.c b/scripts/coverity-scan/model.c index 686d1a30089..a064d840849 100644 --- a/scripts/coverity-scan/model.c +++ b/scripts/coverity-scan/model.c @@ -42,94 +42,6 @@ typedef _Bool bool; =20 typedef struct va_list_str *va_list; =20 -/* exec.c */ - -typedef struct AddressSpace AddressSpace; -typedef struct MemoryRegionCache MemoryRegionCache; -typedef uint64_t hwaddr; -typedef uint32_t MemTxResult; -typedef struct MemTxAttrs {} MemTxAttrs; - -static void __bufwrite(uint8_t *buf, ssize_t len) -{ - int first, last; - __coverity_negative_sink__(len); - if (len =3D=3D 0) return; - buf[0] =3D first; - buf[len-1] =3D last; - __coverity_writeall__(buf); -} - -static void __bufread(uint8_t *buf, ssize_t len) -{ - __coverity_negative_sink__(len); - if (len =3D=3D 0) return; - int first =3D buf[0]; - int last =3D buf[len-1]; -} - -MemTxResult address_space_read_cached(MemoryRegionCache *cache, hwaddr add= r, - MemTxAttrs attrs, - void *buf, int len) -{ - MemTxResult result; - // TODO: investigate impact of treating reads as producing - // tainted data, with __coverity_tainted_data_argument__(buf). - __bufwrite(buf, len); - return result; -} - -MemTxResult address_space_write_cached(MemoryRegionCache *cache, hwaddr ad= dr, - MemTxAttrs attrs, - const void *buf, int len) -{ - MemTxResult result; - __bufread(buf, len); - return result; -} - -MemTxResult address_space_rw_cached(MemoryRegionCache *cache, hwaddr addr, - MemTxAttrs attrs, - void *buf, int len, bool is_write) -{ - if (is_write) { - return address_space_write_cached(cache, addr, attrs, buf, len); - } else { - return address_space_read_cached(cache, addr, attrs, buf, len); - } -} - -MemTxResult address_space_read(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, - void *buf, int len) -{ - MemTxResult result; - // TODO: investigate impact of treating reads as producing - // tainted data, with __coverity_tainted_data_argument__(buf). - __bufwrite(buf, len); - return result; -} - -MemTxResult address_space_write(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, - const void *buf, int len) -{ - MemTxResult result; - __bufread(buf, len); - return result; -} - -MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, - MemTxAttrs attrs, - void *buf, int len, bool is_write) -{ - if (is_write) { - return address_space_write(as, addr, attrs, buf, len); - } else { - return address_space_read(as, addr, attrs, buf, len); - } -} - /* Tainting */ =20 typedef struct {} name2keysym_t; diff --git a/system/physmem.c b/system/physmem.c index fc2b0fee018..a63853a7bc9 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2699,6 +2699,17 @@ static MemTxResult flatview_write_continue(FlatView = *fv, hwaddr addr, l =3D memory_access_size(mr, l, addr1); /* XXX: could force current_cpu to NULL to avoid potential bugs */ + + /* + * Assure Coverity (and ourselves) that we are not going to OV= ERRUN + * the buffer by following ldn_he_p(). + */ +#ifdef QEMU_STATIC_ANALYSIS + assert((l =3D=3D 1 && len >=3D 1) || + (l =3D=3D 2 && len >=3D 2) || + (l =3D=3D 4 && len >=3D 4) || + (l =3D=3D 8 && len >=3D 8)); +#endif val =3D ldn_he_p(buf, l); result |=3D memory_region_dispatch_write(mr, addr1, val, size_memop(l), attrs); @@ -2769,6 +2780,17 @@ MemTxResult flatview_read_continue(FlatView *fv, hwa= ddr addr, l =3D memory_access_size(mr, l, addr1); result |=3D memory_region_dispatch_read(mr, addr1, &val, size_memop(l), attrs); + + /* + * Assure Coverity (and ourselves) that we are not going to OV= ERRUN + * the buffer by following stn_he_p(). + */ +#ifdef QEMU_STATIC_ANALYSIS + assert((l =3D=3D 1 && len >=3D 1) || + (l =3D=3D 2 && len >=3D 2) || + (l =3D=3D 4 && len >=3D 4) || + (l =3D=3D 8 && len >=3D 8)); +#endif stn_he_p(buf, l, val); } else { /* RAM case */ --=20 2.43.0 From nobody Wed Nov 27 02:33:52 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=1700839584; cv=none; d=zohomail.com; s=zohoarc; b=k6WHcB8qM71HrrFRP/1CZXS/EfuDOPTymJizcqH/J1FsQiiR73obfK+E2MykN5xFzUnq90JRzmBkn4zx7uxacIE2/i3XHlMLySle0CIxQ8/5R+OQxUz6h8br277jUzmQvYzPqq07Z4yKcqq+g4P379Fj7cA/VQpOnqiC3ixQ6E0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700839584; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=KmQ0T7rx17iHO2O3C1cis9pHGGhMaYE462PYDT0eF2I=; b=E/3eRrpTJH1Oc0+ssDT6aEt+IlWXPbz7AI63WRvheftzuLHF46n4cbmoKAX0q4cOVTuNLQArRvokUiisLsi/k1gId4UfoyFRrdPfQl5O5BroeWkCg6HZcXq4UGZ37OezeKAEK3ql2ZkLfgQNOrEE0BRbjRho3ZFXIAGZgYJFjH8= 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 1700839584030170.21909639453668; Fri, 24 Nov 2023 07:26:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2X-0004dZ-Gw; Fri, 24 Nov 2023 10:24:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2W-0004dC-Mp for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:20 -0500 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 1r6Y2V-00049M-91 for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:20 -0500 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-351-ecUHW5OaOIScteQpTniyYw-1; Fri, 24 Nov 2023 10:24:17 -0500 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-77d5f56155bso241130385a.0 for ; Fri, 24 Nov 2023 07:24:17 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id o21-20020a05620a131500b0076cda7eab11sm1269226qkj.133.2023.11.24.07.24.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839458; 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=KmQ0T7rx17iHO2O3C1cis9pHGGhMaYE462PYDT0eF2I=; b=Oau8Ae4zTVLxisiUtZVKGybAyWmXJWT6+GpKPo77Ru4IrxDTN6a+M4m7QANE2GVjcNvqP9 xcMKPEdD7Ljw8iWIPDqY1beeMyFaC5SIwFjz558gZNzfdJ0rpK3jnxOMTwAQk+VqL4WZbK hSabDaE+wh5F6yh0ztaBmaU6T5HePto= X-MC-Unique: ecUHW5OaOIScteQpTniyYw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839456; x=1701444256; 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=KmQ0T7rx17iHO2O3C1cis9pHGGhMaYE462PYDT0eF2I=; b=LgmnqhbTOF7yGPJOD7cVmui9Ux3GDTrrJgNslfWcR7XgW9+3c1nFY72Gez1kWogJw6 dLUElOi/wfW0Xl+43YduPLjAsRNrYBbCRXuHUoVDHJ64e6ES6QAmNOql6WjEY3B0O1Q7 3ArvWJujRyl/ij8YPzpNQcYBfH1aPSivFnKXWwYm9rkI4W6LVD4vvUWd3Q4CdYvORbKZ 2mZeSnzKUPZODJwSGJgX5qF/1pNudLAG772LQbW0rw+xxmCKB4yVAF4KdtXpLYbIIVJh OA4UA+FlD/MGCw0fDkjXnG4SEbi74P2nmb3IGhZGvTMkj3yWwpNuZy8dBK0fCVXZ8z9n Km0w== X-Gm-Message-State: AOJu0YxYq6KOX+4m5iBeSvmPDWWKsYw2VEFCRg7pHNOy0Dja0Sh0VMGn z0MdrJhDCL9ntaWWzsPk5+P5SV2NXJea390FE9L1OkLH8jMjsA/O/3RREt/j4OHjJe8toQx42E1 uEyhmh01HvL1NyOpYOFviRNfbwoLhluYkvPL4P047xmsm/GTKqXGgPB4XU3L3Ufv3eZrw/DC5wG E= X-Received: by 2002:a05:620a:1218:b0:779:eb01:8390 with SMTP id u24-20020a05620a121800b00779eb018390mr3053069qkj.49.1700839456395; Fri, 24 Nov 2023 07:24:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IGJgqAfzexxqwl30PlOeOl5YSzTy9PqWgYYCIZ5ZGjUJ+RvETkQf94gOBdwPzT1K/PnFyRxnw== X-Received: by 2002:a05:620a:1218:b0:779:eb01:8390 with SMTP id u24-20020a05620a121800b00779eb018390mr3053045qkj.49.1700839456040; Fri, 24 Nov 2023 07:24:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/10] tests: respect --enable/--disable-download for Avocado Date: Fri, 24 Nov 2023 16:24:00 +0100 Message-ID: <20231124152408.140936-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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_H4=0.001, RCVD_IN_MSPIKE_WL=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: 1700839585921100001 Content-Type: text/plain; charset="utf-8" Pass the content of $mkvenv_flags (which is either "--online" or empty) down to tests/Makefile.include. Signed-off-by: Paolo Bonzini --- configure | 9 +++++---- tests/Makefile.include | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 42fe4d05108..959b1a20c1c 100755 --- a/configure +++ b/configure @@ -968,14 +968,14 @@ meson=3D"$(cd pyvenv/bin; pwd)/meson" =20 # Conditionally ensure Sphinx is installed. =20 -mkvenv_flags=3D"" -if test "$download" =3D "enabled" -a "$docs" =3D "enabled" ; then - mkvenv_flags=3D"--online" +mkvenv_online_flag=3D"" +if test "$download" =3D "enabled" ; then + mkvenv_online_flag=3D" --online" fi =20 if test "$docs" !=3D "disabled" ; then if ! $mkvenv ensuregroup \ - $mkvenv_flags \ + $(test "$docs" =3D "enabled" && echo "$mkvenv_online_flag") \ ${source_path}/pythondeps.toml docs; then if test "$docs" =3D "enabled" ; then @@ -1634,6 +1634,7 @@ if test "$container" !=3D no; then fi echo "SUBDIRS=3D$subdirs" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak +echo "MKVENV_ENSUREGROUP=3D$mkvenv ensuregroup $mkvenv_online_flag" >> $co= nfig_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "NINJA=3D$ninja" >> $config_host_mak diff --git a/tests/Makefile.include b/tests/Makefile.include index dab1989a071..c9d1674bd07 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -111,7 +111,7 @@ quiet-venv-pip =3D $(quiet-@)$(call quiet-command-run, \ =20 $(TESTS_VENV_TOKEN): $(SRC_PATH)/pythondeps.toml $(call quiet-venv-pip,install -e "$(SRC_PATH)/python/") - $(PYTHON) python/scripts/mkvenv.py ensuregroup --online $< avocado + $(MKVENV_ENSUREGROUP) $< avocado $(call quiet-command, touch $@) =20 $(TESTS_RESULTS_DIR): --=20 2.43.0 From nobody Wed Nov 27 02:33:52 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=1700839532; cv=none; d=zohomail.com; s=zohoarc; b=Wn4FBrlls3ztoSLxh+630uJ1JGPXvkXRMlYuUDES7JpTSd5gON3na0ZSvTLZN+ZAbQ17dufNrdIixCq/ZYP3xxt+gT5j9ezPvvlTYoG1J03E+jF086EIU0yw6P/QOjODI0m/K2xfp+9l5yEKIjm/nGBeRHRo74fM5YUsKMDT6VU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700839532; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=gg7WTh3aHpl1+7zvMuf9VaYP22nQsRG0DOeT1ZRI+XY=; b=X7mTrVr8HbCydNRl6b6NndUgqR50PRLK+7JLYFU6tmbuKnl2f4GfXDxzHoc+VDyNctXvbhU5rHtcYHF4Rv7V/ltN9jdjwH78rCDCAqIgj476/Y0ejTQ/hBqPGX1JDfs43eUvry25bYd2nhYKcPQKd6qmBAJOUC9dUYxp/p2D1GE= 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 170083953229683.43372034571041; Fri, 24 Nov 2023 07:25:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2c-0004fm-2X; Fri, 24 Nov 2023 10:24:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2b-0004fe-96 for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:25 -0500 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 1r6Y2Z-0004A0-IO for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:25 -0500 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-PAo0zEoMPi6J7yfxbhiBBA-1; Fri, 24 Nov 2023 10:24:19 -0500 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-67a16ff92abso8274146d6.3 for ; Fri, 24 Nov 2023 07:24:19 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id n11-20020ad444ab000000b0067a08bba0bbsm1373838qvt.0.2023.11.24.07.24.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839462; 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=gg7WTh3aHpl1+7zvMuf9VaYP22nQsRG0DOeT1ZRI+XY=; b=bVsW1MPLxusQPTaSC/CQY4i6xX4pwufzbm5jzL/3p1pJojtGQS7+C2HAa6s1CGPmoDbjXM I0yc55zbTgy10iKSBtLZetx9j62WRWdyN3efPKfMpDfMog8MTZ/OitpCXATYE5XoPVuFT5 osXNE4Ls81IQJ0ZLxKEK2mQkBuMYylQ= X-MC-Unique: PAo0zEoMPi6J7yfxbhiBBA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839458; x=1701444258; 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=gg7WTh3aHpl1+7zvMuf9VaYP22nQsRG0DOeT1ZRI+XY=; b=JRIjHYGXjFX7+DxxosB8B7O3GYKAtGz7Kj7raZgK9kNdUzciTJSbrilcKfPC8wHtXP UsxoF4ap77X0gS/upN/raEvg4wlg5oYB9kI7u7fp7GAgIqHfI4CToCtvC9C7AW71goQT yKh+ZsmbnK2mJPboYjhfz0QJrptif4PE9LKUweqxhtIXmBeyaZGF+TLKljDDK0oz9rR9 3lrHyaOZ9Wjl934ootTm+Zjs07h5IP/7mN61QqS1WeRfdRKtPHYyRMVdQXvswGu8pX6O e19TehjiI7Cpq07Q7mBJviIVsEmI60yAi8Y6SWJMFpA/17EZRDuvEHnScbw+7dD34cbK JWgQ== X-Gm-Message-State: AOJu0Yx2ZfHuOWH0Df1GDW15lmpAQIcpYUlFyNXGexv8oEF2/cQL8GfZ WzwMAo9PqOYT6m2mY3TQoaPoG1e54C/+A0+eq2dK3DKc6axqxPW7DPxtYtntpqdS45wTRidWhUh hR6TxyG40Yh+h3IYezEQL6haYWLib2UbcGQ0lVP0Q47CO4NkiYSYb0GsJxjQ2eiQQn3cO8T0mfe s= X-Received: by 2002:a0c:f64f:0:b0:64f:4e64:5962 with SMTP id s15-20020a0cf64f000000b0064f4e645962mr3593525qvm.31.1700839458529; Fri, 24 Nov 2023 07:24:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+kT0kdrUSdAQY4RzNmzrMDX1vtLsV4vmPPN0+hmLWG/hmac1ob3ePn7B5fd8K8rYDAoZXnQ== X-Received: by 2002:a0c:f64f:0:b0:64f:4e64:5962 with SMTP id s15-20020a0cf64f000000b0064f4e645962mr3593492qvm.31.1700839458063; Fri, 24 Nov 2023 07:24:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/10] docs: document what configure does with virtual environments Date: Fri, 24 Nov 2023 16:24:01 +0100 Message-ID: <20231124152408.140936-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1700839533745100003 Content-Type: text/plain; charset="utf-8" Given the recent confusion around how QEMU detects the system Meson installation, and/or decides to install its own, it is time to fill in the "Python virtual environments and the QEMU build system" section of the documentation. Signed-off-by: Paolo Bonzini --- docs/devel/build-system.rst | 88 +++++++++++++++++++++++++++++++++++-- pythondeps.toml | 3 +- 2 files changed, 87 insertions(+), 4 deletions(-) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 21f78da7d1d..43d6005881e 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -122,10 +122,78 @@ functioning. These are performed using a few more he= lper functions: indicated by $TMPC. =20 =20 -Python virtual environments and the QEMU build system ------------------------------------------------------ +Python virtual environments and the build process +------------------------------------------------- + +An important step in ``configure`` is to create a Python virtual +environment (venv) during the configuration phase. The Python interpreter +comes from the ``--python`` command line option, the ``$PYTHON`` variable +from the environment, or the system PATH, in this order. The venv resides +in the ``pyvenv`` directory in the build tree, and provides consistency +in how the build process runs Python code. + +At this stage, ``configure`` also queries the chosen Python interpreter +about QEMU's build dependencies. Note that the build process does *not* +look for ``meson``, ``sphinx-build`` or ``avocado`` binaries in the PATH; +likewise, there are no options such as ``--meson`` or ``--sphinx-build``. +This avoids a potential mismatch, where Meson and Sphinx binaries on the +PATH might operate in a different Python environment than the one chosen +by the user during the build process. On the other hand, it introduces +a potential source of confusion where the user installs a dependency but +``configure`` is not able to find it. When this happens, the dependency +was installed in the ``site-packages`` directory of another interpreter, +or with the wrong ``pip`` program. + +If a package is available for the chosen interpreter, ``configure`` +prepares a small script that invokes it from the venv itself[#distlib]_. +If not, ``configure`` can also optionally install dependencies in the +virtual environment with ``pip``, either from wheels in ``python/wheels`` +or by downloading the package with PyPI. Downloading can be disabled with +``--disable-download``; and anyway, it only happens when a ``configure`` +option (currently, only ``--enable-docs``) is explicitly enabled but +the dependencies are not present[#pip]_. + +.. [#distlib] The scripts are created based on the package's metadata, + specifically the ``console_script`` entry points. This is t= he + same mechanism that ``pip`` uses when installing a package. + Currently, in all cases it would be possible to use ``python= -m`` + instead of an entry point script, which makes this approach a + bit overkill. On the other hand, creating the scripts is + future proof and it makes the contents of the ``pyvenv/bin`` + directory more informative. Portability is also not an issu= e, + because the Python Packaging Authority provides a package + ``distlib.scripts`` to perform this task. + +.. [#pip] ``pip`` might also be used when running ``make check-avocado`` + if downloading is enabled, to ensure that Avocado is + available. + +The required versions of the packages are stored in a configuration file +``pythondeps.toml``. The format is custom to QEMU, but it is documented +at the top of the file itself and it should be easy to understand. The +requirements should make it possible to use the version that is packaged +that is provided by supported distros. + +When dependencies are downloaded, instead, ``configure`` uses a "known +good" version that is also listed in ``pythondeps.toml``. In this +scenario, ``pythondeps.toml`` behaves like the "lock file" used by +``cargo``, ``poetry`` or other dependency management systems. + + +Bundled Python packages +----------------------- + +Python packages that are **mandatory** dependencies to build QEMU, +but are not available in all supported distros, are bundled with the +QEMU sources. Currently this includes Meson (outdated in CentOS 8 +and derivatives, Ubuntu 20.04 and 22.04, and openSUSE Leap) and tomli +(absent in Ubuntu 20.04). + +If you need to update these, please do so by modifying and rerunning +``python/scripts/vendor.py``. This script embeds the sha256 hash of +package sources and checks it. The pypi.org web site provides an easy +way to retrieve the sha256 hash of the sources. =20 -TBD =20 Stage 2: Meson =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -376,6 +444,15 @@ This is needed to obey the --python=3D option passed t= o the configure script, which may point to something other than the first python3 binary on the path. =20 +By the time Meson runs, Python dependencies are available in the virtual +environment and should be invoked through the scripts that ``configure`` +places under ``pyvenv``. One way to do so is as follows, using Meson's +``find_program`` function:: + + sphinx_build =3D find_program( + fs.parent(python.full_path()) / 'sphinx-build', + required: get_option('docs')) + =20 Stage 3: Make =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -434,6 +511,11 @@ number of dynamically created files listed later. executables. Build rules for various subdirectories are included in other meson.build files spread throughout the QEMU source tree. =20 +``python/scripts/mkvenv.py`` + A wrapper for the Python ``venv`` and ``distlib.scripts`` packages. + It handles creating the virtual environment, creating scripts in + ``pyvenv/bin``, and calling ``pip`` to install dependencies. + ``tests/Makefile.include`` Rules for external test harnesses. These include the TCG tests and the Avocado-based integration tests. diff --git a/pythondeps.toml b/pythondeps.toml index 0a35ebcf9f0..4beadfd96f5 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -10,7 +10,8 @@ # - accepted: accepted versions when using a system package # - installed: fixed version to install in the virtual environment # if a system package is not found; if not specified, -# the minimum and maximum +# defaults to the same as "accepted" or, if also missing, +# to the newest version available on PyPI. # - canary: if specified, use this program name to present more # precise error diagnostics to the user. For example, # 'sphinx-build' can be used as a bellwether for the --=20 2.43.0 From nobody Wed Nov 27 02:33:52 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=1700839574; cv=none; d=zohomail.com; s=zohoarc; b=H68kLqMELQWb4wiN/TOc8gaS7drpWy05hlwzm5LQounRUW1boOLtZY6yI36npuTx1ZolXaaj8avHDoS2FNlNyxLpUqwk+1y1hsagDI5mRP+0TqU1byZq9yvhAI0c6uPDwVGDF5r1YW7ESRb/A8oysgouMp/s9Cl8Muj/eOwHBt0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700839574; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FQQMgvxF9SwBnwwizEGgyfuBASfZamZJpC63FmNxYDo=; b=iDMJxnwaUgmtX+A/0o/fvd+dJFrjFH6XC33//w79SvhgAq3CFOY7257Yydarujcj9rJA49qT76rQkXxnDoh0hg/DDY7RDwKc2guPG2UsVammWEnsuhHJ1mjrbBUETmPC0NP0Ax8+O5Geqy42aDcrVYmU30k/fz+up7gSQKdqHHE= 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 1700839574201558.1754058094944; Fri, 24 Nov 2023 07:26:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2c-0004fu-FH; Fri, 24 Nov 2023 10:24:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2a-0004fW-TU for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:24 -0500 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 1r6Y2Z-00049y-8X for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:24 -0500 Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-227-dlc5gImoPQWEwF1TmUCGow-1; Fri, 24 Nov 2023 10:24:21 -0500 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-42387bd2759so27268301cf.2 for ; Fri, 24 Nov 2023 07:24:21 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id j16-20020ac86650000000b00423890096afsm1342747qtp.2.2023.11.24.07.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839462; 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=FQQMgvxF9SwBnwwizEGgyfuBASfZamZJpC63FmNxYDo=; b=XLLlpZk5L/vUjZ/Ks5CD1obDn62DHzA8ySeI6fKLmpHCabUCUtqDe0GxCtOnvhiMSFkZ2A +t2J+rSkIG4yH1FPo7Oc6ol67bdj7if+QnsWxw1gcVEQDj60E2fXV+ABlbd5jsvjg1AP1S mOOHdsuk0GcWssrv4F+fKyQRiBVxeNs= X-MC-Unique: dlc5gImoPQWEwF1TmUCGow-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839460; x=1701444260; 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=FQQMgvxF9SwBnwwizEGgyfuBASfZamZJpC63FmNxYDo=; b=oF2yyBW+1BjEtWFiQQPHSfppZBfcBxguM14bHW6AvOoTBKchgwVEn0lBkpjjBka0fU 6z6084M9SZOeOMIXhDTkMPm5UT/f7fATA9COehwB/lyTjMEMwhNd8t84vLkTJqMXSvCd 0Qahcu9Zc9l3Jy0JTAu3ndKUZX4tqUt+UNyvI/oXWBPehx675FpkOdftOM55uvuoNWuQ 67CS6CbnsJ51hG8eFNj2hkZ/vRaE0KpBfwtL61lJBZFyL9JG+7kdOc7lqgYd04pjWGIP YylDTSKCGUn4g7tEWMxaoaXfFt1UgEZHmqvn2T+7riYFVG4YfYGS5FoxpFUPEc6pW9+c RtJw== X-Gm-Message-State: AOJu0Yz8CxN8pK0fb//Jl3kqTgER79mKNzzP3aRz1V0LRrG+S+daBu3U 6rvEDNUkDLdyzejzu+RPO6rQA+jeL7qNz5hZvcKaD7EFsu9fZjIxC18BCYzSW2p00TLSj0P8s/c ZHM0cnTsv5noui/bVCIt/Un4ftreIg0I7j/BCHKpOt1nMmPvIamDw8/rw2tonnNnJja/PyKmHpY c= X-Received: by 2002:a05:622a:110:b0:423:6f53:75bb with SMTP id u16-20020a05622a011000b004236f5375bbmr4156538qtw.4.1700839460395; Fri, 24 Nov 2023 07:24:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJfIc9pzKTYhu+VdZpqO3uUD0GsS3ZZLbgwbpf1rMj4TQm+UPUErlabPYdr3SAcKFU5s4LBg== X-Received: by 2002:a05:622a:110:b0:423:6f53:75bb with SMTP id u16-20020a05622a011000b004236f5375bbmr4156495qtw.4.1700839459957; Fri, 24 Nov 2023 07:24:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 04/10] buildsys: Bump known good meson version to v1.2.3 Date: Fri, 24 Nov 2023 16:24:02 +0100 Message-ID: <20231124152408.140936-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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_H4=0.001, RCVD_IN_MSPIKE_WL=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: 1700839575940100006 From: Philippe Mathieu-Daud=C3=A9 We need meson v1.2.3 to build QEMU on macOS Sonoma. It also builds fine all our CI jobs (as tested by also bumping "accepted" in pythondeps.toml), so let's use it as our "good enough" packaged wheel. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1939 Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231109160504.93677-2-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- python/scripts/vendor.py | 4 ++-- python/wheels/meson-0.63.3-py3-none-any.whl | Bin 926526 -> 0 bytes python/wheels/meson-1.2.3-py3-none-any.whl | Bin 0 -> 964928 bytes pythondeps.toml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 python/wheels/meson-0.63.3-py3-none-any.whl create mode 100644 python/wheels/meson-1.2.3-py3-none-any.whl diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py index 76274871170..1038b14ae0c 100755 --- a/python/scripts/vendor.py +++ b/python/scripts/vendor.py @@ -41,8 +41,8 @@ def main() -> int: parser.parse_args() =20 packages =3D { - "meson=3D=3D0.63.3": - "d677b809c4895dcbaac9bf6c43703fcb3609a4b24c6057c78f828590049cf43a", + "meson=3D=3D1.2.3": + "4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1", =20 "tomli=3D=3D2.0.1": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", diff --git a/python/wheels/meson-0.63.3-py3-none-any.whl b/python/wheels/me= son-0.63.3-py3-none-any.whl deleted file mode 100644 index 8a191e3a200eba6783297676729ec85ceb96f89d..000000000000000000000000000= 0000000000000 Binary files a/python/wheels/meson-0.63.3-py3-none-any.whl and /dev/null di= ffer diff --git a/python/wheels/meson-1.2.3-py3-none-any.whl b/python/wheels/mes= on-1.2.3-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..a8b84e5f114ad3fbec8ae560084= 26a90bccfc168 Binary files /dev/null and b/python/wheels/meson-1.2.3-py3-none-any.whl dif= fer diff --git a/pythondeps.toml b/pythondeps.toml index 4beadfd96f5..0e884159993 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -19,7 +19,7 @@ =20 [meson] # The install key should match the version in python/wheels/ -meson =3D { accepted =3D ">=3D0.63.0", installed =3D "0.63.3", canary =3D = "meson" } +meson =3D { accepted =3D ">=3D0.63.0", installed =3D "1.2.3", canary =3D "= meson" } =20 [docs] sphinx =3D { accepted =3D ">=3D1.6", installed =3D "5.3.0", canary =3D "sp= hinx-build" } --=20 2.43.0 From nobody Wed Nov 27 02:33:52 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=1700839529; cv=none; d=zohomail.com; s=zohoarc; b=G9f+stqNd2HBYPHzeEVy2com6Qgyyz4KFoGYSvHmQyr9La/foCxmNoXrC9o6sff4ljH4g2r35CG/dJdXk2Ik91Co1xX7zNx2wqjVjA/vK0JJtymM/pyfUIWpN57C4DttXivL2JLDZXek0zEMqok8pHyQJxJ7yNburvOvvOaczv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700839529; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/20DDByM3Qsjva1Qthl5NkPrrLu3hCoWgmP4Oz1sqnY=; b=Slem5803q0PTgh6kV0NADVEhhy+0qR49/YJNgo+y9ruDMey2q2vrLBJw7AbtaT143YdvkIN7+jWsw+sSHREN3qkghYgzJYb61UNsyXuXrd1iFt84/YnW+yq5LXlvBnTw3rT93af39IyHb76Yzn8faai7Z2emI+vQTeqPMH0O4xk= 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 1700839529172588.7104483165031; Fri, 24 Nov 2023 07:25:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2e-0004go-W7; Fri, 24 Nov 2023 10:24:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2d-0004gZ-N5 for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:27 -0500 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 1r6Y2c-0004Ad-0d for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:27 -0500 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-517-P8Ox6sp-OzCRvj2q3AcBHQ-1; Fri, 24 Nov 2023 10:24:24 -0500 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-679f5ae0a7fso21307086d6.1 for ; Fri, 24 Nov 2023 07:24:24 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id p4-20020a05621415c400b0067a17f65a9csm531040qvz.21.2023.11.24.07.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839465; 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=/20DDByM3Qsjva1Qthl5NkPrrLu3hCoWgmP4Oz1sqnY=; b=bVFbowtO+/Anhqqb/MO+r45LxJN3Ot2bM9s+OBhFz0XqoSa4dO2XQauz/4elWSZ7uOjK5S DmX1+/yCFPumOjbLauYnTvp/0jN1gbxM2wl6sMchPBxmgTIHNM6c4tOhPRWHyMOYyp+8Gp qCj9OvSJPtw+0UVlQ5EtuqG1d++0eAo= X-MC-Unique: P8Ox6sp-OzCRvj2q3AcBHQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839463; x=1701444263; 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=/20DDByM3Qsjva1Qthl5NkPrrLu3hCoWgmP4Oz1sqnY=; b=Bm3prhl7RABdlgekT46PEnqh5I0O0zCKuPTXWkMd/Xf16Gr14SXiBenoLpLXDWGKoK B13/WbGpKwkA7TbtOXAVlMvSBoDEr5xp5bP0rkyxkfGlSHuUXytf0kfDZI7XoXpygMVY /nMBqTRfW7oitmwnXOl0Kr5rKTRR8LzlnhGVL6OekyH0bovYy3uzjpexi5OLl8kfENcz xYqX3+nXmmX2DrtBSgc5vDl1uRo7gGBcyHvSc+VedommHjO8zAzaLJOzJ1sguzYwiaFD mvs0qUwZUK0qbmsiwHmkB9GAvnNNEOjCEtxximH8Kq/CX0TD+HqJx9OHpBkZcmiKkl6S ZBOw== X-Gm-Message-State: AOJu0YxJrr5vbZFyEnQ4o5uoW1cpVhZWnpa+qMyJ5VNqIRMy5KbYwj/W lg9OsPriNDEC5AzaGz8IqVxrCGcZgSBs0NLIHuRhfjiP1Bydr4LqOWt4/vgPEuaT3lBegH/1B79 hkfcX7CX6fM6AFgdFqZBPv92fW8m7B4n06LScJ2gTXvX8ZOUu7iJcwEhN6zVh9yp/iHbyUej8A/ Y= X-Received: by 2002:a05:6214:1fd0:b0:679:e3e1:a9bd with SMTP id jh16-20020a0562141fd000b00679e3e1a9bdmr3184357qvb.33.1700839463094; Fri, 24 Nov 2023 07:24:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IHTatovI0IVFac6zEM3R8n8R/S2Sgga+OzEfRxqzFLv7vLzcUSp/++ZlKlE0RX29rgyxldYzg== X-Received: by 2002:a05:6214:1fd0:b0:679:e3e1:a9bd with SMTP id jh16-20020a0562141fd000b00679e3e1a9bdmr3184329qvb.33.1700839462665; Fri, 24 Nov 2023 07:24:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 05/10] .gitlab-ci.d/cirrus: Add manual testing of macOS 14 (Sonoma) Date: Fri, 24 Nov 2023 16:24:03 +0100 Message-ID: <20231124152408.140936-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1700839529843100002 From: Philippe Mathieu-Daud=C3=A9 Upgrade libvirt-ci so it covers macOS 14. Add a manual entry (QEMU_JOB_OPTIONAL: 1) to test on Sonoma release. Refresh the lci-tool generated files. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231109160504.93677-3-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/cirrus.yml | 16 ++++++++++++++++ .gitlab-ci.d/cirrus/macos-14.vars | 16 ++++++++++++++++ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci.d/cirrus/macos-14.vars diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 07dc6edae1c..64f2e25afab 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -74,6 +74,22 @@ aarch64-macos-13-base-build: PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurse= s/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat= check-qtest-x86_64 =20 +aarch64-macos-14-base-build: + extends: .cirrus_build_job + variables: + NAME: macos-14 + CIRRUS_VM_INSTANCE_TYPE: macos_instance + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G + UPDATE_COMMAND: brew update + INSTALL_COMMAND: brew install + PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin + PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurse= s/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat= check-qtest-x86_64 + QEMU_JOB_OPTIONAL: 1 + =20 # The following jobs run VM-based tests via KVM on a Linux-based Cirrus-CI= job .cirrus_kvm_job: diff --git a/.gitlab-ci.d/cirrus/macos-14.vars b/.gitlab-ci.d/cirrus/macos-= 14.vars new file mode 100644 index 00000000000..43070f4a265 --- /dev/null +++ b/.gitlab-ci.d/cirrus/macos-14.vars @@ -0,0 +1,16 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-14 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +CCACHE=3D'/opt/homebrew/bin/ccache' +CPAN_PKGS=3D'' +CROSS_PKGS=3D'' +MAKE=3D'/opt/homebrew/bin/gmake' +NINJA=3D'/opt/homebrew/bin/ninja' +PACKAGING_COMMAND=3D'brew' +PIP3=3D'/opt/homebrew/bin/pip3' +PKGS=3D'bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffuti= ls dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo= json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh li= btasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-co= nfig python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol sw= tpm tesseract usbredir vde vte3 xorriso zlib zstd' +PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' +PYTHON=3D'/opt/homebrew/bin/python3' diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 36bc517161c..77c800186f3 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 36bc517161c45ead20224d47f2dc4fa428af6724 +Subproject commit 77c800186f34b21be7660750577cc5582a914deb diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 993683cf484..0c93557ad67 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -207,6 +207,7 @@ try: # generate_cirrus("freebsd-13") generate_cirrus("macos-13") + generate_cirrus("macos-14") =20 # # VM packages lists --=20 2.43.0 From nobody Wed Nov 27 02:33:52 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=1700839554; cv=none; d=zohomail.com; s=zohoarc; b=lAnFlQWTJo+nvEtIlZR4HPltrGDlIP7Juuqq93dPpe3OLrttAqc9ogK2dSVVJT7ssn/r9pFHEH2D/2IBXcxmuGmJo+RNgjgNv7XRgAgJ2UEgEOsomAuA9Z6SqSkfzm4SmDxr9yxvn35LAy4mPkagX6YCBSLxqhUdJodTBGEkfIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700839554; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TtFo/B8xEGoyrSgNCfhRFu5ifrwebiHFtXFyMhpJy0A=; b=aLd+YWlWY7C3tcNbPtkAvcHudIe61rXNl4VdRPPvpWHW2BSAhScXqBNDFs/VyzKpTKSVCaxLvU8BXYdkV1IkQZs5n9NQMHpvHynUGJxxI/S2pmkHEw6BVWc1I09gxfzAfNwwr253vfHq26hYPN+Bo/or2uXqqc7YTz2bWDLdbUs= 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 1700839554424925.2540101118367; Fri, 24 Nov 2023 07:25:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2g-0004hF-U3; Fri, 24 Nov 2023 10:24:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2f-0004h3-Fu for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:29 -0500 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 1r6Y2e-0004Ay-1k for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:29 -0500 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-511-FpPuOUWJOa-exYUWgJhYlQ-1; Fri, 24 Nov 2023 10:24:26 -0500 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-41e58a33efaso20633001cf.2 for ; Fri, 24 Nov 2023 07:24:26 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id z22-20020a05622a029600b00423907c8ce4sm1091091qtw.33.2023.11.24.07.24.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839467; 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=TtFo/B8xEGoyrSgNCfhRFu5ifrwebiHFtXFyMhpJy0A=; b=M9LtCLO0JVej3VTAdbBIxGD/pDVuKKOm4lVVHMAAos7/ctdJ4eGBorfX0G3teBaAgoOXA0 JfUrS2nIeAS812Q5kjXNGUI3UR2uYAyPLi7UIHKCQ2ae7eUq+3QpIHUyK+DmFI/mYcIxbF qk3qzUu64qfKOPWTOFTjPAWepapIkfc= X-MC-Unique: FpPuOUWJOa-exYUWgJhYlQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839465; x=1701444265; 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=TtFo/B8xEGoyrSgNCfhRFu5ifrwebiHFtXFyMhpJy0A=; b=s6yX7ZdaF6mWCPOGNORhsGIp4ZfocdOc8k1P7yAR1mBJ28gny9gMGFnVNoBfROO48t sFaO0ohsK1tVtZH3E7E0Jd7cuJa39EvmGT7WnZVSJafr67bmPAGySbccAgkcIQ+a63wc iA7pu6ROTzVR6jjAHi3R4bfB97iMLKkZ0hvYubQiZW0Tjmv5O7PgmHik3vTM7D0HgavV Y+bWRpczJkKSqt674zmvduohszpvEyujurIELfiO0+aDt7Bip2z1eLNRRC9tIIa+Vn4P EmGWl/IcuYfh2sl/p3R2Jyl7GW4EWdk4dg1JIeg5NzqIEeztwyZDbWYFv3ea/8CIPnwy nsKw== X-Gm-Message-State: AOJu0Yy89vsf6cJOLPHproTYLEV8mh1gwa8ZC6qeba5ySZbIZhi6oVD/ 1JpzHViMq/K3RiZGpRcJpvKL/5YL2Mg/uW9HbpIYmhCIIj9JgFjKWXXczOYPchtCg0GSgxMqIzG 3lR/26B7vxFxVB9JGW62mypD/6+sFZZNW+QUTI81ej0zYpI6wH/xQGeP5/EjnPigBDftwpKTKLo w= X-Received: by 2002:a05:622a:1821:b0:421:c6ef:4b0b with SMTP id t33-20020a05622a182100b00421c6ef4b0bmr4119257qtc.17.1700839465164; Fri, 24 Nov 2023 07:24:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IExNFtjHzw112K/xwDb+0o4b4NY0Vfb34g4hUo7i9WZ6PuxyGylNq+BEXNaYpHWs5qCnzTFbQ== X-Received: by 2002:a05:622a:1821:b0:421:c6ef:4b0b with SMTP id t33-20020a05622a182100b00421c6ef4b0bmr4119225qtc.17.1700839464762; Fri, 24 Nov 2023 07:24:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Akihiko Odaki , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 06/10] audio: Free consumed default audio devices Date: Fri, 24 Nov 2023 16:24:04 +0100 Message-ID: <20231124152408.140936-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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_H4=0.001, RCVD_IN_MSPIKE_WL=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: 1700839555895100003 From: Akihiko Odaki Failed default audio devices were removed from the list but not freed, and that made LeakSanitizer sad. Free default audio devices as they are consumed. Signed-off-by: Akihiko Odaki Acked-by: Marc-Andr=C3=A9 Lureau Message-ID: <20231120112804.9736-1-akihiko.odaki@daynix.com> Signed-off-by: Paolo Bonzini --- audio/audio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audio/audio.c b/audio/audio.c index f91e05b72c9..8d1e4ad9227 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1758,12 +1758,15 @@ static AudioState *audio_init(Audiodev *dev, Error = **errp) goto out; } s->dev =3D dev =3D e->dev; + QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next); + g_free(e); drvname =3D AudiodevDriver_str(dev->driver); driver =3D audio_driver_lookup(drvname); if (!audio_driver_init(s, driver, dev, NULL)) { break; } - QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next); + qapi_free_Audiodev(dev); + s->dev =3D NULL; } } =20 --=20 2.43.0 From nobody Wed Nov 27 02:33:52 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=1700839600; cv=none; d=zohomail.com; s=zohoarc; b=P94I6n9OJLx8JdIixp5rvSZDX0EfAEKMpWoRY5k7nu4ofaC3tfFTxTL7PaefzrDHIWT3zn4Uv1ZMj45iP/0GeRlSjYLoivBLIa5JX26FHpRRiOlRekM11apmkrU5kJopOXem4xG4q1LOBrj/bY/suIS5apr4R9v8/jRWY1kskZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700839600; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IwpePLbK8L8er5IFJ0cDPeto50q8k0R3zr0tlVz0C5o=; b=AYumyDH8Iww/h/GQeTpqgodENH7bBKtTUBexw57qjTzGmKSAI5QvpE/R+0hFYtIwLxdAdZYkod2ou7piO4eTfweBwb8uVTlHkUV4rPRXsk2lBUd6WQLsgYOLGwnip+WN20cAA8cVeUqW9FsKfZlyuOjU0INHjDQV1EXA67a2jf0= 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 1700839600546422.2523336308062; Fri, 24 Nov 2023 07:26:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2m-0004iU-HR; Fri, 24 Nov 2023 10:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2l-0004i5-9T for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:35 -0500 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 1r6Y2j-0004Bd-NC for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:35 -0500 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-86-I61ebTawOWavAh6SRkdjGA-1; Fri, 24 Nov 2023 10:24:29 -0500 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-77a12fbe7eeso193617485a.2 for ; Fri, 24 Nov 2023 07:24:29 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id ss12-20020a05620a3acc00b0077d62e78db9sm1282569qkn.128.2023.11.24.07.24.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839472; 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=IwpePLbK8L8er5IFJ0cDPeto50q8k0R3zr0tlVz0C5o=; b=J1rAFXZ3RrOMEux4TIL/1BA3T7DPUwc3jWmloQ5ejR+j75aU34QrsdE16YX4loOCNq7bjd 0/bThATY0JxbAtQwi55Tn21SwSeBWsWT291o6Ey2Y55Y8bAQRycWe4KrStZ0FKivTC4p/v iqvFak2rAZT04CbPx8O/H1M7Bd7pYMU= X-MC-Unique: I61ebTawOWavAh6SRkdjGA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839468; x=1701444268; 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=IwpePLbK8L8er5IFJ0cDPeto50q8k0R3zr0tlVz0C5o=; b=kgBfyIuyaEY5ZU79vakVvFJD5lQ/s8cW2lJn/qDzt53F1rwESymKjsFM50/aroRa0Y pQHYvxeBakcj2JPvDV5851A1/21HvOKYpzmsnHpmwbsMuHXnLjJ8ATwgn2SKNBzw1DLC /Wx0zcd/SmK4w1QiC0uuColyjw1mF8oXVGYhBEh7GcbKKSW0y7WRz9CpsFecRMhbf+5g eFYeejTBN6eNiUhJFQ2rqTVVHZjEK1MgChMVOnh2yUt2Mx4q3NyOTHQ463f6/Q3myptP /kjFRbzbt5iptQsMHAFqPCN4NQc0AnF2mSMr1DEcUJWiLyZOyKpkJo7KUDBiJ1HS7qOb 65Jg== X-Gm-Message-State: AOJu0YxpyimbftwMTV7YO23fOftoZ3wT86ikf0waiQCVfZWBKN+vM15q vAlmQlv4LvKcTOFCprz8oE4SO2jkXcgjyLW2nsDZ1hP9DLV9eT/KUSGB6yk1eIuFmkf69nOhY9i h6G8rpe6XHMFb4cTYSyt7kZSYUeg+7i2euLopdkuV0ULNY1gOTdVlN5hvzLs/SA10D+GO4jF+Vs Q= X-Received: by 2002:a05:620a:4883:b0:77b:c650:5eab with SMTP id ea3-20020a05620a488300b0077bc6505eabmr3597048qkb.5.1700839468004; Fri, 24 Nov 2023 07:24:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IHdXn+yvNsu8ZJm0mCUpNyFPZgmWqCuHxYjYtCan2WP1g2NA0sdqX+m77LnuRasxL8Crz+NtA== X-Received: by 2002:a05:620a:4883:b0:77b:c650:5eab with SMTP id ea3-20020a05620a488300b0077bc6505eabmr3597009qkb.5.1700839467593; Fri, 24 Nov 2023 07:24:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PULL 07/10] disas/cris: Pass buffer size to format_dec() to avoid overflow warning Date: Fri, 24 Nov 2023 16:24:05 +0100 Message-ID: <20231124152408.140936-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1700839601984100001 From: Philippe Mathieu-Daud=C3=A9 Propagate the buffer size to format_dec() and use snprintf(). This should silence this UBSan -Wformat-overflow warning: In file included from /usr/include/stdio.h:906, from include/qemu/osdep.h:114, from ../disas/cris.c:21: In function 'sprintf', inlined from 'format_dec' at ../disas/cris.c:1737:3, inlined from 'print_with_operands' at ../disas/cris.c:2477:12, inlined from 'print_insn_cris_generic.constprop' at ../disas/cris.c:2= 690:8: /usr/include/bits/stdio2.h:30:10: warning: null destination pointer [-Wfo= rmat-overflow=3D] 30 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 31 | __glibc_objsize (__s), __fmt, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 32 | __va_arg_pack ()); | ~~~~~~~~~~~~~~~~~ Reported-by: Akihiko Odaki Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231120132222.82138-1-philmd@linaro.org> [Rewritten to fix logic and avoid repeated expression. - Paolo] Signed-off-by: Paolo Bonzini --- disas/cris.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/disas/cris.c b/disas/cris.c index 0b0a3fb9165..409a224c5d1 100644 --- a/disas/cris.c +++ b/disas/cris.c @@ -1731,10 +1731,10 @@ format_hex (unsigned long number, unsigned (=3D=3D 0). */ =20 static char * -format_dec (long number, char *outbuffer, int signedp) +format_dec (long number, char *outbuffer, size_t outsize, int signedp) { last_immediate =3D number; - sprintf (outbuffer, signedp ? "%ld" : "%lu", number); + snprintf (outbuffer, outsize, signedp ? "%ld" : "%lu", number); =20 return outbuffer + strlen (outbuffer); } @@ -1876,6 +1876,12 @@ print_flags (struct cris_disasm_data *disdata, unsig= ned int insn, char *cp) return cp; } =20 +#define FORMAT_DEC(number, tp, signedp) \ + format_dec (number, tp, ({ \ + assert(tp >=3D temp && tp <=3D temp + sizeof(temp)); \ + temp + sizeof(temp) - tp; \ + }), signedp) + /* Print out an insn with its operands, and update the info->insn_type fields. The prefix_opcodep and the rest hold a prefix insn that is supposed to be output as an address mode. */ @@ -2105,7 +2111,7 @@ print_with_operands (const struct cris_opcode *opcode= p, if ((*cs =3D=3D 'z' && (insn & 0x20)) || (opcodep->match =3D=3D BDAP_QUICK_OPCODE && (nbytes <=3D 2 || buffer[1 + nbytes] =3D=3D 0))) - tp =3D format_dec (number, tp, signedp); + tp =3D FORMAT_DEC (number, tp, signedp); else { unsigned int highbyte =3D (number >> 24) & 0xff; @@ -2241,7 +2247,7 @@ print_with_operands (const struct cris_opcode *opcode= p, with_reg_prefix); if (number >=3D 0) *tp++ =3D '+'; - tp =3D format_dec (number, tp, 1); + tp =3D FORMAT_DEC (number, tp, 1); =20 info->flags |=3D CRIS_DIS_FLAG_MEM_TARGET_IS_REG; info->target =3D (prefix_insn >> 12) & 15; @@ -2340,7 +2346,7 @@ print_with_operands (const struct cris_opcode *opcode= p, { if (number >=3D 0) *tp++ =3D '+'; - tp =3D format_dec (number, tp, 1); + tp =3D FORMAT_DEC (number, tp, 1); } } else @@ -2397,7 +2403,7 @@ print_with_operands (const struct cris_opcode *opcode= p, break; =20 case 'I': - tp =3D format_dec (insn & 63, tp, 0); + tp =3D FORMAT_DEC (insn & 63, tp, 0); break; =20 case 'b': @@ -2426,11 +2432,11 @@ print_with_operands (const struct cris_opcode *opco= dep, break; =20 case 'c': - tp =3D format_dec (insn & 31, tp, 0); + tp =3D FORMAT_DEC (insn & 31, tp, 0); break; =20 case 'C': - tp =3D format_dec (insn & 15, tp, 0); + tp =3D FORMAT_DEC (insn & 15, tp, 0); break; =20 case 'o': @@ -2463,7 +2469,7 @@ print_with_operands (const struct cris_opcode *opcode= p, if (number > 127) number =3D number - 256; =20 - tp =3D format_dec (number, tp, 1); + tp =3D FORMAT_DEC (number, tp, 1); *tp++ =3D ','; tp =3D format_reg (disdata, (insn >> 12) & 15, tp, with_reg_prefix); } @@ -2474,7 +2480,7 @@ print_with_operands (const struct cris_opcode *opcode= p, break; =20 case 'i': - tp =3D format_dec ((insn & 32) ? (insn & 31) | ~31L : insn & 31, tp,= 1); + tp =3D FORMAT_DEC ((insn & 32) ? (insn & 31) | ~31L : insn & 31, tp,= 1); break; =20 case 'P': --=20 2.43.0 From nobody Wed Nov 27 02:33:52 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=1700839528; cv=none; d=zohomail.com; s=zohoarc; b=IA4YoiHRNEjdxs4Hd+bdrXtYUNZ2GmPXr9sYnEkc+84q8yqmmJG8w5bYciUIFCylOOn4qr8wiXPu6Xzq1eVIDTsvLt6i15lYpum/PvVfe9C83Iz5wcPPssimxTyiuMFqQfUz5djOHfAFopmCDENWRho5AIYOhSfl3rD/SMzy1nA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700839528; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YmHH4Lq7wXhVn5H+D0xjFuHkteZqE8fy6RhYHDV9pGE=; b=nUgSxjZcAiGNwzUMEXe9aueTQJeb4pU9+ynJaH/X+B5XUXMko82CLBFznhkIhslWtgl2W2+UzndUPeJUxmoLBya1cXcn+WrTe5gkKDz33oEZ5BlGz6a5FtBBmsx3TyC1+u6BRrEZ+XTnKRR6uf5QlOz2QM5UWb4vnqCMegs8oHk= 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 1700839528693220.93338173613267; Fri, 24 Nov 2023 07:25:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2m-0004iS-3I; Fri, 24 Nov 2023 10:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2k-0004ht-C6 for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:34 -0500 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 1r6Y2j-0004BZ-0U for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:34 -0500 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-tCqq2nQpOOibu2h8-ChDOQ-1; Fri, 24 Nov 2023 10:24:31 -0500 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-77d6854a3f9so217927385a.3 for ; Fri, 24 Nov 2023 07:24:31 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id z17-20020a05620a261100b0077d85b1d45dsm159875qko.72.2023.11.24.07.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839472; 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=YmHH4Lq7wXhVn5H+D0xjFuHkteZqE8fy6RhYHDV9pGE=; b=HdWafBQFZCj7/0pvN+VXxylIsVf8mpf+ZvkzvvE9D6EP1xvXhYIycUQuW9zcnFkAORXSW5 98ybxhtUsxXUyDdFb8aXkFmHYs2PYA0CygeIcCArX+dAE/Ez/KOrOxT16mv880UZw7Cmcv FKx+9KkZpTC5qafI/ngjxjnnd05ltWY= X-MC-Unique: tCqq2nQpOOibu2h8-ChDOQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839470; x=1701444270; 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=YmHH4Lq7wXhVn5H+D0xjFuHkteZqE8fy6RhYHDV9pGE=; b=fm8udLjHXE6g/360ba7OXmyo0G3K/6mrrvuSG9yI7v1WvKu2U4FKTdjIEoB6lrgJgu U/HkWLnXenJmV7nnQ+TqlRw+Or8vtXGZ6QMBpNvEHYBs3gNFqjDBMvu79NgGcIAbQydp VoKLnJcLuV8izU0nmGy3olFtEzICNUCZKcFNQZI+FAPLO5VTz7VUXfhmUoNL5N/Wvrh5 Z/EWOulHj5MzmTzjrF2nLTm8pxkR0qvZ/TpTbaCHHwDO5fRB7kfXo/HcJ3ZId661y1bS GnaQSD8Sl8GrD0+Zno32PWqsV5HIj4fIfyUXXYZI0DmD/JAD+lKEYJ/iI9WliS0bf5ex 1bEg== X-Gm-Message-State: AOJu0YyDHXpkPQYNPNVMirknGVdEkoOMZqNCwJ6KXMyEs9eVpTxRNAcF Vz0zGJ8W6Nu/O+7EubUDt6gG2iTkZ5EgDxk2lePr6UXzcOeTsZ4hhQltow3+0Lj37c5qYqIWF/0 67IINXsjW0UBzud4pdFHy8E18dD/sFCCj8l//zX6lixlHd70xIj03dCaxdDIiJZoL4PaDUMFnst w= X-Received: by 2002:a05:620a:839b:b0:77d:7610:7962 with SMTP id pb27-20020a05620a839b00b0077d76107962mr3735099qkn.41.1700839470163; Fri, 24 Nov 2023 07:24:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IFdIOLE2u6j0QKFuPAc45J0FZQ0HHii+ZnOJeI1KbyiRpjFWVaTiVazIyDO+nEkefr6mJ6KcQ== X-Received: by 2002:a05:620a:839b:b0:77d:7610:7962 with SMTP id pb27-20020a05620a839b00b0077d76107962mr3735063qkn.41.1700839469828; Fri, 24 Nov 2023 07:24:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , David Hildenbrand Subject: [PULL 08/10] system: Use &error_abort in memory_region_init_ram_[device_]ptr() Date: Fri, 24 Nov 2023 16:24:06 +0100 Message-ID: <20231124152408.140936-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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_H4=0.001, RCVD_IN_MSPIKE_WL=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: 1700839529829100001 From: Philippe Mathieu-Daud=C3=A9 If an unexpected error condition happens, we have to abort (&fatal_error is meant for expected errors). Suggested-by: Paolo Bonzini Suggested-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Markus Armbruster Message-ID: <20231120133112.82447-1-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- system/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/memory.c b/system/memory.c index 304fa843ea1..4d9cb0a7fff 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1692,7 +1692,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, =20 /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ assert(ptr !=3D NULL); - mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); + mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); } =20 void memory_region_init_ram_device_ptr(MemoryRegion *mr, @@ -1711,7 +1711,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *= mr, =20 /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ assert(ptr !=3D NULL); - mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); + mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); } =20 void memory_region_init_alias(MemoryRegion *mr, --=20 2.43.0 From nobody Wed Nov 27 02:33:52 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=1700839578; cv=none; d=zohomail.com; s=zohoarc; b=N+fDIGf/zwbq9rgbqEeNKPyKKlyCthr+Vx4Ortn+VLdk4BghRwzjUKkx0JcuCz30JFfOTHg6aAtdnSFafVz2a27Rz+LHFBgAFPLxuUcKGtwEpxrI7xMTyWyFPlfvdFlIJqjSEQcnXSXYpvYyubEReBVjpDTQnljKS70QUhHmvts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700839578; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dzYmqGK1sc5KNjAki6O7HKkHFVFkLf7FyAN6a9MLixs=; b=k0bN8/PheaCOJfKw8T77/GigBY496PQ9ixUisNpJpKuEWG0bmN4Mb+77piO5NbhnexJkm6M/yScAXn5rR9hKq0XliT46neLQUIR0gqANcT/no28iy/jJ1T9PtEGGa12txsQB+HCxqhArugiCWwAQhmT64eY8ZN74aymWf80yrLc= 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 1700839578372208.56104875528968; Fri, 24 Nov 2023 07:26:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2o-0004jC-HR; Fri, 24 Nov 2023 10:24:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2n-0004ig-6M for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:37 -0500 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 1r6Y2l-0004Bt-Pb for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:36 -0500 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-374-4262gkXENHSeFh-TH8vEmQ-1; Fri, 24 Nov 2023 10:24:34 -0500 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-4239f75a585so2486861cf.2 for ; Fri, 24 Nov 2023 07:24:33 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id f17-20020ac84651000000b004179e79069asm1329663qto.21.2023.11.24.07.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839475; 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=dzYmqGK1sc5KNjAki6O7HKkHFVFkLf7FyAN6a9MLixs=; b=E+oOweEExeBQqIsQAT5aj2+8CpkBd19B5W47HYM3wmxbdJXTc+az0K+nYpCfUgZ/7Q1ZBX /klY+XJkwNyRhExGLfunFlOFq3zzbaU4nt6RVHkwRQCS8VSCLrBiG/DsJ3anxP5hwKu/nU PIKGOW1k+NKruzFBS4XTu0kqCwSWG0c= X-MC-Unique: 4262gkXENHSeFh-TH8vEmQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839473; x=1701444273; 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=dzYmqGK1sc5KNjAki6O7HKkHFVFkLf7FyAN6a9MLixs=; b=kxC74YaQLSO5AGxFsCD3n7V3KJUz/lnQ2vlSXAhNbQcddnyRGTnpKvEw4xaVN6TMdr s8L1XkgT3AQPOpvsmO1ro2VJIZuvkzYfAmNeYMqD73KlA5cViruny8iF4Aw6Jq751BVd R4A+4bmZX9LWWJXltjTSgE0/1aKn2dOuHmSiCefdSVP1545Vs6rBrzn5UlUk7wxQNTaK 1KXf8UWUfPGMOCtwCqbK1O2yqdIquTd7RZdnRuwz6hL+M5jdzfD3o9B9HLFc4oFN9gUs /0ZPt5rQfxOIaDb2JFvb2umf8KGCGlTzA0D/cygovm4QGiaTBXhHisxo2VcYDDkZHsPx PD1Q== X-Gm-Message-State: AOJu0YyXaZAt4nai1m0Au9VTT47jzIi/oQdAjY1GFQNcUpH1Yjy3wDlh 3AFA8IArvrRg4B+tjvtI34SoBCIxOM0laetvtATC3DZtMAI8mIiQrWJbJdvYfE91I0vos1WJzlm ecJpHxn0GhEifNxSSxo/nmdc6DnvCYsUDzDvxo1tw6LRwyx8ewIUOFN7VHNVBKrwkBM91glFRjw o= X-Received: by 2002:ac8:7c4e:0:b0:41e:20e8:a279 with SMTP id o14-20020ac87c4e000000b0041e20e8a279mr4133051qtv.43.1700839473060; Fri, 24 Nov 2023 07:24:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IEUzFcLvxnAdxTV+qjsJzureiJZi9m4cX+dUK6I2jJQDrpmwG4qr+VgkPAqgQh3SIgeOHe9MQ== X-Received: by 2002:ac8:7c4e:0:b0:41e:20e8:a279 with SMTP id o14-20020ac87c4e000000b0041e20e8a279mr4133012qtv.43.1700839472681; Fri, 24 Nov 2023 07:24:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Akihiko Odaki Subject: [PULL 09/10] configure: Make only once with pseudo-"in source tree" builds Date: Fri, 24 Nov 2023 16:24:07 +0100 Message-ID: <20231124152408.140936-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1700839579932100001 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki Pseudo-"in source tree" build used to run make in the build directory as many times as goals. Worse, although .NOTPARALLEL is specified, it does not work for patterns, and run make in parallel, which can break things. Add a new rule "build", and let it call make. The pattern rule only needs to specify "build" as its prerequisite and have a no-op recipe so that it does more than canceling built-in implicit rules. Fixes: dedad02720 ("configure: add support for pseudo-"in source tree" buil= ds") Signed-off-by: Akihiko Odaki Message-ID: <20231119101604.47325-1-akihiko.odaki@daynix.com> Signed-off-by: Paolo Bonzini --- configure | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 959b1a20c1c..bdda912f362 100755 --- a/configure +++ b/configure @@ -41,12 +41,7 @@ then # This file is auto-generated by configure to support in-source tree # 'make' command invocation =20 -ifeq ($(MAKECMDGOALS),) -recurse: all -endif - -.NOTPARALLEL: % -%: force +build: @echo 'changing dir to build for $(MAKE) "$(MAKECMDGOALS)"...' @$(MAKE) -C build -f Makefile $(MAKECMDGOALS) @if test "$(MAKECMDGOALS)" =3D "distclean" && \ @@ -54,8 +49,9 @@ endif then \ rm -rf build GNUmakefile ; \ fi -force: ; -.PHONY: force +%: build + @ +.PHONY: build GNUmakefile: ; =20 EOF --=20 2.43.0 From nobody Wed Nov 27 02:33:52 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=1700839543; cv=none; d=zohomail.com; s=zohoarc; b=jugrKNEQ6k8yZFMWcVacpKUlz5Jffwl1IZqM2fvRRIOCIOad+pvRqSeFcCFgE/wQRsXwr6v4U5qNKzRpDopDNxuwKnCeD4Wbll7q/j6mcxztoPEaQmT3y83JmOm4YsxMeApA6Ofeb3QTwN/aWT87RYx5d6QcyyTklue2YmF0n5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700839543; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ME9ySWmWeETsR1wf95+J1f76rZI7JX9IiNVE3B8e7TQ=; b=Myrmyk7+yIfdtph5FibfFCm0N0T9YkdKLtYpxp/Nfl3mZJKA8LCKAxomaGr/9dC22bulemtNxLRs5Kt4d2x3o+wuDo6IPgIy4DI+WYwHkuomVMwYZxiugEWCLbskurhHwFdVtIwcyQS5MbvLuuSQ32slOfkx+nfuM2xQTHOSpIU= 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 1700839543203860.1107689408507; Fri, 24 Nov 2023 07:25:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2q-0004jd-NJ; Fri, 24 Nov 2023 10:24:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2p-0004jG-HW for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:39 -0500 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 1r6Y2n-0004CA-V1 for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:39 -0500 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-561-rm07_lR6Nv-pt_GT_ktqTg-1; Fri, 24 Nov 2023 10:24:36 -0500 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-41b83b8dbe1so20727711cf.1 for ; Fri, 24 Nov 2023 07:24:36 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id q9-20020a0ce209000000b0064f43efc844sm1478815qvl.32.2023.11.24.07.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839477; 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=ME9ySWmWeETsR1wf95+J1f76rZI7JX9IiNVE3B8e7TQ=; b=N75C6V/rooT5P+V8zVNaLaf+pod21ll175LQxX0Zb4Da/W+ID+pRa+ktC2gkV9CqX352ly aAnVlOMvP+uiIM5KDS3A0yPn4CW0MrGzDjOGLl590yuPWWJsFTIb6e51QmmMgD7CTbRue5 Ueb//Dc5PFFrqAQUitTu2726QP8w57w= X-MC-Unique: rm07_lR6Nv-pt_GT_ktqTg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839475; x=1701444275; 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=ME9ySWmWeETsR1wf95+J1f76rZI7JX9IiNVE3B8e7TQ=; b=PSDuJtyEv0lUbvNfYlvl3nGNi5vSgVMIaKTwVIBPrv4AE/h9Jo+rE+OIc4ivtswQTW 4NX0EdoJLj7UX87YT3hAevf1Kot5BUn2zfatGlsfAQWCXkK2s9YY/R0O5gcZsIXzxOgI /Huq4RIqUB936KBKnS2tt1gNwGg8lMTTnhIOmtm/YwlsDsD+R0Fg3bnO94iPUSTTlGpC Rk5QFslCfjktRk8B7yy2O27C9lQntAKFYoqexFU4rqNDd9UIEWDC8bl6bRe4y4HG+w5j lXrtUa6hKbgefndCnRvhveHg6DCGWjKg6w6vmwaMaYoHwnhD9rcOHovwjqY/BtJ2QDpx ev7Q== X-Gm-Message-State: AOJu0YyXfU8CbyawmD6gFqfGZ/7R+5Aab8v/I0UTy3MjG2h2qvE2WaP2 al6ecvs/q1kwN6HX8I26JxM60YwvqzX/Z2AczIIe6pcyJiYVkBgmjNNBm3sCTNjU9gesYoCa/Zj KP/8HcxbEQAawXec7ugYl0MJGHtoXkmab2tVG92yr+19RNIaZeKMSDipRM435mq8F3dUqsAq7hT 4= X-Received: by 2002:a0c:fc10:0:b0:672:5946:ffe7 with SMTP id z16-20020a0cfc10000000b006725946ffe7mr2875220qvo.30.1700839474944; Fri, 24 Nov 2023 07:24:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IHhJR0snMUohtRLVLAmFLrGEpyjXgJvKTCY7Q31mW5yynOSibNR8PK2z3tnDHMOa3VhwDhRwg== X-Received: by 2002:a0c:fc10:0:b0:672:5946:ffe7 with SMTP id z16-20020a0cfc10000000b006725946ffe7mr2875172qvo.30.1700839474587; Fri, 24 Nov 2023 07:24:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 10/10] scripts: adjust url to Coverity tools Date: Fri, 24 Nov 2023 16:24:08 +0100 Message-ID: <20231124152408.140936-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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_H4=0.001, RCVD_IN_MSPIKE_WL=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: 1700839543899100001 Content-Type: text/plain; charset="utf-8" The URL to the Coverity tools download has changed; the old one points to an obsolete version that is not supported anymore. Adjust to point to the correct and supported tools. Suggested-by: Peter Maydell Signed-off-by: Paolo Bonzini --- scripts/coverity-scan/run-coverity-scan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/coverity-scan/run-coverity-scan b/scripts/coverity-sca= n/run-coverity-scan index 129672c86fa..d56c9b66776 100755 --- a/scripts/coverity-scan/run-coverity-scan +++ b/scripts/coverity-scan/run-coverity-scan @@ -116,14 +116,14 @@ update_coverity_tools () { cd "$COVERITY_TOOL_BASE" =20 echo "Checking for new version of coverity build tools..." - wget https://scan.coverity.com/download/linux64 --post-data "token=3D$= COVERITY_TOKEN&project=3D$PROJNAME&md5=3D1" -O coverity_tool.md5.new + wget https://scan.coverity.com/download/cxx/linux64 --post-data "token= =3D$COVERITY_TOKEN&project=3D$PROJNAME&md5=3D1" -O coverity_tool.md5.new =20 if ! cmp -s coverity_tool.md5 coverity_tool.md5.new; then # out of date md5 or no md5: download new build tool # blow away the old build tool echo "Downloading coverity build tools..." rm -rf coverity_tool coverity_tool.tgz - wget https://scan.coverity.com/download/linux64 --post-data "token= =3D$COVERITY_TOKEN&project=3D$PROJNAME" -O coverity_tool.tgz + wget https://scan.coverity.com/download/cxx/linux64 --post-data "t= oken=3D$COVERITY_TOKEN&project=3D$PROJNAME" -O coverity_tool.tgz if ! (cat coverity_tool.md5.new; echo " coverity_tool.tgz") | md5= sum -c --status; then echo "Downloaded tarball didn't match md5sum!" exit 1 --=20 2.43.0