From nobody Mon May 6 12:10:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606377922; cv=none; d=zohomail.com; s=zohoarc; b=KXx9seEh0U2kRpRK3vBmLrtkuAfHduBlbJNJd0oLdUFiUL/iz+rLCRc7L7J6XvRt5RoZn0nBVXq3TZy9RboTK96ipvHHyHUZ1Op2TrzoXNkf4UKwq2mWryzPZgk8NhHRQ7smiqZRSjLcyMfvvHXtdbW+AukksTchW0JozZ5deXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606377922; 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=D2aLyrM1tfSGtiUWdWept7ozELi7c+yJBSlVcGctauk=; b=kl3Pkf73MdQJlZRr+P79Y/c8S6SCsOZyjlplnKqfDkVHISr15OI2H18GgK4EAsxPsOJEtdrAFVR2+tGqbWxezOiRtu+5z4nktPJIlF0VwjrEPBihSyYyMWA7DxEHJScug1HFU4JrUyAR9KirJm4SZ42YtWf+7DwiAvQW0AhJ4tI= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606377922622376.4533345427536; Thu, 26 Nov 2020 00:05:22 -0800 (PST) Received: from localhost ([::1]:49300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiCHJ-0007vh-GM for importer@patchew.org; Thu, 26 Nov 2020 03:05:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiCBj-0003Yd-26 for qemu-devel@nongnu.org; Thu, 26 Nov 2020 02:59:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kiCBh-0007Fw-Dy for qemu-devel@nongnu.org; Thu, 26 Nov 2020 02:59:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-455-R9VGmNEUOSOfYK_ktqcbEA-1; Thu, 26 Nov 2020 02:59:23 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6AEB87309D; Thu, 26 Nov 2020 07:59:22 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6596260855; Thu, 26 Nov 2020 07:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606377567; 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=D2aLyrM1tfSGtiUWdWept7ozELi7c+yJBSlVcGctauk=; b=gTQwCGig+jFAgbL1FkN9QdU9c8cTGH9OqFRn8HBqgYO7cyPMvwvYzO/nvbTRyHDFHboltZ r6jDtLqetBBkujjU/AxtzOU09f8UgJoHl7iDM0Yo6EphWgYMSaj5T9njshJciUvCfHLAUM 44MT+5y0QXqh/f2O9FRyTnHXtuOMigs= X-MC-Unique: R9VGmNEUOSOfYK_ktqcbEA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 1/5] meson: use dependency() to find libjpeg Date: Thu, 26 Nov 2020 02:59:17 -0500 Message-Id: <20201126075921.3116321-2-pbonzini@redhat.com> In-Reply-To: <20201126075921.3116321-1-pbonzini@redhat.com> References: <20201126075921.3116321-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Prefer pkg-config to find_library because some installations of libjpeg may place it outside the default search path. Reported-by: Stefan Weil Signed-off-by: Paolo Bonzini --- meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 5062407c70..360623ece9 100644 --- a/meson.build +++ b/meson.build @@ -654,9 +654,8 @@ if get_option('vnc').enabled() vnc =3D declare_dependency() # dummy dependency png =3D dependency('libpng', required: get_option('vnc_png'), method: 'pkg-config', static: enable_static) - jpeg =3D cc.find_library('jpeg', has_headers: ['jpeglib.h'], - required: get_option('vnc_jpeg'), - static: enable_static) + jpeg =3D dependency('libjpeg', required: get_option('vnc_jpeg'), + method: 'pkg-config', static: enable_static) sasl =3D cc.find_library('sasl2', has_headers: ['sasl/sasl.h'], required: get_option('vnc_sasl'), static: enable_static) --=20 2.26.2 From nobody Mon May 6 12:10:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606377715; cv=none; d=zohomail.com; s=zohoarc; b=EwUpkfCv9WR/zoVQLokNmvYm8ezUbvpecEcTAIWask7uCrJhuJDB9vS+5xbg9jdsuep8AeXKV4OfY9id6HuueWPWnWGo1m9jVFx/cMPxxKwfFAqirQGXVMk8ujTBXV1btPXGKjg/7NPIUUp+2Q2S23CR9a6mpCvJeKGxXeP57oY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606377715; 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=2v4a8dtkHjMlGEaKD3psu8JUdLX0AIWK/wxoBPTbn2Y=; b=PpXkvlvUZ1SQhWaNUm4LL4vOVn/jkfPhFXJJi0PD9PQ3SjMxapOGyQr7Ik7EP3OI+K8zlPW1V66KFRW/pUnSYsvk1G15qGVH+f4djLpjG81V2lFTpeTaDRc+tpEOC2dMjrBoYjsrQTbgZKPTLsKsPuAgOjmTz13XgRFaHZbggx4= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606377714954181.71323297142249; Thu, 26 Nov 2020 00:01:54 -0800 (PST) Received: from localhost ([::1]:41942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiCDx-0004sd-98 for importer@patchew.org; Thu, 26 Nov 2020 03:01:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiCBf-0003Rw-93 for qemu-devel@nongnu.org; Thu, 26 Nov 2020 02:59:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26026) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kiCBc-0007Fu-Su for qemu-devel@nongnu.org; Thu, 26 Nov 2020 02:59:30 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-378-H5Hf2C9hNtmqmFG77Mbr5w-1; Thu, 26 Nov 2020 02:59:24 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D7A09A225; Thu, 26 Nov 2020 07:59:23 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7CF460855; Thu, 26 Nov 2020 07:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606377567; 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=2v4a8dtkHjMlGEaKD3psu8JUdLX0AIWK/wxoBPTbn2Y=; b=V/BS4rtHN4k8DyTRNV/W0VSzk2i8cLZjIGHCXEi46EkXeouiciF1zQD1x3QoiA6Wu2gOmv RiSr4okbOBRPOmqCTtby/U1Vd9kYnqOrdjmOlcRsbeGLXvtZ/NsdkAI2upK1xLNbT/a7tD 2Im43izKLi2c6gbO4U3CuyZx9WYBAGs= X-MC-Unique: H5Hf2C9hNtmqmFG77Mbr5w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/5] configure: remove python pkg_resources check Date: Thu, 26 Nov 2020 02:59:18 -0500 Message-Id: <20201126075921.3116321-3-pbonzini@redhat.com> In-Reply-To: <20201126075921.3116321-1-pbonzini@redhat.com> References: <20201126075921.3116321-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Olaf Hering , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Olaf Hering Since meson.git#0240d760c7699a059cc89e584363c6431cdd2b61 setuptools is not = required anymore. Signed-off-by: Olaf Hering Reviewed-by: Thomas Huth Message-Id: <20201124211925.4194-1-olaf@aepfle.de> Signed-off-by: Paolo Bonzini --- configure | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure b/configure index 796cec14de..18c26e0389 100755 --- a/configure +++ b/configure @@ -1912,9 +1912,6 @@ fi =20 case "$meson" in git | internal) - if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then - error_exit "Python setuptools not found" - fi meson=3D"$python ${source_path}/meson/meson.py" ;; *) meson=3D$(command -v "$meson") ;; --=20 2.26.2 From nobody Mon May 6 12:10:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606377721; cv=none; d=zohomail.com; s=zohoarc; b=aitsxF0wlZkmajSPO0lIg3PH0zQcCnkVTbaeRPvj+q2mpmOrGIpZQvxj3vyh0BlP8l0sDbyr+vYdMSgoEqkEsT7hrUza8ftlsS5hyujJ1/+7k5j1eGAy+M6lUrAcwVJocFuUaJ1E3PBIGzyKyohz3HQorUabnly8eoIYMfNcmQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606377721; 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=XoLew6fCJvQ4C8y1gmDHrdDLwCAMji/JWWXDSHwIdec=; b=Ig6Q3xu7IVxUzMRgPrzmMU0DGdNLVHWlTMnSQ5rLigDWhzbEY1kyb/QLQs/ZgoGK8X5ARpzgfYc3lbFvChl+Me1E1NUZn+OfldAILzdQE17YZzracB9F37bvXv77oCXyrpV1sBDQeS62pSDStPi3cEfIYfgp0pAnU6/fudH9N8g= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606377721412331.37626816803663; Thu, 26 Nov 2020 00:02:01 -0800 (PST) Received: from localhost ([::1]:42024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiCE2-0004ub-21 for importer@patchew.org; Thu, 26 Nov 2020 03:01:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiCBg-0003SH-7S for qemu-devel@nongnu.org; Thu, 26 Nov 2020 02:59:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kiCBd-0007G7-3d for qemu-devel@nongnu.org; Thu, 26 Nov 2020 02:59:31 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-4-4OcnuACUNg20qTcX7D59Ww-1; Thu, 26 Nov 2020 02:59:24 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CD83A185E490 for ; Thu, 26 Nov 2020 07:59:23 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E6BF60855; Thu, 26 Nov 2020 07:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606377568; 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=XoLew6fCJvQ4C8y1gmDHrdDLwCAMji/JWWXDSHwIdec=; b=OpwWOlRA3dZBVI4Sa2VEohquWaVUmo7svrVibbG6vzkYHma1DxHekY5sGOSdzk32cpZ6zu Q3Ba3Qqarj2GxMJaRX3oUtNhDYxtPNSq5OEXAKhB5HnduN5URvDJQOxBkVMD8bCFIraK/J z9IElYHhfLnuDWCjuW8BUfV9o8dB9dA= X-MC-Unique: 4OcnuACUNg20qTcX7D59Ww-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 3/5] tests/docker, tests/vm: remove setuptools from images Date: Thu, 26 Nov 2020 02:59:19 -0500 Message-Id: <20201126075921.3116321-4-pbonzini@redhat.com> In-Reply-To: <20201126075921.3116321-1-pbonzini@redhat.com> References: <20201126075921.3116321-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Setuptools is not needed anymore by the bundled copy of meson, remove it. Suggested-by: Thomas Huth Signed-off-by: Paolo Bonzini --- .cirrus.yml | 1 - tests/docker/dockerfiles/debian10.docker | 1 - tests/docker/dockerfiles/fedora-win32-cross.docker | 1 - tests/docker/dockerfiles/fedora-win64-cross.docker | 1 - tests/vm/freebsd | 1 - tests/vm/haiku.x86_64 | 1 - tests/vm/netbsd | 1 - tests/vm/openbsd | 1 - 8 files changed, 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f0209b7a3e..2e45b3254f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -85,7 +85,6 @@ windows_msys2_task: C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --need= ed \ diffutils git grep make pkg-config sed \ mingw-w64-x86_64-python \ - mingw-w64-x86_64-python-setuptools \ mingw-w64-x86_64-toolchain \ mingw-w64-x86_64-SDL2 \ mingw-w64-x86_64-SDL2_image \ diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/docker= files/debian10.docker index 21cc671d71..73a3caac9c 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -30,7 +30,6 @@ RUN apt update && \ pkg-config \ psmisc \ python3 \ - python3-setuptools \ python3-sphinx \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) =20 diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index 5903e1b0b4..087df598a0 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -30,7 +30,6 @@ ENV PACKAGES \ perl-Test-Harness \ python3 \ python3-PyYAML \ - python3-setuptools \ tar \ which =20 diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 7f03cd8ffc..d5d2f5f00d 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -26,7 +26,6 @@ ENV PACKAGES \ perl-Test-Harness \ python3 \ python3-PyYAML \ - python3-setuptools \ tar \ which =20 diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 04ee793381..09f3ee6cb8 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -33,7 +33,6 @@ class FreeBSDVM(basevm.BaseVM): "pkgconf", "bzip2", "python37", - "py37-setuptools", "ninja", =20 # gnu tools diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 index 37af48bf1b..2eb736dae1 100755 --- a/tests/vm/haiku.x86_64 +++ b/tests/vm/haiku.x86_64 @@ -77,7 +77,6 @@ class HaikuVM(basevm.BaseVM): "devel:libusb_1.0", "devel:libz", "ninja", - "setuptools_python3" ] =20 # https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (re= versed order) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 596717cc76..b9efc269d2 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -31,7 +31,6 @@ class NetBSDVM(basevm.BaseVM): "pkgconf", "xz", "python37", - "py37-setuptools", "ninja-build", =20 # gnu tools diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 386b2c72f7..4d1399378e 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -30,7 +30,6 @@ class OpenBSDVM(basevm.BaseVM): "git", "pkgconf", "bzip2", "xz", - "py3-setuptools", "ninja", =20 # gnu tools --=20 2.26.2 From nobody Mon May 6 12:10:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606378036; cv=none; d=zohomail.com; s=zohoarc; b=e3nzaEE3FIwoLe8G6bj0arc/cUgQeKMHKhzEzlw7zbKB8et1tYAnmId7XQBjOjok99fXjwG3lWp6dMZmkaXsYvUqpbwNCI5OJs5VpJG3oW52pK13B/RecbOG6+OM2lYJJsNUGgV5vCch56rxcIc4I02A3svG5ow8qq0TJwW07U0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606378036; 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=8q7SRaneaETkvZvvdP49m+lKaklZq3Z1IrJrbscMkKk=; b=Qc4fb/wyaW8kdifgtHQGi3vOnum1JwAhSjdupdA8PQ6y9Ln4sDQW+LidII3XfObaCbZn86Glmoo8pxfAThAHgKTEFq3oGOmTkSir7Ra7ov3FVoBrRV2EkoB1m5cdyMFMVslgk4Vg8ifeRDM5vO0YMX9jW8t/m8xMKoq9j8kRJqY= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606378036730222.50267623515117; Thu, 26 Nov 2020 00:07:16 -0800 (PST) Received: from localhost ([::1]:53452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiCJ9-0001Yg-7b for importer@patchew.org; Thu, 26 Nov 2020 03:07:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiCBk-0003cc-VS for qemu-devel@nongnu.org; Thu, 26 Nov 2020 02:59:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49609) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kiCBi-0007Gw-TF for qemu-devel@nongnu.org; Thu, 26 Nov 2020 02:59:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-249-qIBns7UyMBqqv3hKK4osJw-1; Thu, 26 Nov 2020 02:59:25 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 67C9B9A234; Thu, 26 Nov 2020 07:59:24 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE06B60855; Thu, 26 Nov 2020 07:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606377569; 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=8q7SRaneaETkvZvvdP49m+lKaklZq3Z1IrJrbscMkKk=; b=BDW9SamEuK46GEo6iQDMYpkwO1DA0wxvGBDBIM8Fn2RXJY68HNiDPQKH3M7IPrFug/M9Ek NTU0MhAF4NI0PdYnmAZY2g4FQRLkyVidUlCEYwdcTx5jt5DahK9y4t4R2EZ8uT1aGArzh9 jVsja801SLS+xN1GYkf2cF4ZY6Iru4s= X-MC-Unique: qIBns7UyMBqqv3hKK4osJw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 4/5] target/i386: fix operand order for PDEP and PEXT Date: Thu, 26 Nov 2020 02:59:20 -0500 Message-Id: <20201126075921.3116321-5-pbonzini@redhat.com> In-Reply-To: <20201126075921.3116321-1-pbonzini@redhat.com> References: <20201126075921.3116321-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lenard Szolnoki , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" For PDEP and PEXT, the mask is provided in the memory (mod+r/m) operand, and therefore is loaded in s->T0 by gen_ldst_modrm. The source is provided in the second source operand (VEX.vvvv) and therefore is loaded in s->T1. Fix the order in which they are passed to the helpers. Reported-by: Lenard Szolnoki Analyzed-by: Lenard Szolnoki Fixes: https://bugs.launchpad.net/qemu/+bug/1605123 Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- target/i386/translate.c | 8 +++---- tests/tcg/i386/Makefile.target | 3 +++ tests/tcg/i386/test-i386-bmi2.c | 40 +++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 tests/tcg/i386/test-i386-bmi2.c diff --git a/target/i386/translate.c b/target/i386/translate.c index 4c57307e42..e8f5f5803a 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -3936,14 +3936,14 @@ static void gen_sse(CPUX86State *env, DisasContext = *s, int b, } ot =3D mo_64_32(s->dflag); gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); - /* Note that by zero-extending the mask operand, we + /* Note that by zero-extending the source operand, we automatically handle zero-extending the result. */ if (ot =3D=3D MO_64) { tcg_gen_mov_tl(s->T1, cpu_regs[s->vex_v]); } else { tcg_gen_ext32u_tl(s->T1, cpu_regs[s->vex_v]); } - gen_helper_pdep(cpu_regs[reg], s->T0, s->T1); + gen_helper_pdep(cpu_regs[reg], s->T1, s->T0); break; =20 case 0x2f5: /* pext Gy, By, Ey */ @@ -3954,14 +3954,14 @@ static void gen_sse(CPUX86State *env, DisasContext = *s, int b, } ot =3D mo_64_32(s->dflag); gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); - /* Note that by zero-extending the mask operand, we + /* Note that by zero-extending the source operand, we automatically handle zero-extending the result. */ if (ot =3D=3D MO_64) { tcg_gen_mov_tl(s->T1, cpu_regs[s->vex_v]); } else { tcg_gen_ext32u_tl(s->T1, cpu_regs[s->vex_v]); } - gen_helper_pext(cpu_regs[reg], s->T0, s->T1); + gen_helper_pext(cpu_regs[reg], s->T1, s->T0); break; =20 case 0x1f6: /* adcx Gy, Ey */ diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index a66232a67d..ad187cb2c9 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -18,6 +18,9 @@ test-i386-pcmpistri: CFLAGS +=3D -msse4.2 run-test-i386-pcmpistri: QEMU_OPTS +=3D -cpu max run-plugin-test-i386-pcmpistri-%: QEMU_OPTS +=3D -cpu max =20 +run-test-i386-bmi2: QEMU_OPTS +=3D -cpu max +run-plugin-test-i386-bmi2-%: QEMU_OPTS +=3D -cpu max + # # hello-i386 is a barebones app # diff --git a/tests/tcg/i386/test-i386-bmi2.c b/tests/tcg/i386/test-i386-bmi= 2.c new file mode 100644 index 0000000000..e7a93b88b4 --- /dev/null +++ b/tests/tcg/i386/test-i386-bmi2.c @@ -0,0 +1,40 @@ +/* See if various BMI2 instructions give expected results */ +#include +#include + +int main(int argc, char *argv[]) { + char hello[16]; + uint64_t ehlo =3D 0x202020204f4c4845ull; + uint64_t mask =3D 0xa080800302020001ull; + uint64_t result64; + uint32_t result32; + + /* 64 bits */ + asm volatile ("pextq %2, %1, %0" : "=3Dr"(result64) : "r"(ehlo), "m"= (mask)); + assert(result64 =3D=3D 133); + + asm volatile ("pdepq %2, %1, %0" : "=3Dr"(result64) : "r"(result64),= "m"(mask)); + assert(result64 =3D=3D (ehlo & mask)); + + asm volatile ("pextq %2, %1, %0" : "=3Dr"(result64) : "r"(-1ull), "m= "(mask)); + assert(result64 =3D=3D 511); /* mask has 9 bits set */ + + asm volatile ("pdepq %2, %1, %0" : "=3Dr"(result64) : "r"(-1ull), "m= "(mask)); + assert(result64 =3D=3D mask); + + /* 32 bits */ + asm volatile ("pextl %2, %k1, %k0" : "=3Dr"(result32) : "r"(ehlo), "= m"(mask)); + assert(result32 =3D=3D 5); + + asm volatile ("pdepl %2, %k1, %k0" : "=3Dr"(result32) : "r"(result32= ), "m"(mask)); + assert(result32 =3D=3D (uint32_t)(ehlo & mask)); + + asm volatile ("pextl %2, %k1, %k0" : "=3Dr"(result32) : "r"(-1ull), = "m"(mask)); + assert(result32 =3D=3D 7); /* mask has 3 bits set */ + + asm volatile ("pdepl %2, %k1, %k0" : "=3Dr"(result32) : "r"(-1ull), = "m"(mask)); + assert(result32 =3D=3D (uint32_t)mask); + + return 0; +} + --=20 2.26.2 From nobody Mon May 6 12:10:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606377922; cv=none; d=zohomail.com; s=zohoarc; b=XxRpzTybW0Jq98nnF8v1CngO/SL2me0RXnvA8oJ/SZhXyZ8A4fmY0uu+IOS/JgKfrW8kf7JcJabluLWPVYxCV+XTkQSimG2h4Y4QoHGgjow4MICWxo1zcmCp9eYey6d4l/HVPdSe9yQOmxaDPKDvtWgdBZjTHG72Dgb/unnLrw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606377922; 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=Iscxj1bJF1udx8dBwJ7KFfb3EmPFrugWzsS5Mh1Qmxo=; b=FVhGuVQAsw0QQaZA/nRrxum4Cm0OIYI7es7sD4ehpoUtEM0rDAYbYlyWOWijvyxIupDzGBSlZlX3igO5Iq4zNy7+Nf9aXrwprVW++4lDodXBu+ZP9sbEjEUo1Spx/s+D3IvtETM1HcSjmfkwpRiQ2k5l2FiMRJQ0V1uLeHRqn7U= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606377922336330.0202987573524; Thu, 26 Nov 2020 00:05:22 -0800 (PST) Received: from localhost ([::1]:49268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiCHJ-0007uu-7c for importer@patchew.org; Thu, 26 Nov 2020 03:05:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiCBo-0003js-CI for qemu-devel@nongnu.org; Thu, 26 Nov 2020 02:59:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kiCBm-0007Hy-Ng for qemu-devel@nongnu.org; Thu, 26 Nov 2020 02:59:40 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-519-I2WZYXzNNm2BWrAw4I-h0A-1; Thu, 26 Nov 2020 02:59:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9C39E100C602; Thu, 26 Nov 2020 07:59:29 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8755860855; Thu, 26 Nov 2020 07:59:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606377573; 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=Iscxj1bJF1udx8dBwJ7KFfb3EmPFrugWzsS5Mh1Qmxo=; b=H8zTNSn1L+nf2AV/Hk6c+JQr1tJ3cKDl5VzvBm18Xb0SckNPDQSgkhtDKMsD47Kwe6S75F 61FJNPLhmE8FfctOD7bfbk/ArxPqCYBWbJrN4Um3ZpyoYYwHzTXvjRk5hr5GLgUiI4IGka BNb9s34jy3cqdKR2nICX3Tmpccn923I= X-MC-Unique: I2WZYXzNNm2BWrAw4I-h0A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 5/5] nsis: Fix build for 64 bit installer Date: Thu, 26 Nov 2020 02:59:21 -0500 Message-Id: <20201126075921.3116321-6-pbonzini@redhat.com> In-Reply-To: <20201126075921.3116321-1-pbonzini@redhat.com> References: <20201126075921.3116321-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Stefan Weil Pass cpu instead of cpu_family to the NSIS installer script. That script checks for "x86_64" which is the cpu value, while cpu_family is "x86". Signed-off-by: Stefan Weil Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20201125191833.964753-1-sw@weilnetz.de> Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 360623ece9..e3386196ba 100644 --- a/meson.build +++ b/meson.build @@ -1955,7 +1955,7 @@ if host_machine.system() =3D=3D 'windows' '@OUTPUT@', get_option('prefix'), meson.current_source_dir(), - host_machine.cpu_family(), + host_machine.cpu(), '--', '-DDISPLAYVERSION=3D' + meson.project_version(), ] --=20 2.26.2