From patchwork Sat Nov 11 15:29:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1862709 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=cMzYtirS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SSKQD3RsXz1yRV for ; Sun, 12 Nov 2023 02:30:28 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1pvT-0003l6-Tl; Sat, 11 Nov 2023 10:29:35 -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 1r1pvR-0003kS-W3 for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29: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 1r1pvQ-0008Hb-5w for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699716570; 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=pHkeGUPmavsIi7HKiUulQNhockj+WbBWmmVCMYWLGg8=; b=cMzYtirSDTY5LiqeeFJEUtcrOAmltrOVzFfg3iV6BjBZJGZ/SEvJ5f7KPBNc8yZ6UECX1L 02mGPVdRfKbLGo3nIT0tTtibp6u6QxNsf+Bec5NA6HV3ipP3hbc3iV8UrEZXFvyU3Cpfbz tFSYtXaqGsCPR1Gyvhqk77gVjudLYQ8= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-15-wVvBcGTJOzG80-VLYD6OEg-1; Sat, 11 Nov 2023 10:29:29 -0500 X-MC-Unique: wVvBcGTJOzG80-VLYD6OEg-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9dd489c98e7so218414066b.2 for ; Sat, 11 Nov 2023 07:29:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699716567; x=1700321367; 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=pHkeGUPmavsIi7HKiUulQNhockj+WbBWmmVCMYWLGg8=; b=Zo9rjKwftMjX9cahL5z+YpVtvzzA4Cp0+D0BxEw0KwCj3gMYKkbev+FjPZQ9udcmVz zdOxdh3AcPXSPcqlyyxbNSe3UTCHgKh9VJeOgwDco3pGOgr0gC1oa7iVAqYfMS4qfz9P JLqRG6PGAPcLOZ4eznX1wFPmeAjK+89ORwoDRavjnclLNpMV+w2TAiaSUtgdfLsZSwml jHRMpslXoSg+RRc6QJi6a3vela7H9iH77KseVWbXd6qKJ7tRjKXEuVwi+tfdgjhd3Ou2 65Ixn3koEpriURoC3JnJUETA7ATBYrZmzAEYtCmEr0Rh38s29HrS/YQ1G6pHWQaU5y4T 42yw== X-Gm-Message-State: AOJu0YxOWiqQySmcysIMZsxcHjVJC2Q4DPvFoby8odGmczTiK2m09iZ9 3ViXXfiWeCvfKCGqLQaYtSepo76osQbPz3gXCtMAazJaOVm6ksjGxPDx7sLmVlnjDWiS+NhQUxo iBgHOzwMu5VvttpN80SWKex7qqQPtjjbzXjhc5dxDmvMXf5S1vGezYwdIXj5FkpmcyHN9yQwRT0 Y= X-Received: by 2002:a17:906:710c:b0:9dd:7536:2b0 with SMTP id x12-20020a170906710c00b009dd753602b0mr1340279ejj.50.1699716567118; Sat, 11 Nov 2023 07:29:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IGKhOKfOI43dIQuhy+6jOvYwwFJAaqpxlGBLym0nhferCC+fKhYGyt5f2ooFsmFWfShnnyR4g== X-Received: by 2002:a17:906:710c:b0:9dd:7536:2b0 with SMTP id x12-20020a170906710c00b009dd753602b0mr1340267ejj.50.1699716566614; Sat, 11 Nov 2023 07:29:26 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id ay18-20020a170906d29200b009ce03057c48sm1210463ejb.214.2023.11.11.07.29.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:29:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Vladimir Sementsov-Ogievskiy , David Hildenbrand Subject: [PULL 1/6] coverity: physmem: use simple assertions instead of modelling Date: Sat, 11 Nov 2023 16:29:18 +0100 Message-ID: <20231111152923.966998-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com> References: <20231111152923.966998-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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=8 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; typedef struct va_list_str *va_list; -/* 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 == 0) return; - buf[0] = first; - buf[len-1] = last; - __coverity_writeall__(buf); -} - -static void __bufread(uint8_t *buf, ssize_t len) -{ - __coverity_negative_sink__(len); - if (len == 0) return; - int first = buf[0]; - int last = buf[len-1]; -} - -MemTxResult address_space_read_cached(MemoryRegionCache *cache, 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_cached(MemoryRegionCache *cache, hwaddr addr, - 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 */ 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 = 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 OVERRUN + * the buffer by following ldn_he_p(). + */ +#ifdef QEMU_STATIC_ANALYSIS + assert((l == 1 && len >= 1) || + (l == 2 && len >= 2) || + (l == 4 && len >= 4) || + (l == 8 && len >= 8)); +#endif val = ldn_he_p(buf, l); result |= memory_region_dispatch_write(mr, addr1, val, size_memop(l), attrs); @@ -2769,6 +2780,17 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, l = memory_access_size(mr, l, addr1); result |= memory_region_dispatch_read(mr, addr1, &val, size_memop(l), attrs); + + /* + * Assure Coverity (and ourselves) that we are not going to OVERRUN + * the buffer by following stn_he_p(). + */ +#ifdef QEMU_STATIC_ANALYSIS + assert((l == 1 && len >= 1) || + (l == 2 && len >= 2) || + (l == 4 && len >= 4) || + (l == 8 && len >= 8)); +#endif stn_he_p(buf, l, val); } else { /* RAM case */ From patchwork Sat Nov 11 15:29:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1862710 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gED4Bumb; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SSKQG6f0Cz1yRV for ; Sun, 12 Nov 2023 02:30:30 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1pvX-0003ms-Fh; Sat, 11 Nov 2023 10:29:39 -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 1r1pvV-0003l9-HJ for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:37 -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 1r1pvU-0008IB-0t for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699716573; 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=tBCjXd6MN5whkUidc8Z8YGzlyTzID2NTEQolnZ2fGZ4=; b=gED4BumbZ4I/pv9h52FRvTxHYudlK57dno1Rp0pj2th4/wgl5D5azynNfoAqcF3V33TlDe ddCAdNlJm2IQQedMxiK3ae/YgfC3HPbwt49vjrBVDFxgWLdFfhZUn3/P2+mOz+jECpHv3O c1w3YoM8d2LJ2qxLJ71x/zKHa4jPysQ= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-653-Nqx8luIwP02KgrEN1zrmAg-1; Sat, 11 Nov 2023 10:29:31 -0500 X-MC-Unique: Nqx8luIwP02KgrEN1zrmAg-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9dfbccc2a8cso226421366b.1 for ; Sat, 11 Nov 2023 07:29:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699716570; x=1700321370; 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=tBCjXd6MN5whkUidc8Z8YGzlyTzID2NTEQolnZ2fGZ4=; b=AhyjpfK5llSl3aZmmAkLsXEefNzQAjHYY//p7mlkeVarJi0PN9eFR5JsJEsLLw+Isg Bv9c6V1kzSottNUtP4G4UarKnM0aB+H/vS6brBcFTvnwpgyaFHSHJe8e/JTexC8MAy8S RheCKfKFnIckRWHHwip4bFVUctL+7R1Py86G3DpRuHrjM1bLksaNOwMufwF3DQEFsjUG wo5CsSMNs+oTRwwzPOx77Oo5Sz8xZo3hJ2zOg0Vune5GH6bQ0Os9qWY8oVqmtdu7+NV/ chIwCxlxAiHO3cVi8z2VY6TJ0PfZyUZEHv4q04PUxPuWf4XN8YOZ8JMiv7pIolBUYB0b C8OA== X-Gm-Message-State: AOJu0Yxqfl2o6sU7AAIjQLIauxVWCh679BIQZqJ2P6omrdfWYPSWl1Bz QHUB8W82DmFFnSP3U9cKTJZ1dhLrFJFg/Fp5lH+oJQoLS7hsEYyOzKXCo2boenOnHpYnv8cJnpn SGCz8Y9OldzlXwuQWrQVDW/4fmyPzJOUQNVTEfIJzKddOxilEvoMLI7G4Un3piz6riOSwtbXQ6I U= X-Received: by 2002:a17:906:c30a:b0:9e6:568:7374 with SMTP id s10-20020a170906c30a00b009e605687374mr1391442ejz.1.1699716570430; Sat, 11 Nov 2023 07:29:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNkgusr97VU1Tn6QKo4BAt/YlPl7EScJokLjIgrJJjPvtCeV+mQCYnYlzdvCBtxl9tJkYt5w== X-Received: by 2002:a17:906:c30a:b0:9e6:568:7374 with SMTP id s10-20020a170906c30a00b009e605687374mr1391433ejz.1.1699716570044; Sat, 11 Nov 2023 07:29:30 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id v24-20020a170906489800b009b2ba067b37sm1181501ejq.202.2023.11.11.07.29.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:29:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/6] tests: respect --enable/--disable-download for Avocado Date: Sat, 11 Nov 2023 16:29:19 +0100 Message-ID: <20231111152923.966998-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com> References: <20231111152923.966998-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 abcb199aa87..2da3c278db6 100755 --- a/configure +++ b/configure @@ -968,14 +968,14 @@ meson="$(cd pyvenv/bin; pwd)/meson" # Conditionally ensure Sphinx is installed. -mkvenv_flags="" -if test "$download" = "enabled" -a "$docs" = "enabled" ; then - mkvenv_flags="--online" +mkvenv_online_flag="" +if test "$download" = "enabled" ; then + mkvenv_online_flag=" --online" fi if test "$docs" != "disabled" ; then if ! $mkvenv ensuregroup \ - $mkvenv_flags \ + $(test "$docs" = "enabled" && echo "$mkvenv_online_flag") \ ${source_path}/pythondeps.toml docs; then if test "$docs" = "enabled" ; then @@ -1631,6 +1631,7 @@ if test "$container" != no; then fi echo "SUBDIRS=$subdirs" >> $config_host_mak echo "PYTHON=$python" >> $config_host_mak +echo "MKVENV_ENSUREGROUP=$mkvenv ensuregroup $mkvenv_online_flag" >> $config_host_mak echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "MESON=$meson" >> $config_host_mak echo "NINJA=$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 = $(quiet-@)$(call quiet-command-run, \ $(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 $@) $(TESTS_RESULTS_DIR): From patchwork Sat Nov 11 15:29:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1862714 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZlGjDEjg; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SSKQn2JDZz1yRV for ; Sun, 12 Nov 2023 02:30:57 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1pvZ-0003og-1H; Sat, 11 Nov 2023 10:29:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1pvY-0003nm-0b for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:40 -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 1r1pvW-0008IM-1g for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699716576; 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=s78/VPPynP7lIUS0i/tpFzeRlgCgx/plWuOQnPmw7pM=; b=ZlGjDEjg0GGvbLjVSMFL+TatCMgJ1nRKLcN+qPY89UrRhbBe9EzelX4zUiAVWxU3gSl6Us FUP63c6qcWiDGoPN7kGoI1YF2/mixuQwSgBJ86Oef6IYD6/GqidGz/pGsWoskaLAWEnpu6 RJAPYc4fTnB4DPZWDpYO/yow9QMglTM= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-153-U4CeP_78NwKbyqytjzKEtQ-1; Sat, 11 Nov 2023 10:29:34 -0500 X-MC-Unique: U4CeP_78NwKbyqytjzKEtQ-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9e61e969b19so115130166b.2 for ; Sat, 11 Nov 2023 07:29:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699716573; x=1700321373; 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=s78/VPPynP7lIUS0i/tpFzeRlgCgx/plWuOQnPmw7pM=; b=SrZFvUdYf+8L8cB8uaA8QakkJeLgK59HBIMNTKAYB2U4LYli+G3rb7NEURChXmawxE HbhlPHBAAnqInsE9KsMUcDZ8siy4YvjualR0Hgt3NLj6S9BysPZHX5QGBWOiR8wnW0vQ tmsKAg/OH9tYrweq4D48/tuWo5ah5wP1zIo3h0fcJUgjVBUDxL51AHefbTvtP/r51Jc7 dSTAPKW3NLFg+q4emwWg/GQhXBU4tO0FxWsgy26WfNvASaols0qkvlFtz2szyYGNYR7/ 1GYbh/Mei2/o67aVzRQHCKNxqGBocIwxbDpNkQsAnMeU9AgL38ur3JYaiu3Wjt00+vFK p/ig== X-Gm-Message-State: AOJu0Yw+syog/XoIMBQxi77k3iauIt6koITuNIobHmRvD79C8xJulQV5 q8TB43AqxnLvjoFSSGLRRTb2f1AC8bUERz3wW0qxs231gFue1NhOuGgE3UexfD/L+ywUNUzx7r3 Aauqa8mzDk7ZwWVVLTqpEDOmuW7ZtivUw8ACELeUaUHOkUUnXrV4+tuEc4mwIRD1gXAOGmwe+H0 8= X-Received: by 2002:a17:906:24d9:b0:9d3:ccf0:7617 with SMTP id f25-20020a17090624d900b009d3ccf07617mr1187758ejb.44.1699716572789; Sat, 11 Nov 2023 07:29:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IFgjLzetCqra8GvX+3/eL9OQhAvEyouiNWaWIZdy93ULNLR3bkUB59Ise5//DLHqs9sUHt/Tg== X-Received: by 2002:a17:906:24d9:b0:9d3:ccf0:7617 with SMTP id f25-20020a17090624d900b009d3ccf07617mr1187746ejb.44.1699716572352; Sat, 11 Nov 2023 07:29:32 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id o10-20020a1709062e8a00b009e676a5b158sm1194895eji.83.2023.11.11.07.29.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:29:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 3/6] docs: document what configure does with virtual environments Date: Sat, 11 Nov 2023 16:29:20 +0100 Message-ID: <20231111152923.966998-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com> References: <20231111152923.966998-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. As a curiosity, a first and partial draft of the text was generated by an LLM[1]. It required quite a bit of editing and probably did not save much time, but some expressions do remain in the finished text. [1] https://chat.openai.com/share/42c1500d-71c1-480b-bab9-7ccc2c155365 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 helper functions: indicated by $TMPC. -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 the + 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 issue, + 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. -TBD Stage 2: Meson ============== @@ -376,6 +444,15 @@ This is needed to obey the --python= option passed to the configure script, which may point to something other than the first python3 binary on the path. +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 = find_program( + fs.parent(python.full_path()) / 'sphinx-build', + required: get_option('docs')) + Stage 3: Make ============= @@ -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. +``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 From patchwork Sat Nov 11 15:29:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1862711 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JkY35ev2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SSKQM5w3bz1yRV for ; Sun, 12 Nov 2023 02:30:35 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1pva-0003tB-PO; Sat, 11 Nov 2023 10:29:42 -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 1r1pvZ-0003p4-Ca for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:41 -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 1r1pvW-0008Ju-Ez for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699716578; 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=qmUReIKnCgHwKeQ8mgDCHmJ5OYZe6yUipuBRHMuoC1E=; b=JkY35ev2ageL2WzANa6dOoZ9p8dJKMlBNjntFugAsZZyGu1YvMex7Ww+BYWM+uJYa12vuV EFGYuYIuR66ePcc9SFDZHrcfHtTqimB8Iqg8jK2DCZdXI8zRmpqK6kV1BAvtQy60SKs3pt T88Y6wdhNKDMTpzZjXPCtvgfVbxLNPU= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-646-STAzA1yXMlGnw_cpC5_zOA-1; Sat, 11 Nov 2023 10:29:36 -0500 X-MC-Unique: STAzA1yXMlGnw_cpC5_zOA-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9e61e969b19so115130766b.2 for ; Sat, 11 Nov 2023 07:29:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699716574; x=1700321374; 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=qmUReIKnCgHwKeQ8mgDCHmJ5OYZe6yUipuBRHMuoC1E=; b=mWUso/krv32f0ZvU83lU6eOygKtif8sSU79FKbd0zkxbwzgj9GOvN4OJdOGT2QtE+X iENehxqHYje/nO/WX33k2fhsVLv5iWJb+PZxEVN79YicQD0U5qzZZY5ClJvqJ602BqxA +RYzKrgmTw8wGU2Nn8yvj1gfVIRwINgMAIWahLAQd3DmnmKOX+SvQWouFt8xeFM5i+2j xjCGdsurIe4VKDkZAFbw3AQzGa46fR+kR2TfpzsN74jzA3C0g2qcHCbzIYwx6e7XhDIW 8OQrfuiuCm3K6a0nkYd+kBMxfwTGNFEd1ZSDPDfH4bRLq47cEyhmVIKzvedn+x+83Ux4 cv7w== X-Gm-Message-State: AOJu0YzDTmy/8ByOleQGONTDJSUZwl53IsJtWbZxauHUjBoJh4GfllST 3+syvzZiB0Gh9ZebPWbxPHD40/Nz4dE49qjT0aOh/J4shd4GP7P8pSrgF76J2/2Ho4P7x+QnVzb WtJOnTiKHqtxeCN1zZQ4PReZHMJPaDyXhWGVXshlHSXZ/1cJauHdwneRUzWXtv/3DM3g2w5LhV0 E= X-Received: by 2002:a05:6402:6c3:b0:543:4fdb:de84 with SMTP id n3-20020a05640206c300b005434fdbde84mr1755354edy.7.1699716574704; Sat, 11 Nov 2023 07:29:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IHhy75PzPkJDXpy/Mc6F/Q1W/ZMAvXal+kYUnP9W3QuHWYW08AokXIgtww6cwnmaW7CO0tcPg== X-Received: by 2002:a05:6402:6c3:b0:543:4fdb:de84 with SMTP id n3-20020a05640206c300b005434fdbde84mr1755344edy.7.1699716574430; Sat, 11 Nov 2023 07:29:34 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id p19-20020aa7d313000000b0053deb97e8e6sm1095621edq.28.2023.11.11.07.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:29:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 4/6] buildsys: Bump known good meson version to v1.2.3 Date: Sat, 11 Nov 2023 16:29:21 +0100 Message-ID: <20231111152923.966998-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com> References: <20231111152923.966998-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Philippe Mathieu-Daudé 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é 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() packages = { - "meson==0.63.3": - "d677b809c4895dcbaac9bf6c43703fcb3609a4b24c6057c78f828590049cf43a", + "meson==1.2.3": + "4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1", "tomli==2.0.1": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", diff --git a/python/wheels/meson-0.63.3-py3-none-any.whl b/python/wheels/meson-0.63.3-py3-none-any.whl deleted file mode 100644 index 8a191e3a200eba6783297676729ec85ceb96f89d..0000000000000000000000000000000000000000 Binary files a/python/wheels/meson-0.63.3-py3-none-any.whl and /dev/null differ diff --git a/python/wheels/meson-1.2.3-py3-none-any.whl b/python/wheels/meson-1.2.3-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..a8b84e5f114ad3fbec8ae56008426a90bccfc168 GIT binary patch Binary files /dev/null and b/python/wheels/meson-1.2.3-py3-none-any.whl differ diff --git a/pythondeps.toml b/pythondeps.toml index 4beadfd96f5..0e884159993 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -19,7 +19,7 @@ [meson] # The install key should match the version in python/wheels/ -meson = { accepted = ">=0.63.0", installed = "0.63.3", canary = "meson" } +meson = { accepted = ">=0.63.0", installed = "1.2.3", canary = "meson" } [docs] sphinx = { accepted = ">=1.6", installed = "5.3.0", canary = "sphinx-build" } From patchwork Sat Nov 11 15:29:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1862713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HpV9XTRM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SSKQj3txLz1yRV for ; Sun, 12 Nov 2023 02:30:53 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1pvc-0003yJ-E5; Sat, 11 Nov 2023 10:29:44 -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 1r1pva-0003u3-VH for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:42 -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 1r1pvZ-0008K8-29 for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699716580; 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=Hl4FPp2TiWf73lYkGpagrM0g80ds/eBjfxzWE9bvrYM=; b=HpV9XTRMICeHtPm6QQLjK6NYOx3mM8Lojh8jmhXHWNN6rIUyNlLdGBbqYYz3ggXjggnghk 1f1jxccEoObgXg4MIcjJL/cRSwtX61M+3LJ3AMYv+2vgHeVEOLGFINFq2siyVllukm1r1D EtXk3jhoBZTO+6vZhlvfvIFNtBKMgA4= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-412-TXfbByv-Py6agoEX0wp_2w-1; Sat, 11 Nov 2023 10:29:38 -0500 X-MC-Unique: TXfbByv-Py6agoEX0wp_2w-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9dd489c98e7so218416866b.2 for ; Sat, 11 Nov 2023 07:29:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699716577; x=1700321377; 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=Hl4FPp2TiWf73lYkGpagrM0g80ds/eBjfxzWE9bvrYM=; b=aZi+aP3f+4TgWxbcSZO/bAHEUvg4IEU8ev4sF4vizAG0zmy6fCGxPefbxwItaoQvaz K2oYDgZwHE/RUl1s8eQZEP6i6l1eUl8S0519CloN8bXKxY6kqopgdR/6tOgmDpF9Lcre A7cOH6Rwq7s2U8xf7rWcqug6yDG5GvhJ9GKZzKgZGBr2sjQLJxPOfT8muIdF+eFCt8Qx mNh+po7jtG7902TVRCDovN6GDNQn5Cwb83NzouUlrVu9VPtpAAdDAoXf+2C7Cdw/6DxB 9rBcnU/2tXhJANjxIWAmEJjQkOQZIm20ZfjfWyJM8b4k6sC/njgtPc12VfyxVXcZqtku LoxQ== X-Gm-Message-State: AOJu0YyQhpBhEeG/gC2NhvOZwhLX90zymvJIGXr/bn6/dK7iVoQLspLz UyaRD/qgwrtvhTxYRU3D4SWw58wtbINjis8FwqTgt5tdOPg/BlK9CdtJ7THWjzrkkVQhhw+WSOI jEgXtBbxwKmjqdXwliRposfL/7OwyGN6ThpJiE5zC3FO4gWihZS1m1sENI23nC9s32aQOJjnl5M w= X-Received: by 2002:a17:906:140d:b0:9bf:2f84:5de7 with SMTP id p13-20020a170906140d00b009bf2f845de7mr1599696ejc.4.1699716576954; Sat, 11 Nov 2023 07:29:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IHULk/GgzAg73MXZUOEzUZdTC7mZFIt7x+PHlkS0+w4Wl0eB+FwgjYPxLO3juinijMxDvaAMw== X-Received: by 2002:a17:906:140d:b0:9bf:2f84:5de7 with SMTP id p13-20020a170906140d00b009bf2f845de7mr1599684ejc.4.1699716576701; Sat, 11 Nov 2023 07:29:36 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id lg7-20020a170906f88700b00977eec7b7e8sm1209901ejb.68.2023.11.11.07.29.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:29:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?D?= =?utf-8?q?aniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 5/6] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura) Date: Sat, 11 Nov 2023 16:29:22 +0100 Message-ID: <20231111152923.966998-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com> References: <20231111152923.966998-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Philippe Mathieu-Daudé macOS 14 "Sonoma" was released on September 2023 [1]. According to QEMU's support policy, we stop supporting the previous major release two years after the the new major release has been published. Replace the macOS 12 (Monterey) testing by macOS 13 (Ventura, released on October 2022, [2]). Refresh the generated files by running: $ make lcitool-refresh [1] https://www.apple.com/newsroom/2023/09/macos-sonoma-is-available-today/ [2] https://www.apple.com/newsroom/2022/10/macos-ventura-is-now-available/ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Message-ID: <20231108162022.76189-1-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/cirrus.yml | 6 +++--- .gitlab-ci.d/cirrus/{macos-12.vars => macos-13.vars} | 2 +- tests/lcitool/refresh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename .gitlab-ci.d/cirrus/{macos-12.vars => macos-13.vars} (95%) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index e7f1f83c2c4..07dc6edae1c 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -59,13 +59,13 @@ x64-freebsd-13-build: INSTALL_COMMAND: pkg install -y TEST_TARGETS: check -aarch64-macos-12-base-build: +aarch64-macos-13-base-build: extends: .cirrus_build_job variables: - NAME: macos-12 + NAME: macos-13 CIRRUS_VM_INSTANCE_TYPE: macos_instance CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest CIRRUS_VM_CPUS: 12 CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-13.vars similarity index 95% rename from .gitlab-ci.d/cirrus/macos-12.vars rename to .gitlab-ci.d/cirrus/macos-13.vars index 5f3fb346d1d..534f0299560 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-13.vars @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables macos-12 qemu +# $ lcitool variables macos-13 qemu # # https://gitlab.com/libvirt/libvirt-ci diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 92e7d30982e..2259f131b48 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -196,7 +196,7 @@ try: # Cirrus packages lists for GitLab # generate_cirrus("freebsd-13") - generate_cirrus("macos-12") + generate_cirrus("macos-13") # # VM packages lists From patchwork Sat Nov 11 15:29:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1862708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=e3sk4AAf; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SSKPp0Hprz1yR3 for ; Sun, 12 Nov 2023 02:30:06 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1pve-0003yf-39; Sat, 11 Nov 2023 10:29:46 -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 1r1pvd-0003yS-A9 for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:45 -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 1r1pvb-0008KO-I7 for qemu-devel@nongnu.org; Sat, 11 Nov 2023 10:29:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699716582; 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=Kh8hHoHBgX/fTehaZ1B5Sfw7yk3YdWsOqVB7Mq6gH8Q=; b=e3sk4AAf0elZQjLXOpTQWH+IEvaXjjnePH9mfUeXhMhQyIi04rlhEgp5avqIkK3yGGaRu3 WO6ZQwd48XKHViBkCEp5ovrW2cPHblHemI/QbQCMUSOp83kdUoGdNWeI0kUFbxLVnr0QTH 1SGG+dA7y/UIyqNNmEhxBeHhqwqBgI4= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-agDX8IXDM5KOylrViluFRA-1; Sat, 11 Nov 2023 10:29:41 -0500 X-MC-Unique: agDX8IXDM5KOylrViluFRA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9e293cd8269so227221266b.0 for ; Sat, 11 Nov 2023 07:29:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699716579; x=1700321379; 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=Kh8hHoHBgX/fTehaZ1B5Sfw7yk3YdWsOqVB7Mq6gH8Q=; b=fD3GLLQ4/N/iQRG8hfyMHKYNxLF6i6j7tYjhR54dhtCKn9SvmKbkXTtaN/dqei5ZWZ I4DArwfcmvDOmUZOGL5rraU2tcgM0kj7QIHFpXCaOIVyQvvCIKxIGIT8N/q/1w3xkIQT GHm8LkMImWsXlpa816nzTeoY4SeM+Hc3GgkPtjjArXNwDosa/Vtr6TKC9Z7sLkBzv5MF OYkoCUADKEVOu+UEFXLLfqPOI7ay2BzJY72Cz/xtfkCkT2hHDV6y8uWjJXy8Msl+H7uh 1Q5hUPBHzcVTWnlACA9jArAKECoprpsf6cmVosQh/+XnBFLNyyzoEj9iJ6ryf/j5uLm5 4doQ== X-Gm-Message-State: AOJu0YwkVRFAjvkU51tUyL5zSxzL5m8HtHKgBnqbLGrvDDQHFpQHSnv2 S6P0SB294uk64wH1v1Xri9iy4BH1pwdek41WwKylWLNMAZJezx84701DEVPqAtAj73sP3Yfh+q8 m5lfZAdPWNVd3IsC+8gRyJuc/DG9kfjhiAETuWuBn41YR69hbP4gltWW9E/rnGkCbcWSuH7YJ2T k= X-Received: by 2002:a17:906:4147:b0:9e6:59d5:71c4 with SMTP id l7-20020a170906414700b009e659d571c4mr1412389ejk.16.1699716579461; Sat, 11 Nov 2023 07:29:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IHXoW04a5P0QOH+7XRoRD1Z73Y5lCd0C+An3u5Z+DeJ2DQgd6IoyTVNjwuXcmmAH8oSOKAHFA== X-Received: by 2002:a17:906:4147:b0:9e6:59d5:71c4 with SMTP id l7-20020a170906414700b009e659d571c4mr1412378ejk.16.1699716579127; Sat, 11 Nov 2023 07:29:39 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id l22-20020a170906a41600b0099d798a6bb5sm1209620ejz.67.2023.11.11.07.29.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:29:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 6/6] .gitlab-ci.d/cirrus: Add manual testing of macOS 14 (Sonoma) Date: Sat, 11 Nov 2023 16:29:23 +0100 Message-ID: <20231111152923.966998-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231111152923.966998-1-pbonzini@redhat.com> References: <20231111152923.966998-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Philippe Mathieu-Daudé 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é 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/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 +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/ncurses/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 + # 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='/opt/homebrew/bin/ccache' +CPAN_PKGS='' +CROSS_PKGS='' +MAKE='/opt/homebrew/bin/gmake' +NINJA='/opt/homebrew/bin/ninja' +PACKAGING_COMMAND='brew' +PIP3='/opt/homebrew/bin/pip3' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' +PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' +PYTHON='/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 2259f131b48..e11d0ba381f 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -197,6 +197,7 @@ try: # generate_cirrus("freebsd-13") generate_cirrus("macos-13") + generate_cirrus("macos-14") # # VM packages lists