From nobody Wed Feb 11 06:07:44 2026 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=1685117412; cv=none; d=zohomail.com; s=zohoarc; b=evhMzD1h07qiB13cG3sfsfRxYdICyPusTIkU1pclOzMI9nk0SKyNq/YJCqWtdcdwpA1KlBEU+AWlvkwv2xHK5nxfN9+O86n9m9uKpKQnhErqSrEhwDehgIVljEvMp7x6fs4zeQzCOJElFdYBSxTLE5lXMfm7pR72fpbxwwwfUUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117412; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PY7zMTVVpyEJMUHIwvD7udn+W7XfH9WjAVo65QyNQzY=; b=MV50fOyetJvtY+kgFtGrYe7CdKZg57oCYLATnARFkud/aG+Rcielhmd0EijowXV1EUdtCgS9iou89ab07I9XtmwEdfwlDSFtk8OV25md3q0t/4kz2rgthQpQLgipxeZm+cic55BCOXbeITx4qLiJ7Rg/zJl1mL5EJxRHyR9PzN4= 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 1685117412657569.2746146178802; Fri, 26 May 2023 09:10:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zze-0004CZ-Dq; Fri, 26 May 2023 12:08:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2ZzY-0004BG-5w for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2ZzV-0002cv-Ek for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:35 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-664-LwC0YhDzPce_nQvU1JHsyw-1; Fri, 26 May 2023 12:08:30 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5147d242f01so702592a12.0 for ; Fri, 26 May 2023 09:08:29 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id g13-20020aa7c58d000000b005141ff430bfsm103315edq.11.2023.05.26.09.08.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117311; 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=PY7zMTVVpyEJMUHIwvD7udn+W7XfH9WjAVo65QyNQzY=; b=FZhZF76FJbqdf/4dBQeT0bDJh12XbNUJ2NcxIa/KHjVB0tgpzcq3jqRbaKYQZG70NE7YvQ Z2dwAvAgH9jsGA+kCHMHNDvi1u1tJKa7Hu8mNxUAlyPzUewJ0jDRdEJA+M8LVlDyIzQbZ9 8KK3RaoUj5rMexExjTznIVzC2Sdn3CU= X-MC-Unique: LwC0YhDzPce_nQvU1JHsyw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117308; x=1687709308; 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=PY7zMTVVpyEJMUHIwvD7udn+W7XfH9WjAVo65QyNQzY=; b=ce1BG4is8Ou5/5Cqc0JqmzsSi/cOkn+8aHLN963ytDMvUf1rKPNN2ke4+xJr1JvNZP fU/ekePfLKSckljX69gkZh0GmgsS/FA/rMi+h1cISOystmJeydEqxzYbgO1ex8MEMhJR mwQFwQi604gvQJd/UNOm1suZoT3n8zCvlfigbJ1Z8J5i7Tk6oCOBqxm3YCtPsGxgxslV /6KQt29pEownZS+K2/3RoFzJmcPEk0U54EB3RGGEcD4wN/OX9IlOL43JB1eZH7AKukuN yPW2T3AOBWxl417phERNrYOruqNMuHziCwB/BrI+m9ugWaqhaAUmgcg1eNvKruGgck3k Y8HQ== X-Gm-Message-State: AC+VfDwmHXRwxhlekXM8FI+SpQ1Nao1KMGszwDjZf3G6q2DeNwNrbMAZ WuEgsxnc/PvMZvdLDU3y0oe+QYasoo4J7pfqImZpRONGH+LzJRBvY5o0pD9AF5/JyKtSiiZBQK3 ndqvZ1E3iCken1aJmiKqkfqjZuOmXd64sbNQ+Hi6+SFmcqiG3dH6zVDfdOZnvzZOXDNkEBenmz0 w= X-Received: by 2002:a05:6402:5202:b0:4ea:a9b0:a518 with SMTP id s2-20020a056402520200b004eaa9b0a518mr6051273edd.17.1685117308455; Fri, 26 May 2023 09:08:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5jvgCTvleaHamdF0M4hD98DGsGGjZNYHsuKRHezRx10YluX4byn5olpWbqUN32zsSeO4ku9Q== X-Received: by 2002:a05:6402:5202:b0:4ea:a9b0:a518 with SMTP id s2-20020a056402520200b004eaa9b0a518mr6051260edd.17.1685117308180; Fri, 26 May 2023 09:08:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 01/12] tests/docker: simplify HOST_ARCH definition Date: Fri, 26 May 2023 18:08:13 +0200 Message-Id: <20230526160824.655279-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117413319100001 ARCH is always empty, so just define HOST_ARCH as the result of uname. Acked-by: Alex Benn=C3=A9e Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 94015253254c..142e8605eee9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -6,7 +6,7 @@ NULL :=3D SPACE :=3D $(NULL) # COMMA :=3D , =20 -HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) +HOST_ARCH =3D $(shell uname -m) USER =3D $(if $(NOUSER),,$(shell id -un)) UID =3D $(if $(NOUSER),,$(shell id -u)) =20 --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117450; cv=none; d=zohomail.com; s=zohoarc; b=VTAX4izHH7ONYFeogdf4Pxm1LWKKa6H1LFYgeg/2+ZZtzbWIDlCv5YeZHM/+aPbE2FdKQPBBXotUdtEjgIK+aZ1P73uGZvXwM/jSAAaPA0/3xEqZchK7INh6QcwacRvRKB6+WtfrKIyiJh7QfW8/SK8fT+rY9qDYiUH8vYwFb8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117450; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p/jNkPoTNc33RHmtgQTu7JrJl3cHFubTvj/jW5MYZE4=; b=Lu+usntE6pNYLZOeuSZ6/WOHFODYsMmGIY5t/K1Kq1iY0SFdYEwoRmNXj2GVN14/vcDFRmnNApYTX2Nmi6LavxM+NqhVCp43MwCZaplABDZg8fH5eyFNU4AzEk2a/dkTaIO+3yXS9n9+eSuCRjJlGHTTCUbK1HTPmV2xLaoPuhE= 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 1685117449991542.1873047623898; Fri, 26 May 2023 09:10:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zzg-0004F8-A9; Fri, 26 May 2023 12:08:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zza-0004BP-38 for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2ZzX-0002d6-Fq for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:37 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-620-8Rw9vacfMnCN_wqXd3Qygw-1; Fri, 26 May 2023 12:08:31 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-5147e3dfccdso493077a12.1 for ; Fri, 26 May 2023 09:08:31 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id g7-20020aa7c847000000b005106975c7a1sm103207edt.23.2023.05.26.09.08.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117314; 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=p/jNkPoTNc33RHmtgQTu7JrJl3cHFubTvj/jW5MYZE4=; b=Lck3IMNh2lkJxfVwDLmYWZmDdXarXKarXllRsqnZ5Kvhpq8Kx0Nta2Z18Vdh9Fi5gGfpOf UO7hEf2APhfgyGulwn8Mdq51l5pmqJ2MsXPp/Bzlc4neYuxkH4TNBbt4cIsU3K/D25F5KE R6AdUs10flRHfYni625eQPbUlqly+PA= X-MC-Unique: 8Rw9vacfMnCN_wqXd3Qygw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117310; x=1687709310; 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=p/jNkPoTNc33RHmtgQTu7JrJl3cHFubTvj/jW5MYZE4=; b=JAMv6y6eKC5PRwRSyvsdJ/SbPyVnSbX00RD2plpXfXvHVykrrbRdx/rUwrxWNd6l4E DF0HvwaL7JCvbXeXhFPcXpoH46sxBjCivhDV0vBm8gX9gx0p7DicZS5LfskWKf5/dRvw u2yT5vUUeEC8U68wLSliPwcPpbS40VRXSP4hoPDDKFlXekYMGGLydath01P/BkIxv+rc wS5yr5EuyF2pteN0HAwXLjAM649cGhTjyT1kDuMStsYGGqv4TeXYdU0L6hXwjOAvjdCU gjW/8PRljd2wGR3BJ9+v7GDPttxVzybuqbOt6ehz0LVWUZ24O9QvJAMw/QUgX/mjaVTa DgdQ== X-Gm-Message-State: AC+VfDyN5eAU0dWg/4QQ06ptZcIdZ0oUzrG+Ok69GFP7crDO0NoafuTl fBT8qZJ1dpu1+MHFEzZC/Jh2nkywd0dcZu2ojQJgHkjUfFqolfu32W09J3lB1C6oBLECaJIsjTr ZlBQeT7KPQ1llUT9HFeWETr3Xz0jZ+S4+K12Fs+zT0P2Z/2+AStB59nE/vPwpg+HP2Zd+aGAL7i Y= X-Received: by 2002:a05:6402:1655:b0:514:75ff:6a86 with SMTP id s21-20020a056402165500b0051475ff6a86mr1465963edx.29.1685117310157; Fri, 26 May 2023 09:08:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Y93AtEe6Zw56uSGF4y/k3Cil67bit26uh2XOpvR+f8JtAeJlL1w2HRN8G32ZYe6XeGRmlCA== X-Received: by 2002:a05:6402:1655:b0:514:75ff:6a86 with SMTP id s21-20020a056402165500b0051475ff6a86mr1465950edx.29.1685117309940; Fri, 26 May 2023 09:08:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 02/12] tests/vm: fix and simplify HOST_ARCH definition Date: Fri, 26 May 2023 18:08:14 +0200 Message-Id: <20230526160824.655279-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117450781100003 ARCH is always empty, so just define HOST_ARCH as the result of uname. The incorrect definition was not being used because the "ifeq" statement is wrong; replace it with the same idiom based on $(realpath) that the main Makefile uses. With this change, vm-build-netbsd in a configured tree will not use the PYTHONPATH hack. Reported-by: John Snow Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Paolo Bonzini --- tests/vm/Makefile.include | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 2cc2203d0916..c2a8ca1c175a 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -1,14 +1,12 @@ # Makefile for VM tests =20 # Hack to allow running in an unconfigured build tree -ifeq ($(wildcard $(SRC_PATH)/config-host.mak),) +ifeq ($(realpath $(SRC_PATH)),$(realpath .)) VM_PYTHON =3D PYTHONPATH=3D$(SRC_PATH)/python /usr/bin/env python3 VM_VENV =3D -HOST_ARCH :=3D $(shell uname -m) else VM_PYTHON =3D $(TESTS_PYTHON) VM_VENV =3D check-venv -HOST_ARCH =3D $(ARCH) endif =20 .PHONY: vm-build-all vm-clean-all @@ -23,6 +21,7 @@ ARM64_IMAGES +=3D ubuntu.aarch64 centos.aarch64 endif endif =20 +HOST_ARCH =3D $(shell uname -m) ifeq ($(HOST_ARCH),x86_64) IMAGES=3D$(X86_IMAGES) $(if $(USE_TCG),$(ARM64_IMAGES)) else ifeq ($(HOST_ARCH),aarch64) --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117524; cv=none; d=zohomail.com; s=zohoarc; b=fEDO0sJpnyS4J/JYSFG7aWhch0auyT7L1QvGBrigUsd3Qqdpvh11MQQc3WUubQZXIoV0brcrK4n2Z51gDzAThk+QX5sS+O4VmHmJ5i9Az4bOv5P+ML/LUzwxI5Vq4Tr8KCMw6cRNVm3IM1Eqn+CJbSybHgTN+Eatdh4eeEAWKog= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117524; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Fzs0h2LMkCyS2RcHmjcBAfl2R0ztIYcRkkcOdDDYgWk=; b=SfxHXTQ8VD8yolduXMXvnzCmXBV5lWSEKYsI+8LjdwO9EI51bl+lMEZnfUMq3euj8OdXUyyaOl8xhgcdEvTmsiOp5gC9nYchC+ZhnivLXyVOV59sBHAlhybGdv5REUwvK8aggcjrznUR/jywdwENyDflJj02S9LlDyQa28YOsQY= 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 1685117524571982.3774481876418; Fri, 26 May 2023 09:12:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zze-0004DB-TY; Fri, 26 May 2023 12:08:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zza-0004BO-38 for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2ZzX-0002dE-V1 for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:37 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-136-RjS0zBG2PiGgORXZQJiX0A-1; Fri, 26 May 2023 12:08:33 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-970e0152da7so112843766b.2 for ; Fri, 26 May 2023 09:08:33 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id z11-20020a170906714b00b0096f89fd4bf8sm2307767ejj.122.2023.05.26.09.08.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117315; 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=Fzs0h2LMkCyS2RcHmjcBAfl2R0ztIYcRkkcOdDDYgWk=; b=UAIEopr+aky9m8vbQ89nuI5cioIijWKmgYVB4fiTRcdcTLOgpO9HBLQBTRyBmir/36vAre r4w61Jks6AKPOKxz+v8rXIOlOCvLHGP27dx9lLqntC1oPh+zpiR9LI3+Rhn33UsvpmUn/O PPI1123Ui1+G8DNtfzeQ4o2Ms4qzabk= X-MC-Unique: RjS0zBG2PiGgORXZQJiX0A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117312; x=1687709312; 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=Fzs0h2LMkCyS2RcHmjcBAfl2R0ztIYcRkkcOdDDYgWk=; b=LdnVO0Fts0MqyCIPRs/F53oz489+MpS0o6gjDE5C8Mn0bmakF4LS/3tMgOc5EhFDph mCpiiqS5rkvsEX9+rEoWTh7TfrvYxDhBPUQUalFZji+X17FwBHcp9LxnGtthm8NN6CHH pvfkj5wpRoQg/eri4L6CJccH+RKhuc7tdmujLL/Y6jaMUo5TRZZ7q8goAGuIYTJ3nNzZ NiK4paCEN9VpvIbJ798/Ny7WhM4fK3VVvOeSjb7YTrJ3y7QF++JarNbta+Urq1wxsOKR KHMg/4djdtCc49a7VddaKvxUfCZmZ9mC6OZ8fZSlZWYLk2ZQyBSNK7PljJznnAgH0d5p /zRA== X-Gm-Message-State: AC+VfDy7R+QaTMpbHECMKcQCCCMVIrK1GSPqi3m7B2S0OO09GzAq4ggt Ww18QRB0xLs/AVxhaYx61XtYGpNKFFr3buteRWOoqWjX0fGeXjaNrI5Tf5jxjb57X7Yi8ydjFFi iAbkRhyi21I4WJIKmWIXuCS2xl4CqYMt1ynZj0H9QJhlLhWz9zaYfscjab74fwsU9Zdyo0bi4Dx E= X-Received: by 2002:a17:907:80a:b0:94f:2852:1d2b with SMTP id wv10-20020a170907080a00b0094f28521d2bmr2253876ejb.72.1685117311774; Fri, 26 May 2023 09:08:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5AjMZyHpEAKtHO60KZkEJ5LSNkPg29ccnrV/GRV/FE2UDMYsmwxh6ZaN6FUPbRraSdNqdyOg== X-Received: by 2002:a17:907:80a:b0:94f:2852:1d2b with SMTP id wv10-20020a170907080a00b0094f28521d2bmr2253859ejb.72.1685117311525; Fri, 26 May 2023 09:08:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 03/12] Makefile: remove $(TESTS_PYTHON) Date: Fri, 26 May 2023 18:08:15 +0200 Message-Id: <20230526160824.655279-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117524966100001 It is now the same as $(PYTHON), since the latter always points at pyvenv/b= in/python3. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 8 +++----- tests/vm/Makefile.include | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 5b838ec438b0..0184ef223737 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -89,11 +89,9 @@ distclean-tcg: $(DISTCLEAN_TCG_TARGET_RULES) # Build up our target list from the filtered list of ninja targets TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) =20 -TESTS_VENV_DIR=3D$(BUILD_DIR)/pyvenv TESTS_VENV_TOKEN=3D$(BUILD_DIR)/pyvenv/tests.group TESTS_VENV_REQ=3D$(SRC_PATH)/tests/requirements.txt TESTS_RESULTS_DIR=3D$(BUILD_DIR)/tests/results -TESTS_PYTHON=3D$(TESTS_VENV_DIR)/bin/python3 ifndef AVOCADO_TESTS AVOCADO_TESTS=3Dtests/avocado endif @@ -109,7 +107,7 @@ else endif =20 quiet-venv-pip =3D $(quiet-@)$(call quiet-command-run, \ - $(TESTS_PYTHON) -m pip -q --disable-pip-version-check $1, \ + $(PYTHON) -m pip -q --disable-pip-version-check $1, \ "VENVPIP","$1") =20 $(TESTS_VENV_TOKEN): $(TESTS_VENV_REQ) @@ -131,7 +129,7 @@ FEDORA_31_DOWNLOAD=3D$(filter $(FEDORA_31_ARCHES),$(FED= ORA_31_ARCHES_CANDIDATES)) # download one specific Fedora 31 image get-vm-image-fedora-31-%: check-venv $(call quiet-command, \ - $(TESTS_PYTHON) -m avocado vmimage get \ + $(PYTHON) -m avocado vmimage get \ --distro=3Dfedora --distro-version=3D31 --arch=3D$*, \ "AVOCADO", "Downloading avocado tests VM image for $*") =20 @@ -142,7 +140,7 @@ JOBS_OPTION=3D$(lastword -j1 $(filter-out -j, $(filter = -j%,$(MAKEFLAGS)))) =20 check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images $(call quiet-command, \ - $(TESTS_PYTHON) -m avocado \ + $(PYTHON) -m avocado \ --show=3D$(AVOCADO_SHOW) run --job-results-dir=3D$(TESTS_RESUL= TS_DIR) \ $(if $(AVOCADO_TAGS),, \ --filter-by-tags-include-empty \ diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index c2a8ca1c175a..f0f5d32fb0f0 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -5,7 +5,7 @@ ifeq ($(realpath $(SRC_PATH)),$(realpath .)) VM_PYTHON =3D PYTHONPATH=3D$(SRC_PATH)/python /usr/bin/env python3 VM_VENV =3D else -VM_PYTHON =3D $(TESTS_PYTHON) +VM_PYTHON =3D $(PYTHON) VM_VENV =3D check-venv endif =20 --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117572; cv=none; d=zohomail.com; s=zohoarc; b=ENOHY6+QH/NiKCE+fU09vepEo8vkMkit8krnT9Em/pluHegZ5LYaJSubSO+kECZtb7g+y5VFKBPiU1RoAbCp2FNHmbdan77dXHXlVD0l/UOmbrrbPwbf+mRiE4Y8nxIs1uJDioH//ioMIcb6NhdfQxCK08BR8zb4BaRQH1JckPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117572; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Sd3T10HXiJPTxzvEoZFcDCGXr7r+Y/M31alTpJVCV8w=; b=WNFJjR8LA8lKukLXt9V4MfDlH8/Ha3lIfrzPdh6rsJc/Qn59hrKirPjAQK5qNXSu4v5JdLSsQq6Q9YAFoBG3u5vg7pia6rAGqxMZC28HeKIAwL5h5NrxCTgGrCXn9IUAlNFv6+RuIREuMZ25g0ozF20CuyAAexYKgSSjSfPHK4g= 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 1685117572517308.23597702023153; Fri, 26 May 2023 09:12:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zzh-0004GD-61; Fri, 26 May 2023 12:08:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzc-0004C6-61 for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2ZzZ-0002db-SQ for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:39 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-253-vxNI--SiOPOStY-62onSBA-1; Fri, 26 May 2023 12:08:35 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-96fd6bd135dso114926866b.1 for ; Fri, 26 May 2023 09:08:34 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id h26-20020a1709062dda00b00969f2d5267asm2326252eji.114.2023.05.26.09.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117316; 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=Sd3T10HXiJPTxzvEoZFcDCGXr7r+Y/M31alTpJVCV8w=; b=IXAg5I/voFOTN7UK8S1/VcNPL6kTPvvzVHgnkEK+6zOnHXlBH/NtgfT8oeoTDIJdEmXXSH vRz/v0yd+nt6AOabVjWbL2uS8zhVxWWS+mYFpVA00XqY1rZy5OZ2EZilcEBiA6xs4fwhNV /+M3wcTlMsCPLdjcy2Jyuq0rLz5hp14= X-MC-Unique: vxNI--SiOPOStY-62onSBA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117313; x=1687709313; 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=Sd3T10HXiJPTxzvEoZFcDCGXr7r+Y/M31alTpJVCV8w=; b=OWQXT3VBqzuoIIc7g9q17PqJyA4ow4Bkzg0Tcj1BBselpCD9+0CqiXC6HIJSjPB211 VuN4RY19MbRZb4CA5H/ZiBeyGO784P2GczdowLu+p06bQ6adWIx99AHlw8WS9xIwitLR 79qEAx2175ve35efGvxSJZYdAuOiuTKUxcWlGm6SlKgh+0cJgwG586564exLTlPxcB5k oKjZvQfFPqb63+LOFpFQ4gQs/AsLWcblO7ZT4zObaC4p11sJAApewsqSaBsprezLX0DE 5iPKbQmspaYg2Lf4SJztjkI2l4YEpgD0V3AQGdcTmUhmz3S8f3ety++udsKcz1ma2H20 Qr7g== X-Gm-Message-State: AC+VfDyA6bI09JpGIODgXBMNuoCuUHaB6a84+KdD2XIO5uqgJPyVaIcB PgLkdkXMHLhGg0VdwZT0RRxIOt21PDFYW+jnYn0lStnpJU7EFG1hHx5AxFC9iyiAbuEe4oo8dMs 40lYD9NMrNb37fgz/y2D4ABCsi/FbvuGueCifRmI5Nv7vrg0GyMBIA62ezshFVHZyiApQTNE0Qo Y= X-Received: by 2002:a17:907:94c3:b0:94f:8aff:c8b3 with SMTP id dn3-20020a17090794c300b0094f8affc8b3mr2654506ejc.28.1685117313194; Fri, 26 May 2023 09:08:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ujyTu1C/N0mQxwf8g6TvPwzPSsVdZCD5RLCZH6nS7TJ6K7GD9dYSXuaZpdWXPEZFHC6LcbA== X-Received: by 2002:a17:907:94c3:b0:94f:8aff:c8b3 with SMTP id dn3-20020a17090794c300b0094f8affc8b3mr2654488ejc.28.1685117312972; Fri, 26 May 2023 09:08:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Juan Quintela , qemu-stable@nongnu.org Subject: [PULL 04/12] configure: unset harmful environment variables Date: Fri, 26 May 2023 18:08:16 +0200 Message-Id: <20230526160824.655279-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117574505100009 Content-Type: text/plain; charset="utf-8" Apart from CLICOLOR_FORCE and GREP_OPTIONS, there are other variables that are listed in the Autoconf manual. While Autoconf neutralizes them very early, and assumes it does not (yet) run in a shell that has "unset", QEMU assumes that the user invoked configure under a POSIX shell, and therefore can simply use "unset" to clear them. CDPATH is particularly nasty because it messes up "cd ... && pwd". Reported-by: Juan Quintela Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 80ca1c922151..9cdce69b7852 100755 --- a/configure +++ b/configure @@ -4,9 +4,8 @@ # =20 # Unset some variables known to interfere with behavior of common tools, -# just as autoconf does. -CLICOLOR_FORCE=3D GREP_OPTIONS=3D -unset CLICOLOR_FORCE GREP_OPTIONS +# just as autoconf does. Unlike autoconf, we assume that unset exists. +unset CLICOLOR_FORCE GREP_OPTIONS BASH_ENV ENV MAIL MAILPATH CDPATH =20 # Don't allow CCACHE, if present, to use cached results of compile tests! export CCACHE_RECACHE=3Dyes --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117637; cv=none; d=zohomail.com; s=zohoarc; b=Z4c+0Pj21cVTBWwTzFiHPAdIvTRSxi0YnC/cL/I78OKnELLPsXhQuMdHMtJlDQkQMRd/rGDidgiN48qyLGOuNH5JbRxz+YAtB20n4Au5M18J/4n2g8/36gQanFdt05hSn6mxrScxQfz16DBbap7llEL249n11gxsP/LMrFC/mEM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117637; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1CiU+eRJd/yQCRQ14/jOPXi0TXueH4pHw6cXnlSUALw=; b=edGoo3BqDbAOsKqH3Xj3pFwBA8WHHL3AZx2UqBlaXOWM8QD0jZGOrK3cjAzfG7auPtjDKQ3ZdpgWKRHbYn2T41CJ2FhfAbAQaoaLwvTvGp+oXZdA0JFm2gOdxLlpDzjB8kqebM312dnP/OHnF9GIYpgOlGKAllppFuQrVahgbpI= 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 1685117637771519.9695190469789; Fri, 26 May 2023 09:13:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zzh-0004GG-PB; Fri, 26 May 2023 12:08:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zze-0004Ct-Kp for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzb-0002dx-Gx for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:42 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-454-W9RwutdbOT6fwowu3wHfHA-1; Fri, 26 May 2023 12:08:36 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-94a355c9028so102008366b.3 for ; Fri, 26 May 2023 09:08:36 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id e18-20020a170906249200b0096f503ae4b0sm2312716ejb.26.2023.05.26.09.08.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117318; 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=1CiU+eRJd/yQCRQ14/jOPXi0TXueH4pHw6cXnlSUALw=; b=AeaI7eXzFhHyX3mAe+d0WbNTPBf9mGuxkGi+OZipG8rDXZrxz7Hs4k0uSxEP+SHGV9OlK4 GCzyKY/QkS0kwkUGI55rRX9MjXBLWnGEA+JFedQFjmDOAnDhhySkKtfrzKiiJ60nmBYdQ5 G5VzzjXP48RHn25JQX9lPDj4SdBots8= X-MC-Unique: W9RwutdbOT6fwowu3wHfHA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117315; x=1687709315; 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=1CiU+eRJd/yQCRQ14/jOPXi0TXueH4pHw6cXnlSUALw=; b=EL/ngpPEYYz7xdT2MLEzJZNkBoDp5Fxz7jFxc2FBdBW/AMrET7yP95z8gS2W5LF5VU s4VlYx8peFe1puqkp6ozRWz3THtjcLwMnP8gWoKYdmKyWsFY1HgEBIkRhvij6q/NA5cs aq0aypqRnYiE/Dnbxq509qkK+pLZ8CV1F3DSImZBSK1JHsZdPlU6odMOyozg2C0ygP9x lHC4TRI3/4l4FrjHtHGxyI3nEX4f9EFfPkASWC1k80QbLvj7ZaqNF1li1F4L82X5DYIZ vQbKFnbgn86jDsghrZVv3q8tOruSqLgnUq7kuPA4KNE4ZWkaemYCLUhegCJ1XhDpO9UC e9Rg== X-Gm-Message-State: AC+VfDxqVlFSVkIWbrGEepfPBq+k3ECoNbZUesBJTPngUil7anSTmsBR d1gPJzDvrPxk2LNW3o4XYhoI8odOAiuDm38uNzlumJF/GntRPRXTtAQr+qTEZCNN9P42TjGMh03 TsmEKMx0KGyGavOyKp+xmRDK+NOX4m/D+lW3ASqcj2bc1Ny1kpMLf1H2KBa7BL1Ib1Iah/6v2oQ I= X-Received: by 2002:a17:907:1611:b0:957:17c5:8705 with SMTP id hb17-20020a170907161100b0095717c58705mr3051253ejc.51.1685117314939; Fri, 26 May 2023 09:08:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4GjQuJN5yGJ1tWN+24JPxDKWySNYdtlrXz/79F1TiLATkBBJbh4SrhUgVGAWbuqWuf1srb9A== X-Received: by 2002:a17:907:1611:b0:957:17c5:8705 with SMTP id hb17-20020a170907161100b0095717c58705mr3051222ejc.51.1685117314598; Fri, 26 May 2023 09:08:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Fabiano Rosas Subject: [PULL 05/12] meson: Remove leftover comment Date: Fri, 26 May 2023 18:08:17 +0200 Message-Id: <20230526160824.655279-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117638469100001 Content-Type: text/plain; charset="utf-8" From: Fabiano Rosas Commit d2e6f9272d ("fuzz: remove fork-fuzzing scaffolding") removed the linker script and forgot to remove the comment. Signed-off-by: Fabiano Rosas Message-Id: <20230525212044.30222-2-farosas@suse.de> Signed-off-by: Paolo Bonzini --- meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/meson.build b/meson.build index 78890f01550a..ee1b7dac730b 100644 --- a/meson.build +++ b/meson.build @@ -404,8 +404,6 @@ if targetos !=3D 'sunos' and not get_option('tsan') qemu_ldflags +=3D cc.get_supported_link_arguments('-Wl,--warn-common') endif =20 -# Specify linker-script with add_project_link_arguments so that it is not = placed -# within a linker --start-group/--end-group pair if get_option('fuzzing') # Specify a filter to only instrument code that is directly related to # virtual-devices. --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117380; cv=none; d=zohomail.com; s=zohoarc; b=ezP1AdwyvsLqMi5XR6xx/rXYiVRHp4xB1QV5LRdNMuonRoK8Ijsrca/UW8o7Qp56YRwdxcBWz+mLlzi5gRgwYtjRMT7RnhdI56xFJmQLi0eTaImUi91oLxYU2b4zWecy4TtHeFXCnXYkNaM29WhNCCi0E3Qhb0H9ydk+rMq8oCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117380; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LOMsYPI48p6M+QNMAUBxDQ/hy4HQGwgc/IU9K0zz3UU=; b=ACFT7BoWZqPZmp4bZ5P7QhKMy+ra/a1FbZxhMiK1MRrZamC1QxdIeeIS5aSnxmWKqN1PzbogOBeUUt72bMomQxF40ZFtc1alNsFWnDkB5eIR8RPHnvxwPQDJGhzjDkWhK3GgoPW95p1ufLcvFw6bAw6b+azsrd7a0utznbG5MHQ= 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 1685117380830127.43251484820973; Fri, 26 May 2023 09:09:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zzs-0004Jn-Qi; Fri, 26 May 2023 12:08:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzr-0004JZ-1k for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzd-0002e7-S5 for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:54 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-279-Dve02pWrMBWrUDTSayVDkg-1; Fri, 26 May 2023 12:08:37 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-513f337d478so816683a12.3 for ; Fri, 26 May 2023 09:08:37 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id ce23-20020a170906b25700b0096f8bb60c96sm2330411ejb.100.2023.05.26.09.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117319; 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=LOMsYPI48p6M+QNMAUBxDQ/hy4HQGwgc/IU9K0zz3UU=; b=WBkw1gbQV92Fz5Zkjs2+YvTxYLVz3dmLwuohO16BXuiA91Q6OSz95WfqzDxs5nZzjR4Hbx FWyCqMSiomyqy878HAadHW66MbJmfKtRf7sfp/zwsHdsJi3LUbjTkfAHj4IrhUbSDbMR4E etJHdmuGnyRRh7WGse36hQb6qqusvr0= X-MC-Unique: Dve02pWrMBWrUDTSayVDkg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117316; x=1687709316; 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=LOMsYPI48p6M+QNMAUBxDQ/hy4HQGwgc/IU9K0zz3UU=; b=DZqhPLK141YeBcuAKMyEqnGBPIQVmTX7UGxnGSBN9YA+2MoBRYPV62clIevxeAr0ZX cW3udbQ6M+qy7sQi98VNRGYjykcd/GScpfaBTHCxpmtnmBzqjpYPPdShdstHDwsL+BDt D3FDjIU/3/oFW6E39olX5r6chJD2SqPWzgrX1vgRUvBIYB31KWsIzFbtxgSk0l2Ujs2H hXMC5Fl49PkNWn5jl+KKRm3LJeCbFozdfLZdNrA4VQgCXyLaUe+Ta23jTJheXG0Lp/+t hhAfRhbN5rm7o1snXrcDjNFKNr18++8tTkdsmuPL4C2zruhhGXanqxSAjudvhbYaT7Lo uY5A== X-Gm-Message-State: AC+VfDynNgcjH94vZHiCbwufyhQJmvnZ+2Q/DEtL7DTfmmd8RJZ/ibXH dUujljsNbiubNO96WTTwgMZ3A6Ksacry56Oefll3VUuZF4Z/fmbzBQHlu2HJRqCqksbhUA5THmT AxdR/I+a5clANmEakt86sNIX2cuPPxpVDYUtq2F0TTa0snX/37Y+pIYSTN3XjD+DaDt1iPlXnlz o= X-Received: by 2002:a17:907:3f83:b0:970:c9f:2db6 with SMTP id hr3-20020a1709073f8300b009700c9f2db6mr2601220ejc.63.1685117316425; Fri, 26 May 2023 09:08:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7TVEbAaY8TKEl0Mvx3EfDJ0myzPgC8xsEKJyNtlwdiqTqLBajpODNi9R3QEZPT865fsEYixg== X-Received: by 2002:a17:907:3f83:b0:970:c9f:2db6 with SMTP id hr3-20020a1709073f8300b009700c9f2db6mr2601195ejc.63.1685117316088; Fri, 26 May 2023 09:08:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Fabiano Rosas Subject: [PULL 06/12] meson: Add static glib dependency for initrd-stress.img Date: Fri, 26 May 2023 18:08:18 +0200 Message-Id: <20230526160824.655279-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117381349100001 Content-Type: text/plain; charset="utf-8" From: Fabiano Rosas We recently moved glib detection code to meson but this changes the linker command line from -lglib-2.0 to using a path to libglib-2.0.so. This does not work for static linking, which is used by stress.c: $ make V=3D1 tests/migration/initrd-stress.img cc -m64 -mcx16 -o tests/migration/stress ... -static -Wl,--start-group /usr/lib64/libglib-2.0.so -Wl,--end-group ... bin/ld: attempted static link of dynamic object `/usr/lib64/libglib-2.0.so' Add a specific dependency for stress.c, which is linked statically. The compiler command line is now: cc -m64 -mcx16 -o tests/migration/stress ... -static -pthread -Wl,--start-group -lm /usr/lib64/libpcre.a -lglib-2.0 -Wl,--end-group Fixes: fc9a809e0d ("build: move glib detection and workarounds to meson") Signed-off-by: Fabiano Rosas Message-Id: <20230525212044.30222-3-farosas@suse.de> Signed-off-by: Paolo Bonzini --- tests/migration/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/migration/meson.build b/tests/migration/meson.build index dd562355a16e..ac71f1329014 100644 --- a/tests/migration/meson.build +++ b/tests/migration/meson.build @@ -1,9 +1,11 @@ sysprof =3D dependency('sysprof-capture-4', required: false) +glib_static =3D dependency('glib-2.0', version: glib_req_ver, required: fa= lse, + method: 'pkg-config', static: true) =20 stress =3D executable( 'stress', files('stress.c'), - dependencies: [glib, sysprof], + dependencies: [glib_static, sysprof], link_args: ['-static'], build_by_default: false, ) --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117571; cv=none; d=zohomail.com; s=zohoarc; b=d3eAALw2GpyTFp5/nYondLoVD3VoZr/KglaTmC2TOsnO2P5oc00VEMRae7p5mlGhoXP7yOVMd78qnczZ2Bgf43ZUQTnkyXJVQZpgPXitqwkJkn1rCXF7MuPfgzse6yX4klR5uLJfZDD0jC5GUT3ypohWghY/+uDkIXEwCfuO9yQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117571; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=q24lgTZzDX54EUdjECo2U6h6oXNEyLIGSU/uCnCASvs=; b=X4/XaIYRTs5p+hiMDQuR9WJQ8AHHOTFqjA7SlolpFyEgskjFsjHVHkdhVHmusltNG72FEicBia3AsBDlByvcQdtYff9JrxLH2fqwJuM526JoC10KNh2XdmpSUi8Fe7rfQ3kGWDTGjHv89zvvqBV+9e5PQqwrZVYfTUz6MFkgwp0= 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 1685117571753468.2840500136268; Fri, 26 May 2023 09:12:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zzi-0004H2-Gn; Fri, 26 May 2023 12:08:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzg-0004Fh-Iz for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzd-0002fh-Vn for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:44 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-101-AnwNs9bcPliJRGdD2Pvk8g-1; Fri, 26 May 2023 12:08:39 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-513e916ed47so835673a12.2 for ; Fri, 26 May 2023 09:08:39 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id b20-20020a17090636d400b0096fc35ca733sm2276497ejc.41.2023.05.26.09.08.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117320; 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=q24lgTZzDX54EUdjECo2U6h6oXNEyLIGSU/uCnCASvs=; b=UcEwJ3GlK1LLZn+r1GSAm8aDFJ7YuV4f2wtYrNDSo07+O06ShVNQo2w+NULT+pyRsQj4zP nE3s9hR5TGM16lhIX5ESXHKr6kkyjZKvk2Oe6hV1v/2MoEtCvElN/ndNpYJwvVmtElWG1u J2sKQ8yZTj9g2nsNqK4iRPaqXAVJGRE= X-MC-Unique: AnwNs9bcPliJRGdD2Pvk8g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117318; x=1687709318; 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=q24lgTZzDX54EUdjECo2U6h6oXNEyLIGSU/uCnCASvs=; b=eMV/ChOMMLBeM8IT8EUX6o/XvVZ2s1gMQmUxfMNZK4KiSnNHvyFF4XyFbzNDpw+s0p AfENwJoJolHf01hqWWvS6qkLzLmyZ77VsGphCQvRFlWS6/YOAsbKqyQnuk9WIK3C0Ued RT/T/8CLQ5x6X627yLrnIs/7PdBKJ3e4U9dMahxKD4rLV1BW/iqimwkjLvb6aERdBcv6 /2afgeAQ8HbWLwvw7o8Ssay7PRjTtZzwPNecGUgNhpjzEtDbKmY8KFqXjPQeIALnwu5G m2+dbjyYBLoC/RsqiSlqtQD7uuBTzTwMBoP+vcu6K45g2AAJdOOWVUd9hLNIog98wf7Y /pnQ== X-Gm-Message-State: AC+VfDwmNstoHcrZRhfi5KOCHna2TMobPXEzvqplxAA6bupHtmn5RM64 O4BMs8cn0n7pxS6oSzoPDROYmax9KWshffMEVHMxvFuyRUO9GXcOvnIjawcKWC6HFvhJJzdX7i3 YN1FGbiXJHQGXEUqbxkSi3zSgo6FwekMlEE4hrjyIHXgtRi+hl/oW45dpbRD2oyyEqWBiACv/aA k= X-Received: by 2002:a17:907:3603:b0:961:8570:4589 with SMTP id bk3-20020a170907360300b0096185704589mr2382308ejc.30.1685117317798; Fri, 26 May 2023 09:08:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4HW0b63GucBO193TiLcH7DecRsJXTWgr9wbvgOFKIWdLRICrh2nYWhSQy+73Pa+HlOvGrFNA== X-Received: by 2002:a17:907:3603:b0:961:8570:4589 with SMTP id bk3-20020a170907360300b0096185704589mr2382287ejc.30.1685117317482; Fri, 26 May 2023 09:08:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Michael Tokarev Subject: [PULL 07/12] slirp: update wrap to latest master Date: Fri, 26 May 2023 18:08:19 +0200 Message-Id: <20230526160824.655279-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117573689100007 Content-Type: text/plain; charset="utf-8" It is recommended to use SSIZE_T for ssize_t on win32, but the commit that is being used for slirp.wrap uses int. Update to include the fix as well as the other bugfix commit "ip: Enforce strict aliasing". Reported-by: Michael Tokarev Signed-off-by: Paolo Bonzini --- subprojects/slirp.wrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/slirp.wrap b/subprojects/slirp.wrap index ace4f26102f5..08291a4cf99a 100644 --- a/subprojects/slirp.wrap +++ b/subprojects/slirp.wrap @@ -1,6 +1,6 @@ [wrap-git] url =3D https://gitlab.freedesktop.org/slirp/libslirp -revision =3D 15c52d697529eb3e78c5d8aa324d61715bce33b6 +revision =3D 26be815b86e8d49add8c9a8b320239b9594ff03d =20 [provide] slirp =3D libslirp_dep --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117628; cv=none; d=zohomail.com; s=zohoarc; b=Pe4Bq7fpqAdUYMjrOwyxOwAIBspLUbDKd/GnX+9ikgi2ukkOYKGg5hEuegOpPJWA8bBVpLCTWpdJSdg25AqhdbtrR1sLbh2nbo89fx2axt3jyOpJ3i7kGp8hOPkNu7W+eQvX3c/DYCxPtdz8NK4YSzpERRWSREyUzNfZE2m10MQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117628; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8FzBR8mv7HxcHF0wEA+3cPPXa3W2LSqegzyqCMIJnQM=; b=SKiJJL3UTnV818BytO0vTewXmwFQ5qcxNtU0kTzJ2Y1p/OkY+z/SeuEj5WI23Ci8yhRavHhCqjllmjUUx2OKVhT9T0PUY5+CUIFntnxyk0iF0oLy1WbDSgwokSnKrYy/VEbbSroMny2DogtU9pgNh0B6JwykhzsdAc/klP2hnDc= 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 1685117628023413.97519010620783; Fri, 26 May 2023 09:13:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zzi-0004Ge-6j; Fri, 26 May 2023 12:08:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzg-0004Fb-Gc for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zze-0002g3-UA for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:44 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-567-Og2JfcDpOKOxHZSHySEt5A-1; Fri, 26 May 2023 12:08:40 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-96f5157aca5so111882266b.0 for ; Fri, 26 May 2023 09:08:40 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id bx8-20020a170906a1c800b009584c5bcbc7sm2260876ejb.49.2023.05.26.09.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117322; 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=8FzBR8mv7HxcHF0wEA+3cPPXa3W2LSqegzyqCMIJnQM=; b=jDoWWY6TGrqoBpB3g5gcxt3pQl5rDXs4VXBn3OgoKKPKjejJXymErVDjD36jDK+dCz9zDD FoaVjIgZPtVKlwulkaeo/5GWto2Z/9iXVn6M4RXZ5DLRgl3n+IZVCnxctuzMHFt6hvJmyq bx4wLb9wsqZS7KVjnL1D/06fJpIrx3o= X-MC-Unique: Og2JfcDpOKOxHZSHySEt5A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117319; x=1687709319; 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=8FzBR8mv7HxcHF0wEA+3cPPXa3W2LSqegzyqCMIJnQM=; b=lS7017gnQb+cFUqkIKaaipVw1R9J8bwUhjbqSyodX5GDutkgw7wTWBCCoTmbzEVlHY WI00pI1/h8l8xItI06efSsmXvmZfx8w2FAL30XZqH3fv46+FBy1y1NPkEvpadHtQh/Xp Qkw5vp0wQgJS+qThlEpwpRIGnpLJ1BCPwn1mc3SI02ants0K0UG1ojAoJ5uzI+1g3MKl fBn233Biylkk6NZlDzPpMYsB7iHOyw9EkgBewsW09e7M1KYqkx0LOU5gJfVSEFzllUtN N8JNcL4PyBxlaulLm+YzqddfIlwmvIzXUyhQ0A+g97moejq2BW63JBEt73+E4y5QrXLZ Fy5w== X-Gm-Message-State: AC+VfDwqvieqW+lcDRxXFJMlGvuLPySJkiiM/ik8DHTKJb1SgILGWn6l BfkqJvdbf4LKa6TIDoT5Ag51gq4llQ6iwGVcs0I9C56pd/ts8A7rVniTrwAopcuuYKoe6Pirser doSBsLCdqyBA7dCxTQrhjHqCMc+EFPljGEFVlfHHKoEkbPxxBvlMchJgI6AYv6HCvJEUIUl3tXi Q= X-Received: by 2002:a17:907:960f:b0:96f:d8a9:d045 with SMTP id gb15-20020a170907960f00b0096fd8a9d045mr2112215ejc.59.1685117319258; Fri, 26 May 2023 09:08:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7blQmYGUlIfITrGqh1fBr5mb9yHfIu8RG1/ZOOHmk9hEGaZcm0cjrl87KM5yIxR+Zzjj4mWw== X-Received: by 2002:a17:907:960f:b0:96f:d8a9:d045 with SMTP id gb15-20020a170907960f00b0096fd8a9d045mr2112198ejc.59.1685117319006; Fri, 26 May 2023 09:08:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 08/12] virtio: qmp: fix memory leak Date: Fri, 26 May 2023 18:08:20 +0200 Message-Id: <20230526160824.655279-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117630047100005 The VirtioInfoList is already allocated by QAPI_LIST_PREPEND and need not be allocated by the caller. Fixes Coverity CID 1508724. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- hw/virtio/virtio-qmp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c index e84316dcfd21..b5e183529971 100644 --- a/hw/virtio/virtio-qmp.c +++ b/hw/virtio/virtio-qmp.c @@ -668,7 +668,7 @@ VirtioDeviceFeatures *qmp_decode_features(uint16_t devi= ce_id, uint64_t bitmap) VirtioInfoList *qmp_x_query_virtio(Error **errp) { VirtioInfoList *list =3D NULL; - VirtioInfoList *node; + VirtioInfo *node; VirtIODevice *vdev; =20 QTAILQ_FOREACH(vdev, &virtio_list, next) { @@ -682,11 +682,10 @@ VirtioInfoList *qmp_x_query_virtio(Error **errp) if (!strncmp(is_realized->str, "false", 4)) { QTAILQ_REMOVE(&virtio_list, vdev, next); } else { - node =3D g_new0(VirtioInfoList, 1); - node->value =3D g_new(VirtioInfo, 1); - node->value->path =3D g_strdup(dev->canonical_path); - node->value->name =3D g_strdup(vdev->name); - QAPI_LIST_PREPEND(list, node->value); + node =3D g_new(VirtioInfo, 1); + node->path =3D g_strdup(dev->canonical_path); + node->name =3D g_strdup(vdev->name); + QAPI_LIST_PREPEND(list, node); } g_string_free(is_realized, true); } --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117627; cv=none; d=zohomail.com; s=zohoarc; b=bmqJ/MqMAmjS7Z9BRVOhNPxttGznRAoMvyPWyOTyW25mcPI8Y9u61YYZCEaniz3VNoCP7iqcTbpfk0oH8WJIOHmaAVrWSGqv7Ce/KNYYjP+Dt6YmdFaEAwPOsORiR400+Awk4bI/EaZt0TgiPx1vKYlASYWBBHRKwwxEXtkJRk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117627; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K3xl8UbdGcTKh1BLqGUoGqKT03WUGrTPnPlpqcrB0qo=; b=nOKKewmNevKs7rbJ3639BecVAbN4Be9oEvms63t0df6U98EAEqtBZ2Y52kH1Gl3+0sHPFIiArCzE1kd+Y6zMtu7h+DxLCA/r9pNTHgHYDFiI0VfOv2jZyWknHk+jDQhp4x4NWsPN0+DWTWC8AqXY7BqmuW0B/BD3oFQwLSLeu74= 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 1685117627156390.1426768790003; Fri, 26 May 2023 09:13:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zzj-0004HT-Lh; Fri, 26 May 2023 12:08:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzi-0004Gc-18 for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzg-0002gJ-FN for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:45 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-563-N4aGOhQFPYuMFJ9pZRmDJA-1; Fri, 26 May 2023 12:08:42 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-96f83b44939so93231966b.1 for ; Fri, 26 May 2023 09:08:42 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id gv16-20020a170906f11000b00969dfd160aesm2339721ejb.109.2023.05.26.09.08.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117323; 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=K3xl8UbdGcTKh1BLqGUoGqKT03WUGrTPnPlpqcrB0qo=; b=INe1stRGMIc0t4aSeycjBjI6AHWCXdFsdW/50NNjiWHsD9ANhqPtaysXLhlXwAcy7s5uFD VYtIe5424rwtzCKqbcj3AH+S99PSVZHNzY41hNRkS49pBSb6DLdtSa7KAg5XKFNvg6p/OO SD40ncPfI8NevwyUDhsgdH2N0dCV/rU= X-MC-Unique: N4aGOhQFPYuMFJ9pZRmDJA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117321; x=1687709321; 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=K3xl8UbdGcTKh1BLqGUoGqKT03WUGrTPnPlpqcrB0qo=; b=AKilzzBgmnVTMTfd+kqsu04eUAmz2Oca5Mk3mKt5O+O67jWGccaAiZX2dX6SwhcP5g 0ONRR1j2gpx5xI6RSas4aRFUV9Gj7aR6HRUFbzA1L4ZX4XjdsDtjUOlyeQEwmwcf090C DkqV4G0owew4AWdUFWbwrjHkLM96oDU4CASOR0WWxLlqAa/c/H90f6VKa8nhPxPgDKKc mHV2MwbgS9hYIhbikER/HqFVgfOyMp7kZklFQHxmvsm8PtauSzFJp1dnNsJSorA4vbf6 1lFtsWvrdvqeO/ivUAwktwV14PNnOnoUsgPO0NGGCoiEmrIN+fPuzZP+vw8Ncg8g7HHG NDsg== X-Gm-Message-State: AC+VfDybAsErvz5wCBxONH0VSFxfaoNIriqh4t8mDGlGFCmKTNAfMIJ8 Ew7GO0MQJqYkWdVYRWyhYEJ5B0+kllZ42RJfn2WepJklTe+n7zF+SQbBLmEbgHhlMLACpMFFSPl hQJy5kl9Ki0JZgJhSfO+ifBgKQ9vUkjRnAjR710ZwssgunYVrgpiSQhcGWGDwTHTne9ib9E751d I= X-Received: by 2002:a17:907:6d89:b0:96f:4ee4:10d4 with SMTP id sb9-20020a1709076d8900b0096f4ee410d4mr2878793ejc.43.1685117320947; Fri, 26 May 2023 09:08:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Xww/uDQsImh2VvNEQSTxEgCcsCaDDhl1bFTLilpEZAq/p+OLPffTuF5xUihFc4B64Lq0qFQ== X-Received: by 2002:a17:907:6d89:b0:96f:4ee4:10d4 with SMTP id sb9-20020a1709076d8900b0096f4ee410d4mr2878773ejc.43.1685117320657; Fri, 26 May 2023 09:08:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 09/12] meson: simplify logic for -Dfdt Date: Fri, 26 May 2023 18:08:21 +0200 Message-Id: <20230526160824.655279-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117628082100002 fdt_opt =3D=3D 'disabled' is going to give an error if libfdt is required by any target, so catch that immediately. For fdt_opt =3D=3D 'enabled', instead, do not check immediately whether the internal libfdt is present. Instead do the check after ascertaining that libfdt is absent or too old. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- meson.build | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index ee1b7dac730b..218428841d36 100644 --- a/meson.build +++ b/meson.build @@ -3059,13 +3059,14 @@ if have_system and vfio_user_server_allowed endif =20 fdt =3D not_found -if have_system - fdt_opt =3D get_option('fdt') +fdt_opt =3D get_option('fdt') +if fdt_required.length() > 0 or fdt_opt =3D=3D 'enabled' + if fdt_opt =3D=3D 'disabled' + error('fdt disabled but required by targets ' + ', '.join(fdt_required= )) + endif + if fdt_opt in ['enabled', 'auto', 'system'] - have_internal =3D fs.exists(meson.current_source_dir() / 'dtc/libfdt/M= akefile.libfdt') - fdt =3D cc.find_library('fdt', - required: fdt_opt =3D=3D 'system' or - fdt_opt =3D=3D 'enabled' and not have_= internal) + fdt =3D cc.find_library('fdt', required: fdt_opt =3D=3D 'system') if fdt.found() and cc.links(''' #include #include @@ -3074,14 +3075,19 @@ if have_system fdt_opt =3D 'system' elif fdt_opt =3D=3D 'system' error('system libfdt requested, but it is too old (1.5.1 or newer r= equired)') - elif have_internal - fdt_opt =3D 'internal' else - fdt_opt =3D 'disabled' + fdt_opt =3D 'internal' fdt =3D not_found endif endif - if fdt_opt =3D=3D 'internal' + if not fdt.found() + assert(fdt_opt =3D=3D 'internal') + have_internal =3D fs.exists(meson.current_source_dir() / 'subprojects/= dtc/meson.build') + + if not have_internal + error('libfdt source not found - please pull git submodule') + endif + fdt_files =3D files( 'dtc/libfdt/fdt.c', 'dtc/libfdt/fdt_ro.c', @@ -3106,9 +3112,6 @@ if have_system else fdt_opt =3D 'disabled' endif -if not fdt.found() and fdt_required.length() > 0 - error('fdt not available but required by targets ' + ', '.join(fdt_requi= red)) -endif =20 config_host_data.set('CONFIG_CAPSTONE', capstone.found()) config_host_data.set('CONFIG_FDT', fdt.found()) --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117380; cv=none; d=zohomail.com; s=zohoarc; b=I2wpq4Uwru2/8kERZx1N+9CcK+tXF9Dtjk5V4G1v3tWZ8u1uqsBVw09hx8eLREyv8g/ngS5AuABQkxuJbPtraEOyjnqSAEeBjV/gDI60Yj5JDib/2uyEQf8hv5fvQI06ugF9mMm8gAIu17ey80/10Gx/w3//2ZB3Cpzlq0GNGio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117380; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AyK+JFuQXKSU38DGc74kF1FDRIy1j+0WYlw1VmPseSk=; b=iL6tVszSdHsk1nbY+yM9iUw/kmACDdhgBaflSHVlPoND4N2dIX/rIiDtSDK97jIl0U853NZjHZyHP19iyyZ95/lnrI6Pam/Na2ghQ3jhzK8ZgCua/qocB2qYWW6WfTkQsIv0PN+mh1oY5lWDcJEq5HbvtgtcwXxOb/7muphr5rg= 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 1685117380767565.022923934759; Fri, 26 May 2023 09:09:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zzl-0004Hf-BW; Fri, 26 May 2023 12:08:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzj-0004HU-NQ for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzh-0002gZ-Sc for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:47 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-621-DkYJChgwPuGoIeOqt0pECQ-1; Fri, 26 May 2023 12:08:43 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5147d242f01so702873a12.0 for ; Fri, 26 May 2023 09:08:43 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id c22-20020a170906695600b0094f3b18044bsm2317542ejs.218.2023.05.26.09.08.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117325; 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=AyK+JFuQXKSU38DGc74kF1FDRIy1j+0WYlw1VmPseSk=; b=NNA7gyYnv0QaYDhv5U5QqJoHN219bhaEf6qBfAR6uO9UONBciL50Sw2SVRS/FrgB6h2Gq/ jzQC4yZ5WDyCwJHXPo55Toy1pGQNZPP9/8pXXX9hlhvspsPf7qHY3o54Sal9L0sAjwgiXe Wviij+R8ftLtLl/7dIOXNmoBK2K7Y/Q= X-MC-Unique: DkYJChgwPuGoIeOqt0pECQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117322; x=1687709322; 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=AyK+JFuQXKSU38DGc74kF1FDRIy1j+0WYlw1VmPseSk=; b=lY6X8Z1davQo8Eekrpze2ikSTn+Z8Vg+TCo0a2fELfOX4niKOoYnK9rBc85/bmu1wd 3LM+gheT+FGtAcBMuNO+eWlLwN8ZW31vHCW43WTfjJOSf6O8+roOFowQlnteBi+FZ6Ug GdwHBqt05mE3Nhp7LD82OR497JvQEpToG4Em/5mfa6Phmm6xptk2B2wk15zYfDu/7x/n QpvbT/Xw7+QFdJXjgTF6LuNMTViJfND751WeVni9HpHNNUa3j6Y7PhJBpqlfDTNquZ4S ZAgoMaUZhCVkk9+uKNxcjba1zs2sXDddUNUwmzr6IiGq8GRugbX4ZEJxEWVm3xKwfNyC h+xA== X-Gm-Message-State: AC+VfDxJ/WBctSWKpi2+eOy2PcrN3k1cxvW0zsb8u7oXvrRzzYcccMp+ 5qk/QDhk3bsgBqvvmuN/u6yKmjJVUD7WtcAj8cF7rvaAzMnr36lAkBgPzxSzcdhonE2ry0Eyc5P BOD2RySZ5vD+TBvGCnWPaR3jXT3SiVybX+pz/SIpF34Y0J/W65H5a87ivC9Ji0lOjxeIaCj0mLw Y= X-Received: by 2002:a05:6402:1e8f:b0:506:bbf8:5152 with SMTP id f15-20020a0564021e8f00b00506bbf85152mr6240540edf.9.1685117322338; Fri, 26 May 2023 09:08:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Q3dMGoXmsoCebX5Q8qQXqyVF+LdZ/WG3NoNSgyhwNTuxSQaCF78KQKRyCwnZJeYebFEEARA== X-Received: by 2002:a05:6402:1e8f:b0:506:bbf8:5152 with SMTP id f15-20020a0564021e8f00b00506bbf85152mr6240521edf.9.1685117322136; Fri, 26 May 2023 09:08:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 10/12] meson: use subproject for internal libfdt Date: Fri, 26 May 2023 18:08:22 +0200 Message-Id: <20230526160824.655279-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117381356100002 Recent dtc/libfdt can use either Make or meson as the build system. By using a subproject, our own meson.build can remove the hard coded list of source files. This is also the first step towards managing downloads with .wrap files instead of submodule. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- .gitmodules | 4 ++-- configure | 2 +- meson.build | 24 ++++-------------------- scripts/archive-source.sh | 2 +- dtc =3D> subprojects/dtc | 0 5 files changed, 8 insertions(+), 24 deletions(-) rename dtc =3D> subprojects/dtc (100%) diff --git a/.gitmodules b/.gitmodules index 2a3a12033c4b..3ed5d073d630 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,8 +13,8 @@ [submodule "roms/qemu-palcode"] path =3D roms/qemu-palcode url =3D https://gitlab.com/qemu-project/qemu-palcode.git -[submodule "dtc"] - path =3D dtc +[submodule "subprojects/dtc"] + path =3D subprojects/dtc url =3D https://gitlab.com/qemu-project/dtc.git [submodule "roms/u-boot"] path =3D roms/u-boot diff --git a/configure b/configure index 9cdce69b7852..d42bbd07310b 100755 --- a/configure +++ b/configure @@ -1187,7 +1187,7 @@ fi case "$fdt" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. - git_submodules=3D"${git_submodules} dtc" + git_submodules=3D"${git_submodules} subprojects/dtc" ;; esac =20 diff --git a/meson.build b/meson.build index 218428841d36..884b16c74962 100644 --- a/meson.build +++ b/meson.build @@ -3088,26 +3088,10 @@ if fdt_required.length() > 0 or fdt_opt =3D=3D 'ena= bled' error('libfdt source not found - please pull git submodule') endif =20 - fdt_files =3D files( - 'dtc/libfdt/fdt.c', - 'dtc/libfdt/fdt_ro.c', - 'dtc/libfdt/fdt_wip.c', - 'dtc/libfdt/fdt_sw.c', - 'dtc/libfdt/fdt_rw.c', - 'dtc/libfdt/fdt_strerror.c', - 'dtc/libfdt/fdt_empty_tree.c', - 'dtc/libfdt/fdt_addresses.c', - 'dtc/libfdt/fdt_overlay.c', - 'dtc/libfdt/fdt_check.c', - ) - - fdt_inc =3D include_directories('dtc/libfdt') - libfdt =3D static_library('fdt', - build_by_default: false, - sources: fdt_files, - include_directories: fdt_inc) - fdt =3D declare_dependency(link_with: libfdt, - include_directories: fdt_inc) + libfdt_proj =3D subproject('dtc', required: true, + default_options: ['tools=3Dfalse', 'yaml=3Dd= isabled', + 'python=3Ddisabled', 'defau= lt_library=3Dstatic']) + fdt =3D libfdt_proj.get_variable('libfdt_dep') endif else fdt_opt =3D 'disabled' diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index c03532915471..a7c2886334f0 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ sub_file=3D"${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules=3D"dtc ui/keycodemapdb" +submodules=3D"subprojects/dtc ui/keycodemapdb" submodules=3D"$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-= testfloat-3" sub_deinit=3D"" =20 diff --git a/dtc b/subprojects/dtc similarity index 100% rename from dtc rename to subprojects/dtc --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117501; cv=none; d=zohomail.com; s=zohoarc; b=mqCkiV+4zggZh7YmVEHBSakhMCy3uiTFRrFr6+18YSuNGJvFqzf+nms0Qp7OGnfzRGVXgu0fVKe8vUep3hB4dHifIel4NhRPyye1OXgg7GtulTwi+b8o8vx0+iaWgW7+47xtelxhYgeeCwag11sr+9+NmRTio0pFP/+JVghLIEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117501; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fNAYahTYeswlLkdsp4UV78W2LiMyzPFTpEnfkmkx2I8=; b=dTs8fMu6XDb5v+CmAqlKV5CzDyG5zhmoKiqp7HL0im8qqdfbrbyuHsU9KtRR11twDPNJUGarA94R/Hkb1FrHWmZSpt/YjIlQvFjZ0dGf//6ApL2pjUBo85cv/OMbPUFN+mA+AINM1y67wbprOc2tvAFptIvFeP464TQPKzX/zFA= 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 1685117501152964.0736060477967; Fri, 26 May 2023 09:11:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zzn-0004IW-3n; Fri, 26 May 2023 12:08:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzl-0004Hs-DS for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzj-0002gn-Hs for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:49 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-550-i9v8YQhKMwiye3ljrVbJIw-1; Fri, 26 May 2023 12:08:45 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-514559574a9so1138004a12.1 for ; Fri, 26 May 2023 09:08:45 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j12-20020aa7c0cc000000b0051446e55cb0sm85825edp.81.2023.05.26.09.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117326; 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=fNAYahTYeswlLkdsp4UV78W2LiMyzPFTpEnfkmkx2I8=; b=ePSfyrv69PuPDJCUDz/ol8MpaOc9sl59tpzNPRMCkrn0hqHExx3ZqNMMzTuIwYpovP43yc veIKSUH9BvsuAqRLJLpqIWMQFZFhiP7X1PA8ugilk9E22sPhOKEI3Mql4r44q1/RBdak97 aCah4XXvfM9Qnr0/KDzEAPYoLO5KPQs= X-MC-Unique: i9v8YQhKMwiye3ljrVbJIw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117324; x=1687709324; 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=fNAYahTYeswlLkdsp4UV78W2LiMyzPFTpEnfkmkx2I8=; b=KT1zqdnMp0X3kT3PxfuJgVz0H1kYbLje3RKAurg+pYjJd/I8C53YR2IzQ4zUAJHWBt 3mAyyoSvLX5BykZOkHt17FFzkD1p68Y7hZ9KiSAesnZ3EwvqPPoCDg00I0gjSPCsJzc/ 5V8zbyOmyB1y9q+04Q0hxURFmVwxiAJpWpLaEWRI0otttEFRMkfdBqZysprYEAETc5Of CcrfZC9Exj27px1+ACXQHGtxFWPYPki6WimPLdAUulVjs2n6GvMpll0v4P5wN8iNWV7N 3dhWDtXEYFFVO15alrVE0Y0v8YUXKwsNUL4YVG1TGcXc3lsqPrB8Rk3B1EJVNTA4Qp7A SLbQ== X-Gm-Message-State: AC+VfDyb9/EtVz388t0zuD+5dIV8cgYbmduRPCWL/ShvfrBirLjCSNwC KpvNATv+DRKBcq7G4b+F+78IQSMA5W6d9Cg1Ofb+gzy19DgcWIqTSYpZuVwnHy3hOcyNjdA+XSa gMdAKytvZLYlPG3mnFkdgr8UV/gjhYnTVM0umvZV4CuE55W7eblfr/aapkZgREtn1OrEp5xZel+ o= X-Received: by 2002:a05:6402:2753:b0:50d:83d4:6174 with SMTP id z19-20020a056402275300b0050d83d46174mr5833045edd.12.1685117323898; Fri, 26 May 2023 09:08:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5vZsBDdACPKtRiOHMj8qX+puK0/lcQmSo/BX0tp5KIDhCvlTUvqDPQvQKxj1CsW0G8gBNq4w== X-Received: by 2002:a05:6402:2753:b0:50d:83d4:6174 with SMTP id z19-20020a056402275300b0050d83d46174mr5833030edd.12.1685117323641; Fri, 26 May 2023 09:08:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 11/12] meson: use subproject for keycodemapdb Date: Fri, 26 May 2023 18:08:23 +0200 Message-Id: <20230526160824.655279-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117502015100001 By using a subproject, our own meson.build can use variables from the subproject instead of hard-coded paths. This is also the first step towards managing downloads with .wrap files instead of submodule. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- .gitmodules | 4 ++-- configure | 4 ++-- scripts/archive-source.sh | 2 +- {ui =3D> subprojects}/keycodemapdb | 0 ui/meson.build | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) rename {ui =3D> subprojects}/keycodemapdb (100%) diff --git a/.gitmodules b/.gitmodules index 3ed5d073d630..f8b2ddf3877c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,8 +25,8 @@ [submodule "roms/QemuMacDrivers"] path =3D roms/QemuMacDrivers url =3D https://gitlab.com/qemu-project/QemuMacDrivers.git -[submodule "ui/keycodemapdb"] - path =3D ui/keycodemapdb +[submodule "subprojects/keycodemapdb"] + path =3D subprojects/keycodemapdb url =3D https://gitlab.com/qemu-project/keycodemapdb.git [submodule "roms/seabios-hppa"] path =3D roms/seabios-hppa diff --git a/configure b/configure index d42bbd07310b..0e9305848955 100755 --- a/configure +++ b/configure @@ -253,7 +253,7 @@ else git_submodules_action=3D"ignore" fi =20 -git_submodules=3D"ui/keycodemapdb" +git_submodules=3D"subprojects/keycodemapdb" git=3D"git" debug_tcg=3D"no" docs=3D"auto" @@ -805,7 +805,7 @@ case $git_submodules_action in fi ;; ignore) - if ! test -f "$source_path/ui/keycodemapdb/README" + if ! test -f "$source_path/subprojects/keycodemapdb/README" then echo echo "ERROR: missing GIT submodules" diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index a7c2886334f0..dba5ae05b67e 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ sub_file=3D"${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules=3D"subprojects/dtc ui/keycodemapdb" +submodules=3D"subprojects/dtc subprojects/keycodemapdb" submodules=3D"$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-= testfloat-3" sub_deinit=3D"" =20 diff --git a/ui/keycodemapdb b/subprojects/keycodemapdb similarity index 100% rename from ui/keycodemapdb rename to subprojects/keycodemapdb diff --git a/ui/meson.build b/ui/meson.build index 330369707dd7..e09b616a66bc 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -162,15 +162,15 @@ keymaps =3D [ ] =20 if have_system or xkbcommon.found() + keycodemapdb_proj =3D subproject('keycodemapdb', required: true) foreach e : keymaps output =3D 'input-keymap-@0@-to-@1@.c.inc'.format(e[0], e[1]) genh +=3D custom_target(output, output: output, capture: true, - input: files('keycodemapdb/data/keymaps.csv'), - command: [python, files('keycodemapdb/tools/keymap-gen'), - 'code-map', - '--lang', 'glib2', + input: keycodemapdb_proj.get_variable('keymaps_csv'), + command: [python, keycodemapdb_proj.get_variable('keymap= _gen').full_path(), + 'code-map', '--lang', 'glib2', '--varname', 'qemu_input_map_@0@_to_@1@'.forma= t(e[0], e[1]), '@INPUT0@', e[0], e[1]]) endforeach --=20 2.40.1 From nobody Wed Feb 11 06:07:44 2026 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=1685117427; cv=none; d=zohomail.com; s=zohoarc; b=dUCo+HSkaW9HWXZRumWckfDDjfT+uhycGP/JFHGzrDlI3tKTCPGV3CwjvIqSHh/+xWUbUB2Zmb2+TBnBOetV1XtV9TjaFYwooh0/ry2KLY6H/GqTKsaTVQO2K9ZCzl9Tt2CSr3DYHwLohBoOP5BFFt5Hgv+B2e5gg+0Hhd3j+Nw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685117427; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BecGd9dO3ZhSYDouC1mKTnkS4/+M2ywTdjMl2CKrfe4=; b=BMxKgcnEyX4pDhLQfETLBw148EiGAxB+4qs4DPq61q1aWv27HeNbPbPxi8lZyLnu3V0mwVoZZs22oP6p25F1VixNTyQCb6MkIkIsnxwOVR5umpUVR8+gkQHemk21Xk5lgsDmR70+Oj0HdxqpX/8RO44fMMN5DvtM7Yw/KRWWkqw= 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 1685117427795685.3493025492239; Fri, 26 May 2023 09:10:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Zzo-0004J1-2K; Fri, 26 May 2023 12:08:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzm-0004IR-TB for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2Zzk-0002h6-Qg for qemu-devel@nongnu.org; Fri, 26 May 2023 12:08:50 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-68-DZgDKjtaM6-0MsG2VnzsqA-1; Fri, 26 May 2023 12:08:46 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-96f83033b48so112363266b.3 for ; Fri, 26 May 2023 09:08:46 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id y17-20020a17090614d100b009658475919csm2291004ejc.188.2023.05.26.09.08.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:08:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685117328; 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=BecGd9dO3ZhSYDouC1mKTnkS4/+M2ywTdjMl2CKrfe4=; b=esG2GhRLkh/MFd7dyHi4GKXfqWq1qU++zpJvtUafQNXgv9ibz6f97EbJVm+8RjwZO8xq0p Stl9wI9VUzks0hSZSbho4lMZfaEoHoc55syHCIvFYyJISIlxVZIMAjJuk1wyTZwdvJQafW Cg5yBmjJqBM1ewXmDPGZwhVI05CAp1A= X-MC-Unique: DZgDKjtaM6-0MsG2VnzsqA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685117325; x=1687709325; 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=BecGd9dO3ZhSYDouC1mKTnkS4/+M2ywTdjMl2CKrfe4=; b=iCNP7CzcCZwUBlvIddRuKZOO81HwyfZg/hzbUiAHzLYhBd3i1tX+rRgLtCg7GF/s23 Jah/lij3IVfuM7hAqldHVU94E3RIjQNy4IyQtCTjzL3JxT+K5Q+6Mr0fNRfPD8QIICKC 55uXvqBQa8WAQs1kt+PLoGCD6diwJOhvmCeRS6j7yXvUeK5vKHzd2dw79LcugsHt3i+j NFy2gwnOup8fsVgXLyw5/vKo77bMrLR4o7rHG9IX3rZYLicc+B5j5TGm0blK00IqVFVz AJnTZ2n8fT0kZ3PgEnx0wNvBNq43n1juPcub48sm7dcjcT8+4amrC1Owm/MLB3GW15CF Re2g== X-Gm-Message-State: AC+VfDzqFZtR1iPLJLHW//yOMPA2hFwVWeeHMN70H1HYH2vx00LoUyx8 1bMXVdcxlh2+v9h2NwKBpKGfUFq+O/qwUB2f98RimYiEskK5w8Z/XdZuAh/z/KmBvmlA9DIC0Qw +5LlmN3oDkY9d8WV3EYlrFeUx98ZqZDXM2gHNK4XdfRL7hMCn+EvERByiWbin1wQLLG5rerLwh9 E= X-Received: by 2002:a17:906:ee88:b0:96a:928c:d382 with SMTP id wt8-20020a170906ee8800b0096a928cd382mr2186608ejb.48.1685117325482; Fri, 26 May 2023 09:08:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4dM1CoV0rPhbPBGaRFetb5yIVSxZprYHAUI2061DfnkCpdhMEWYgJ+9wBOvZAcUpACBUEP6A== X-Received: by 2002:a17:906:ee88:b0:96a:928c:d382 with SMTP id wt8-20020a170906ee8800b0096a928cd382mr2186590ejb.48.1685117325099; Fri, 26 May 2023 09:08:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/12] configure: ignore --make Date: Fri, 26 May 2023 18:08:24 +0200 Message-Id: <20230526160824.655279-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526160824.655279-1-pbonzini@redhat.com> References: <20230526160824.655279-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, 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: 1685117429420100003 Content-Type: text/plain; charset="utf-8" Setting the MAKE variable to a GNU Make executable does not really have any effect: if a non-GNU Make is used, the QEMU Makefile will fail to parse. Just remove everything related to --make and $make as dead code. Signed-off-by: Paolo Bonzini --- configure | 18 +----------------- meson.build | 1 - 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/configure b/configure index 0e9305848955..d674a9667310 100755 --- a/configure +++ b/configure @@ -400,20 +400,16 @@ gnu/kfreebsd) ;; freebsd) bsd=3D"yes" - make=3D"${MAKE-gmake}" # needed for kinfo_getvmmap(3) in libutil.h ;; dragonfly) bsd=3D"yes" - make=3D"${MAKE-gmake}" ;; netbsd) bsd=3D"yes" - make=3D"${MAKE-gmake}" ;; openbsd) bsd=3D"yes" - make=3D"${MAKE-gmake}" ;; darwin) bsd=3D"yes" @@ -421,7 +417,6 @@ darwin) ;; sunos) solaris=3D"yes" - make=3D"${MAKE-gmake}" ;; haiku) pie=3D"no" @@ -525,9 +520,6 @@ case "$cpu" in CPU_CFLAGS=3D"-m64 -mcpu=3Dultrasparc" ;; esac =20 -: ${make=3D${MAKE-make}} - - check_py_version() { # We require python >=3D 3.7. # NB: a True python conditional creates a non-zero return code (Failur= e) @@ -630,7 +622,7 @@ for opt do ;; --objcc=3D*) ;; - --make=3D*) make=3D"$optarg" + --make=3D*) ;; --install=3D*) ;; @@ -897,7 +889,6 @@ Advanced options (experts only): --cross-cc-ARCH=3DCC use compiler when building ARCH guest test ca= ses --cross-cc-cflags-ARCH=3D use compiler flags when building ARCH guest t= ests --cross-prefix-ARCH=3DPREFIX cross compiler prefix when building ARCH gu= est test cases - --make=3DMAKE use specified make [$make] --python=3DPYTHON use specified python [$python] --ninja=3DNINJA use specified ninja [$ninja] --smbd=3DSMBD use specified smbd [$smbd] @@ -950,11 +941,6 @@ then fi fi =20 -if ! has "$make" -then - error_exit "GNU make ($make) not found" -fi - if ! check_py_version "$python"; then error_exit "Cannot use '$python', Python >=3D 3.7 is required." \ "Use --python=3D/path/to/python to specify a supported Python= ." \ @@ -1777,7 +1763,6 @@ if test "$container" !=3D no; then echo "RUNC=3D$runc" >> $config_host_mak fi echo "ROMS=3D$roms" >> $config_host_mak -echo "MAKE=3D$make" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak @@ -2030,7 +2015,6 @@ preserve_env CXXFLAGS preserve_env LD preserve_env LDFLAGS preserve_env LD_LIBRARY_PATH -preserve_env MAKE preserve_env NM preserve_env OBJCFLAGS preserve_env OBJCOPY diff --git a/meson.build b/meson.build index 884b16c74962..2d48aa1e2ef3 100644 --- a/meson.build +++ b/meson.build @@ -4028,7 +4028,6 @@ summary(summary_info, bool_yn: true, section: 'Direct= ories') # Host binaries summary_info =3D {} summary_info +=3D {'git': config_host['GIT']} -summary_info +=3D {'make': config_host['MAKE']} summary_info +=3D {'python': '@0@ (version: @1@)'.format(python= .full_path(), python.language_version())} summary_info +=3D {'sphinx-build': sphinx_build} if config_host.has_key('HAVE_GDB_BIN') --=20 2.40.1