From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620739716; cv=none; d=zohomail.com; s=zohoarc; b=HuYsqrzLqrMSCvDpQbaMU7aIWz/vPWNbX9qag016dpZn3pNSmca/JimIvf3mGNa3YNBp1HtmGUK3ThV7Zg+SxANWsadxZIWlnKODs9PZYWupOQo6Bs9S8smLzdfrcZMWaGW6rKNKj9TnIJnXNb85uLzzOKRcZHsFfuYsrFVtjLQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620739716; 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=r1uV31mwj4VV484kb2155hY7KbQDX2kssaks4YZlX8E=; b=Ks2TcFk/wovAw9AR8McIfGhmUSWVxO0XHQqJhl58LRX9keCnYm18s/KyIiOKW8nvufRTcJWIrmHeyj0pErSdyQHwkbUEqp2ewZv5ZvygJ5b2GEEdNm9tXDM2/aGLdKPICULYg4Z9ZDftFHA63PngmuvEfd9zeSrErsTPUV3i6kU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620739716444411.9372988414326; Tue, 11 May 2021 06:28:36 -0700 (PDT) Received: from localhost ([::1]:46302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSR9-0007uL-J0 for importer@patchew.org; Tue, 11 May 2021 09:28:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQ2-0005wj-HU for qemu-devel@nongnu.org; Tue, 11 May 2021 09:27:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21335) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQ0-0000Va-2k for qemu-devel@nongnu.org; Tue, 11 May 2021 09:27:26 -0400 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-214-91QT_EgbO-Wh5wnoRYwxvQ-1; Tue, 11 May 2021 09:27:21 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25608106BB29; Tue, 11 May 2021 13:27:20 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88C0F6E6F5; Tue, 11 May 2021 13:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739642; 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=r1uV31mwj4VV484kb2155hY7KbQDX2kssaks4YZlX8E=; b=TbYRxFp/JIg5qtnime1sZCj9a8obq5na3DGJwWLnkstM0motMBadwPVPqquCy6wEziBo4w u1QbfGUgIrePKwGIm4RkRfpS0hpmGPznhdDBTOvDi5M2YZt69RCKzNo2EO8bXWu6H6unAx Zel5o1WzYgHLqwPWIkGUABshk4je4gE= X-MC-Unique: 91QT_EgbO-Wh5wnoRYwxvQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 01/12] gitlab: move linux user build job from CentOS 7 to CentOS 8 Date: Tue, 11 May 2021 14:26:30 +0100 Message-Id: <20210511132641.1022161-2-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It has been over two years since RHEL-8 was released, and thus per the platform build policy, we no longer need to support RHEL-7 as a build target. Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.yml | 6 +++--- tests/docker/dockerfiles/centos8.docker | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dcb6317aac..23917d6d73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -441,12 +441,12 @@ build-user-plugins: MAKE_CHECK_ARGS: check-tcg timeout: 1h 30m =20 -build-user-centos7: +build-user-centos8: <<: *native_build_job_definition needs: - job: amd64-centos7-container + job: amd64-centos8-container variables: - IMAGE: centos7 + IMAGE: centos8 CONFIGURE_ARGS: --disable-system --disable-tools --disable-docs MAKE_CHECK_ARGS: check-tcg =20 diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index a8c6c528b0..b00809e9fc 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -13,6 +13,7 @@ ENV PACKAGES \ gettext \ git \ glib2-devel \ + glibc-static \ libaio-devel \ libepoxy-devel \ libfdt-devel \ --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620739733; cv=none; d=zohomail.com; s=zohoarc; b=Z7kFmgc4iLYQh1sIW8h88xnHA3ERgbiyyazabEu9132yXKRvYT4HHlHUnAKC9DHPzCcrCy7f0tVfgOrxN8IyN0zn7FlPSJ+R0DXpcAFVhwqdBG1JDZPJUJpKLxbb9jFL4MiJ+nSYuLkl+F+JgH2gGDAD8wO+4/lGRm3c2grJfEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620739733; 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=fjGv+pg1NQQyZlLaqmNbc+6hWXAk36eXjqKFoxFvng8=; b=Vczz3RjjQBSkKbNSz6Umo7rxZBcSIm5Qsff097BFeesBNcTp/dsz6dar/DwttJQIT+15+odJtpqPVOhtcAhyrhyszgT6NzFXmnI8ZUudqmChHXTz/iJ13537UzuX/1DdUwZEINbIkw2j4wsDYn3ws/hVe5J5AdEWJ/z91XO4Vrg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620739733093689.3286728627884; Tue, 11 May 2021 06:28:53 -0700 (PDT) Received: from localhost ([::1]:47224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSRQ-00007k-Du for importer@patchew.org; Tue, 11 May 2021 09:28:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQC-0006FQ-Tw for qemu-devel@nongnu.org; Tue, 11 May 2021 09:27:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQA-0000bN-TV for qemu-devel@nongnu.org; Tue, 11 May 2021 09:27:36 -0400 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-149-nucAUfRLP6GQru4EipKo1w-1; Tue, 11 May 2021 09:27:32 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 571FB107ACCD; Tue, 11 May 2021 13:27:31 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C83D19809; Tue, 11 May 2021 13:27:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739654; 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=fjGv+pg1NQQyZlLaqmNbc+6hWXAk36eXjqKFoxFvng8=; b=CFiufIpzXo0Wh108d4DUG08d9FfPvZw+gJ4VJm5107L7MY17L9plkVsMCSHGcZFVDXXZyu 4PAqTE965Ua6axrpPnxhjoxLga0zv7E89ppbLXpyXN8H9s3XepuZNMJBQqJNO3pSp3N2fl nIi0AIwaZGNRFmI0e5ZWK+qSlu5SVgQ= X-MC-Unique: nucAUfRLP6GQru4EipKo1w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 02/12] patchew: move quick build job from CentOS 7 to CentOS 8 container Date: Tue, 11 May 2021 14:26:31 +0100 Message-Id: <20210511132641.1022161-3-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It has been over two years since RHEL-8 was released, and thus per the platform build policy, we no longer need to support RHEL-7 as a build target. Signed-off-by: Daniel P. Berrang=C3=A9 --- .patchew.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.patchew.yml b/.patchew.yml index 988c29261f..2638b7f564 100644 --- a/.patchew.yml +++ b/.patchew.yml @@ -88,7 +88,7 @@ email: more information: =20 {{ logtext }} - {% elif test =3D=3D "docker-mingw@fedora" or test =3D=3D "docker-q= uick@centos7" or test =3D=3D "asan" %} + {% elif test =3D=3D "docker-mingw@fedora" or test =3D=3D "docker-q= uick@centos8" or test =3D=3D "asan" %} Hi, =20 This series failed the {{ test }} build test. Please find the test= ing commands and @@ -124,13 +124,13 @@ testing: script: | #!/bin/bash time make docker-test-debug@fedora TARGET_LIST=3Dx86_64-softmmu J= =3D14 NETWORK=3D1 - docker-quick@centos7: + docker-quick@centos8: enabled: false requirements: docker,x86_64 timeout: 3600 script: | #!/bin/bash - time make docker-test-quick@centos7 SHOW_ENV=3D1 J=3D14 NETWORK=3D1 + time make docker-test-quick@centos8 SHOW_ENV=3D1 J=3D14 NETWORK=3D1 checkpatch: enabled: true requirements: '' --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620739965; cv=none; d=zohomail.com; s=zohoarc; b=KiLqRs5yfK9Fp6ZG0qOiZLoUTAJ8VVRk/p+zcydVUp83KS+jn8wi95N7JjDBYWisNIlfx6ansU6/oYd19cuvOj0KjFRdF/B2ivgZS8nh6uWAb2gEY+CaTKU9Hend68dhGpBZaY7yH2G3RRtLaKyhEF4wWOxpX58STUOI4gXaTGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620739965; 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=5Ll+XB2WpVJW2oul37pM4a12d/mXt7DY3igx/4bTbQ8=; b=WPRf1xIQXkcXF+1layxyhBNGwzhgfpJocKyg0yvegKeXixKl3EK798lTIGOMCcq3uPPzZbG4m/Uoc5erjyPXrGTvAehkycB07wq0yXDqOB9x4ExH631dDuwoymezHA4jaiLVfaHcJwAMFPUACAeROOCc9J8F9F/PgdXat4hrQ2c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620739965880386.59301672418394; Tue, 11 May 2021 06:32:45 -0700 (PDT) Received: from localhost ([::1]:56032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSVB-0006Cn-4k for importer@patchew.org; Tue, 11 May 2021 09:32:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQj-0007SK-8Q for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36264) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQh-0000um-9u for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:08 -0400 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-266-ak3ETgcXMgO42CVofmtiGQ-1; Tue, 11 May 2021 09:28:05 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C9FF9F951; Tue, 11 May 2021 13:28:04 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id B541F6E700; Tue, 11 May 2021 13:27:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739686; 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=5Ll+XB2WpVJW2oul37pM4a12d/mXt7DY3igx/4bTbQ8=; b=Q9FdSTXGua6P3G1xVHTlp35RX2pwWlosBSlH7uXbkVrYZlLW9VA0i2JZvQ18ybxvm49YuX T6ahHUOPtxSbZHKVlS3Zxu7GsqUEt23L2te4TOTthVaBIKbXwV6nrgz1DOsvLPJzB4xCqB dCV7Bm3l6rW5boDuOq6YdfEMdeR0I0s= X-MC-Unique: ak3ETgcXMgO42CVofmtiGQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 03/12] crypto: bump min nettle to 3.3, dropping RHEL-7 support Date: Tue, 11 May 2021 14:26:32 +0100 Message-Id: <20210511132641.1022161-4-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It has been over two years since RHEL-8 was released, and thus per the platform build policy, we no longer need to support RHEL-7 as a build target. This lets us increment the minimum required nettle version and drop a lot of backwards compatibility code for 2.x series of nettle. Per repology, current shipping versions are: RHEL-8: 3.4.1 Debian Stretch: 3.3 Debian Buster: 3.4.1 openSUSE Leap 15.2: 3.4.1 Ubuntu LTS 18.04: 3.4 Ubuntu LTS 20.04: 3.5.1 FreeBSD: 3.7.2 Fedora 33: 3.5.1 Fedora 34: 3.7.2 OpenBSD: 3.7.2 macOS HomeBrew: 3.7.2 Debian Stretch has the oldest version and so 3.3 is the new minimum. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 10 ---------- configure | 4 +--- crypto/cipher-nettle.c.inc | 31 ------------------------------- crypto/hash-nettle.c | 4 ---- crypto/hmac-nettle.c | 4 ---- 5 files changed, 1 insertion(+), 52 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 23917d6d73..aef16515d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -716,16 +716,6 @@ build-coroutine-sigaltstack: # # These jobs test old gcrypt and nettle from RHEL7 # which had some API differences. -crypto-old-nettle: - <<: *native_build_job_definition - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - TARGETS: x86_64-softmmu x86_64-linux-user - CONFIGURE_ARGS: --disable-gcrypt --enable-nettle - MAKE_CHECK_ARGS: check - crypto-old-gcrypt: <<: *native_build_job_definition needs: diff --git a/configure b/configure index 54f8475444..53902d9c02 100755 --- a/configure +++ b/configure @@ -2860,10 +2860,9 @@ has_libgcrypt() { =20 if test "$nettle" !=3D "no"; then pass=3D"no" - if $pkg_config --exists "nettle >=3D 2.7.1"; then + if $pkg_config --exists "nettle >=3D 3.3"; then nettle_cflags=3D$($pkg_config --cflags nettle) nettle_libs=3D$($pkg_config --libs nettle) - nettle_version=3D$($pkg_config --modversion nettle) # Link test to make sure the given libraries work (e.g for static). write_c_skeleton if compile_prog "" "$nettle_libs" ; then @@ -5722,7 +5721,6 @@ if test "$gcrypt" =3D "yes" ; then fi if test "$nettle" =3D "yes" ; then echo "CONFIG_NETTLE=3Dy" >> $config_host_mak - echo "CONFIG_NETTLE_VERSION_MAJOR=3D${nettle_version%%.*}" >> $config_ho= st_mak echo "NETTLE_CFLAGS=3D$nettle_cflags" >> $config_host_mak echo "NETTLE_LIBS=3D$nettle_libs" >> $config_host_mak fi diff --git a/crypto/cipher-nettle.c.inc b/crypto/cipher-nettle.c.inc index cac771e4ff..490472656c 100644 --- a/crypto/cipher-nettle.c.inc +++ b/crypto/cipher-nettle.c.inc @@ -39,41 +39,10 @@ typedef void (*QCryptoCipherNettleFuncWrapper)(const vo= id *ctx, uint8_t *dst, const uint8_t *src); =20 -#if CONFIG_NETTLE_VERSION_MAJOR < 3 -typedef nettle_crypt_func * QCryptoCipherNettleFuncNative; -typedef void * cipher_ctx_t; -typedef unsigned cipher_length_t; -#define CONST_CTX - -#define cast5_set_key cast128_set_key - -#define aes128_ctx aes_ctx -#define aes192_ctx aes_ctx -#define aes256_ctx aes_ctx -#define aes128_set_encrypt_key(c, k) \ - aes_set_encrypt_key(c, 16, k) -#define aes192_set_encrypt_key(c, k) \ - aes_set_encrypt_key(c, 24, k) -#define aes256_set_encrypt_key(c, k) \ - aes_set_encrypt_key(c, 32, k) -#define aes128_set_decrypt_key(c, k) \ - aes_set_decrypt_key(c, 16, k) -#define aes192_set_decrypt_key(c, k) \ - aes_set_decrypt_key(c, 24, k) -#define aes256_set_decrypt_key(c, k) \ - aes_set_decrypt_key(c, 32, k) -#define aes128_encrypt aes_encrypt -#define aes192_encrypt aes_encrypt -#define aes256_encrypt aes_encrypt -#define aes128_decrypt aes_decrypt -#define aes192_decrypt aes_decrypt -#define aes256_decrypt aes_decrypt -#else typedef nettle_cipher_func * QCryptoCipherNettleFuncNative; typedef const void * cipher_ctx_t; typedef size_t cipher_length_t; #define CONST_CTX const -#endif =20 static inline bool qcrypto_length_check(size_t len, size_t blocksize, Error **errp) diff --git a/crypto/hash-nettle.c b/crypto/hash-nettle.c index 2a6ee7c7d5..5c8977fb80 100644 --- a/crypto/hash-nettle.c +++ b/crypto/hash-nettle.c @@ -26,11 +26,7 @@ #include #include =20 -#if CONFIG_NETTLE_VERSION_MAJOR < 3 -typedef unsigned int hash_length_t; -#else typedef size_t hash_length_t; -#endif =20 typedef void (*qcrypto_nettle_init)(void *ctx); typedef void (*qcrypto_nettle_write)(void *ctx, diff --git a/crypto/hmac-nettle.c b/crypto/hmac-nettle.c index 1152b741fd..da6b6fa014 100644 --- a/crypto/hmac-nettle.c +++ b/crypto/hmac-nettle.c @@ -18,11 +18,7 @@ #include "hmacpriv.h" #include =20 -#if CONFIG_NETTLE_VERSION_MAJOR < 3 -typedef unsigned int hmac_length_t; -#else typedef size_t hmac_length_t; -#endif =20 typedef void (*qcrypto_nettle_hmac_setkey)(void *ctx, hmac_length_t key_length, --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620739888; cv=none; d=zohomail.com; s=zohoarc; b=nAIb6w6Kkp2jQxUkaYkq1HKsWOJ/C0vk/tHJUDylVVjMtKv4KX313B4LKe/wMuc0/kva/AsCloiXlp9ssbGY+gsTuzqo23lWm2+P2YXpymA37WozLIfaUT3mXgfmYaZi6L3UWNL+qjt+Z4JQ9vR3NOBXEOy6Y/sKfQhG8tNIYmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620739888; 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=U0KnWPJrDzGWMQ0ZXwVdXC2lPNFWf60X8jlX8WN0/s4=; b=DVY2mujkhTYb3gH6/U8LmdpSOW0P1inCQ/t+k0Sz+p9V34ux7SpD0qVS6vbEnIcLF7LWtPxif03Bhg6c6jYG7vnLX+cowFVe38RZc1hBjeU9g3igfQG4NN6nnxvTBDjznfEsoH9BS4zmzy8YXI/O9xsyrdPI85GfWilR001Zdr0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620739888494865.6739022339322; Tue, 11 May 2021 06:31:28 -0700 (PDT) Received: from localhost ([::1]:53552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSTv-0004Sr-ME for importer@patchew.org; Tue, 11 May 2021 09:31:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQn-0007hQ-P7 for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQl-0000xw-P5 for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:13 -0400 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-279-N17AHTZcMI2gtM6vEmzFUQ-1; Tue, 11 May 2021 09:28:07 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 809B9107B466; Tue, 11 May 2021 13:28:06 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 759569CA0; Tue, 11 May 2021 13:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739691; 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=U0KnWPJrDzGWMQ0ZXwVdXC2lPNFWf60X8jlX8WN0/s4=; b=Jo/00PnR0SNC0AfpQr3yJMcKK0HK+3/J3mLvEQyc0DbYNU2zKBMZQ+zq4wNsiI4oD8cjiC 9s+Rnvq3uSusvbzR/Qzxt3NdY0nUD/cBC6uaimJPT0D65hHX60zybkX5lO9TuzyM6fqcI6 maEDFqNqBdhsea7ygbRQkdO9fSPGG2c= X-MC-Unique: N17AHTZcMI2gtM6vEmzFUQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 04/12] crypto: drop back compatibility typedefs for nettle Date: Tue, 11 May 2021 14:26:33 +0100 Message-Id: <20210511132641.1022161-5-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Now that we only support modern nettle, we don't need to have local typedefs to mask the real nettle types. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- crypto/cipher-nettle.c.inc | 60 ++++++++++++++++---------------------- crypto/hash-nettle.c | 6 ++-- crypto/hmac-nettle.c | 8 ++--- 3 files changed, 30 insertions(+), 44 deletions(-) diff --git a/crypto/cipher-nettle.c.inc b/crypto/cipher-nettle.c.inc index 490472656c..fc6f40c026 100644 --- a/crypto/cipher-nettle.c.inc +++ b/crypto/cipher-nettle.c.inc @@ -34,16 +34,6 @@ #include #endif =20 -typedef void (*QCryptoCipherNettleFuncWrapper)(const void *ctx, - size_t length, - uint8_t *dst, - const uint8_t *src); - -typedef nettle_cipher_func * QCryptoCipherNettleFuncNative; -typedef const void * cipher_ctx_t; -typedef size_t cipher_length_t; -#define CONST_CTX const - static inline bool qcrypto_length_check(size_t len, size_t blocksize, Error **errp) { @@ -166,12 +156,12 @@ static const struct QCryptoCipherDriver NAME##_driver= _ctr =3D { \ static void NAME##_xts_wrape(const void *ctx, size_t length, \ uint8_t *dst, const uint8_t *src) \ { \ - ENCRYPT((cipher_ctx_t)ctx, length, dst, src); \ + ENCRYPT((const void *)ctx, length, dst, src); \ } \ static void NAME##_xts_wrapd(const void *ctx, size_t length, \ uint8_t *dst, const uint8_t *src) \ { \ - DECRYPT((cipher_ctx_t)ctx, length, dst, src); \ + DECRYPT((const void *)ctx, length, dst, src); \ } \ static int NAME##_encrypt_xts(QCryptoCipher *cipher, const void *in, \ void *out, size_t len, Error **errp) \ @@ -251,13 +241,13 @@ typedef struct QCryptoNettleDESRFB { uint8_t iv[DES_BLOCK_SIZE]; } QCryptoNettleDESRFB; =20 -static void des_encrypt_native(cipher_ctx_t ctx, cipher_length_t length, +static void des_encrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { des_encrypt(ctx, length, dst, src); } =20 -static void des_decrypt_native(cipher_ctx_t ctx, cipher_length_t length, +static void des_decrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { des_decrypt(ctx, length, dst, src); @@ -273,13 +263,13 @@ typedef struct QCryptoNettleDES3 { uint8_t iv[DES3_BLOCK_SIZE]; } QCryptoNettleDES3; =20 -static void des3_encrypt_native(cipher_ctx_t ctx, cipher_length_t length, +static void des3_encrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { des3_encrypt(ctx, length, dst, src); } =20 -static void des3_decrypt_native(cipher_ctx_t ctx, cipher_length_t length, +static void des3_decrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { des3_decrypt(ctx, length, dst, src); @@ -296,17 +286,17 @@ typedef struct QCryptoNettleAES128 { struct aes128_ctx key[2], key_xts[2]; } QCryptoNettleAES128; =20 -static void aes128_encrypt_native(cipher_ctx_t ctx, cipher_length_t length, +static void aes128_encrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { - CONST_CTX struct aes128_ctx *keys =3D ctx; + const struct aes128_ctx *keys =3D ctx; aes128_encrypt(&keys[0], length, dst, src); } =20 -static void aes128_decrypt_native(cipher_ctx_t ctx, cipher_length_t length, +static void aes128_decrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { - CONST_CTX struct aes128_ctx *keys =3D ctx; + const struct aes128_ctx *keys =3D ctx; aes128_decrypt(&keys[1], length, dst, src); } =20 @@ -322,17 +312,17 @@ typedef struct QCryptoNettleAES192 { struct aes192_ctx key[2], key_xts[2]; } QCryptoNettleAES192; =20 -static void aes192_encrypt_native(cipher_ctx_t ctx, cipher_length_t length, +static void aes192_encrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { - CONST_CTX struct aes192_ctx *keys =3D ctx; + const struct aes192_ctx *keys =3D ctx; aes192_encrypt(&keys[0], length, dst, src); } =20 -static void aes192_decrypt_native(cipher_ctx_t ctx, cipher_length_t length, +static void aes192_decrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { - CONST_CTX struct aes192_ctx *keys =3D ctx; + const struct aes192_ctx *keys =3D ctx; aes192_decrypt(&keys[1], length, dst, src); } =20 @@ -348,17 +338,17 @@ typedef struct QCryptoNettleAES256 { struct aes256_ctx key[2], key_xts[2]; } QCryptoNettleAES256; =20 -static void aes256_encrypt_native(cipher_ctx_t ctx, cipher_length_t length, +static void aes256_encrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { - CONST_CTX struct aes256_ctx *keys =3D ctx; + const struct aes256_ctx *keys =3D ctx; aes256_encrypt(&keys[0], length, dst, src); } =20 -static void aes256_decrypt_native(cipher_ctx_t ctx, cipher_length_t length, - uint8_t *dst, const uint8_t *src) +static void aes256_decrypt_native(const void *ctx, size_t length, + uint8_t *dst, const uint8_t *src) { - CONST_CTX struct aes256_ctx *keys =3D ctx; + const struct aes256_ctx *keys =3D ctx; aes256_decrypt(&keys[1], length, dst, src); } =20 @@ -373,13 +363,13 @@ typedef struct QCryptoNettleCAST128 { struct cast128_ctx key, key_xts; } QCryptoNettleCAST128; =20 -static void cast128_encrypt_native(cipher_ctx_t ctx, cipher_length_t lengt= h, +static void cast128_encrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { cast128_encrypt(ctx, length, dst, src); } =20 -static void cast128_decrypt_native(cipher_ctx_t ctx, cipher_length_t lengt= h, +static void cast128_decrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { cast128_decrypt(ctx, length, dst, src); @@ -397,13 +387,13 @@ typedef struct QCryptoNettleSerpent { } QCryptoNettleSerpent; =20 =20 -static void serpent_encrypt_native(cipher_ctx_t ctx, cipher_length_t lengt= h, +static void serpent_encrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { serpent_encrypt(ctx, length, dst, src); } =20 -static void serpent_decrypt_native(cipher_ctx_t ctx, cipher_length_t lengt= h, +static void serpent_decrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { serpent_decrypt(ctx, length, dst, src); @@ -420,13 +410,13 @@ typedef struct QCryptoNettleTwofish { struct twofish_ctx key, key_xts; } QCryptoNettleTwofish; =20 -static void twofish_encrypt_native(cipher_ctx_t ctx, cipher_length_t lengt= h, +static void twofish_encrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { twofish_encrypt(ctx, length, dst, src); } =20 -static void twofish_decrypt_native(cipher_ctx_t ctx, cipher_length_t lengt= h, +static void twofish_decrypt_native(const void *ctx, size_t length, uint8_t *dst, const uint8_t *src) { twofish_decrypt(ctx, length, dst, src); diff --git a/crypto/hash-nettle.c b/crypto/hash-nettle.c index 5c8977fb80..1ca1a41062 100644 --- a/crypto/hash-nettle.c +++ b/crypto/hash-nettle.c @@ -26,14 +26,12 @@ #include #include =20 -typedef size_t hash_length_t; - typedef void (*qcrypto_nettle_init)(void *ctx); typedef void (*qcrypto_nettle_write)(void *ctx, - hash_length_t len, + size_t len, const uint8_t *buf); typedef void (*qcrypto_nettle_result)(void *ctx, - hash_length_t len, + size_t len, uint8_t *buf); =20 union qcrypto_hash_ctx { diff --git a/crypto/hmac-nettle.c b/crypto/hmac-nettle.c index da6b6fa014..1ad6c4f253 100644 --- a/crypto/hmac-nettle.c +++ b/crypto/hmac-nettle.c @@ -18,18 +18,16 @@ #include "hmacpriv.h" #include =20 -typedef size_t hmac_length_t; - typedef void (*qcrypto_nettle_hmac_setkey)(void *ctx, - hmac_length_t key_length, + size_t key_length, const uint8_t *key); =20 typedef void (*qcrypto_nettle_hmac_update)(void *ctx, - hmac_length_t length, + size_t length, const uint8_t *data); =20 typedef void (*qcrypto_nettle_hmac_digest)(void *ctx, - hmac_length_t length, + size_t length, uint8_t *digest); =20 typedef struct QCryptoHmacNettle QCryptoHmacNettle; --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620739802; cv=none; d=zohomail.com; s=zohoarc; b=J0NxNtdD4Q7PTeo6ukycyk0qIFeqO/QKJovzf1oaetCsuRGb8Nj3wy7n9K5S24f4lkTBsB4sXuYuohu5BjIIvFBx1/ltLa7piag+uHEkC1vGhxPAFwU2DTvBsjmZOeFvGUM01sfgaNnXBqzIyHz6h9B/a5gHdyNoUStNeFtpxsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620739802; 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=xKCoOKvp/V4b9LWXPqSP6TUaKrKrR2QI86JsE378fZg=; b=N0lnxE/G8Qp3u5esinT2gbcMIo0wL2U6V0E1ygqJ+PCivSieQ2gZNK9cFauzo+WjWa52ywKCzpE1NR0BQQRh6KmV5RP+GnqWBRamLGehzK7gsXfmn9I0rj0lO1d6tStt37llR5mGmc15p8FqALm+IcEM2Eium3QDYzaZaPlOtcM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 162073980231943.87217398864152; Tue, 11 May 2021 06:30:02 -0700 (PDT) Received: from localhost ([::1]:50428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSSX-0002Iy-IK for importer@patchew.org; Tue, 11 May 2021 09:30:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQr-0007tr-Cu for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQp-00011O-Ix for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:17 -0400 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-141-k9bjZnQEMi6hzrPw60MGbg-1; Tue, 11 May 2021 09:28:11 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1C4F8049D6; Tue, 11 May 2021 13:28:09 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0655B9CA0; Tue, 11 May 2021 13:28:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739694; 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=xKCoOKvp/V4b9LWXPqSP6TUaKrKrR2QI86JsE378fZg=; b=GO0MujUKbiDfCoj2BkZWBKtG/ey8vGeuObBukM/52DbkSs7I+/Z7xlrN3nIIpr//avrQEH Sl1m46PmGJNyRztNX3Yg35zoH80bybDVfpxEcKsuNFT634M+voDBez0g2+VitKOiE2gaZu AJe47g+zijWHmalI0C+e4mrldNVdwV8= X-MC-Unique: k9bjZnQEMi6hzrPw60MGbg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 05/12] crypto: bump min gcrypt to 1.7.6, dropping RHEL-7 support Date: Tue, 11 May 2021 14:26:34 +0100 Message-Id: <20210511132641.1022161-6-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It has been over two years since RHEL-8 was released, and thus per the platform build policy, we no longer need to support RHEL-7 as a build target. This lets us increment the minimum required gcrypt version and assume that HMAC is always supported Per repology, current shipping versions are: RHEL-8: 1.8.5 Debian Stretch: 1.7.6 Debian Buster: 1.8.4 openSUSE Leap 15.2: 1.8.2 Ubuntu LTS 18.04: 1.8.1 Ubuntu LTS 20.04: 1.8.5 FreeBSD: 1.9.2 Fedora 33: 1.8.6 Fedora 34: 1.9.3 OpenBSD: 1.9.3 macOS HomeBrew: 1.9.3 Debian Stretch has the oldest version and so 1.7.6 is the new minimum. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 10 ---------- configure | 18 +----------------- crypto/meson.build | 6 +----- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aef16515d3..0fefda2674 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -716,16 +716,6 @@ build-coroutine-sigaltstack: # # These jobs test old gcrypt and nettle from RHEL7 # which had some API differences. -crypto-old-gcrypt: - <<: *native_build_job_definition - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - TARGETS: x86_64-softmmu x86_64-linux-user - CONFIGURE_ARGS: --disable-nettle --enable-gcrypt - MAKE_CHECK_ARGS: check - crypto-only-gnutls: <<: *native_build_job_definition needs: diff --git a/configure b/configure index 53902d9c02..d5569f9252 100755 --- a/configure +++ b/configure @@ -426,7 +426,6 @@ gnutls=3D"$default_feature" nettle=3D"$default_feature" nettle_xts=3D"no" gcrypt=3D"$default_feature" -gcrypt_hmac=3D"no" gcrypt_xts=3D"no" qemu_private_xts=3D"yes" auth_pam=3D"$default_feature" @@ -2849,7 +2848,7 @@ has_libgcrypt() { maj=3D`libgcrypt-config --version | awk -F . '{print $1}'` min=3D`libgcrypt-config --version | awk -F . '{print $2}'` =20 - if test $maj !=3D 1 || test $min -lt 5 + if test $maj !=3D 1 || test $min -lt 7 then return 1 fi @@ -2915,18 +2914,6 @@ if test "$gcrypt" !=3D "no"; then gcrypt=3D"yes" cat > $TMPC << EOF #include -int main(void) { - gcry_mac_hd_t handle; - gcry_mac_open(&handle, GCRY_MAC_HMAC_MD5, - GCRY_MAC_FLAG_SECURE, NULL); - return 0; -} -EOF - if compile_prog "$gcrypt_cflags" "$gcrypt_libs" ; then - gcrypt_hmac=3Dyes - fi - cat > $TMPC << EOF -#include int main(void) { gcry_cipher_hd_t handle; gcry_cipher_open(&handle, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_XTS, 0); @@ -5713,9 +5700,6 @@ if test "$gnutls" =3D "yes" ; then fi if test "$gcrypt" =3D "yes" ; then echo "CONFIG_GCRYPT=3Dy" >> $config_host_mak - if test "$gcrypt_hmac" =3D "yes" ; then - echo "CONFIG_GCRYPT_HMAC=3Dy" >> $config_host_mak - fi echo "GCRYPT_CFLAGS=3D$gcrypt_cflags" >> $config_host_mak echo "GCRYPT_LIBS=3D$gcrypt_libs" >> $config_host_mak fi diff --git a/crypto/meson.build b/crypto/meson.build index 7f37b5d335..af7e80c6f6 100644 --- a/crypto/meson.build +++ b/crypto/meson.build @@ -26,11 +26,7 @@ if 'CONFIG_NETTLE' in config_host crypto_ss.add(files('hash-nettle.c', 'hmac-nettle.c', 'pbkdf-nettle.c')) elif 'CONFIG_GCRYPT' in config_host crypto_ss.add(files('hash-gcrypt.c', 'pbkdf-gcrypt.c')) - if 'CONFIG_GCRYPT_HMAC' in config_host - crypto_ss.add(files('hmac-gcrypt.c')) - else - crypto_ss.add(files('hmac-glib.c')) - endif + crypto_ss.add(files('hmac-gcrypt.c')) else crypto_ss.add(files('hash-glib.c', 'hmac-glib.c', 'pbkdf-stub.c')) endif --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620740063; cv=none; d=zohomail.com; s=zohoarc; b=LmaeloQYEi1qfGtjO9n7Y/plMRbbonAOeghTdyz3541fBj1tzv3AkNq/NemtZQlCfUu4xwatZaxB2/dr7L1KE7A/bxOEQfGAuKXvh9XF09lEA5bV4rgt7Fdepib/NAlfl0YF3FHND2s5DZXChOUrdCpQ+OGbzLp0Rc0wEqRcqU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620740063; 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=YTr53wtUG6JqqhFOqEGJ3TxMVUA3Q1EX0AQ4lUvpWtI=; b=cXCx/nQIKiCfCEfTmf5JMJyEMXO054q3yKuhWAjjd4rZESEPRK7OFivu5D+YFYdmRwXrf/fcC0wKO8GuUJYqT5zphQZPsfM7sM7BO7K1OH/ytqDo80/6KWOWyn6mwHWg3aR8zWQx2jXyftMlwJ2o4goO0tJ9JWf8At3wgBQyVCA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620740063722441.3879848053009; Tue, 11 May 2021 06:34:23 -0700 (PDT) Received: from localhost ([::1]:34114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSWi-00020k-TU for importer@patchew.org; Tue, 11 May 2021 09:34:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQu-000869-8s for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQs-00012v-J8 for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:20 -0400 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-23-8sRpjh_TNg2Z-D43I706Lw-1; Tue, 11 May 2021 09:28:15 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ECC9DCC651; Tue, 11 May 2021 13:28:12 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B32B9CA0; Tue, 11 May 2021 13:28:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739698; 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=YTr53wtUG6JqqhFOqEGJ3TxMVUA3Q1EX0AQ4lUvpWtI=; b=gvSYu4pAs5/eY/e5Fq+n8VHLGdx2BPQM5WVHjniWrCFwEFnJ4+xW36WDQ91v6oC4eApkub jKj20F2uIz3iqMw+WuHK2PoDgXZdHy1tCDxYTExiSo+WhkNDT0dRTP8/hsDVVeq5+wcknj NBzsCpcT6Sczh6hUCyLqULDEDsA2KQs= X-MC-Unique: 8sRpjh_TNg2Z-D43I706Lw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 06/12] crypto: bump min gnutls to 3.5.8, dropping RHEL-7 support Date: Tue, 11 May 2021 14:26:35 +0100 Message-Id: <20210511132641.1022161-7-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It has been over two years since RHEL-8 was released, and thus per the platform build policy, we no longer need to support RHEL-7 as a build target. This lets us increment the minimum required gnutls version Per repology, current shipping versions are: RHEL-8: 3.6.14 Debian Stretch: 3.5.8 Debian Buster: 3.6.7 openSUSE Leap 15.2: 3.6.7 Ubuntu LTS 18.04: 3.5.18 Ubuntu LTS 20.04: 3.6.13 FreeBSD: 3.6.15 Fedora 33: 3.6.16 Fedora 34: 3.7.1 OpenBSD: 3.6.15 macOS HomeBrew: 3.6.15 Debian Stretch has the oldest version and so 1.7.6 is the new minimum. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 15 --------------- configure | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fefda2674..c5b8ea0d94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -712,21 +712,6 @@ build-coroutine-sigaltstack: --enable-trace-backends=3Dftrace MAKE_CHECK_ARGS: check-unit =20 -# Most jobs test latest gcrypt or nettle builds -# -# These jobs test old gcrypt and nettle from RHEL7 -# which had some API differences. -crypto-only-gnutls: - <<: *native_build_job_definition - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - TARGETS: x86_64-softmmu x86_64-linux-user - CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls - MAKE_CHECK_ARGS: check - - # Check our reduced build configurations build-without-default-devices: <<: *native_build_job_definition diff --git a/configure b/configure index d5569f9252..69631fad3b 100755 --- a/configure +++ b/configure @@ -2790,7 +2790,7 @@ fi =20 if test "$gnutls" !=3D "no"; then pass=3D"no" - if $pkg_config --exists "gnutls >=3D 3.1.18"; then + if $pkg_config --exists "gnutls >=3D 3.5.8"; then gnutls_cflags=3D$($pkg_config --cflags gnutls) gnutls_libs=3D$($pkg_config --libs gnutls) # Packaging for the static libraries is not always correct. --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620739989; cv=none; d=zohomail.com; s=zohoarc; b=FBRA1AMQzm9Fd45K+jBqyoleMSO1C+H8au2lpm7nqlNla9JBIrsFh56LwChpAoNgEnb3LEtkXCbPkCykikyBxnEaRv6CrUZhn02BLTRdoLA6hYeKCyCKvcX9+PaM5vRbTk+57mtXmf5H36nhfclyYugJsAj7BJ4EdNPhd8bECjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620739989; 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=GeMQTSzzVOHwDZQ+Xq2Pg+vVFosbE7QueLpfUrF0YiI=; b=kpW54crQb0vHpP4FeABjRVD1OxYI0NFa9tbBIV4nzCvYshfQzmI2/rr5VobzP6SwPNCB9ZvTnJ+8XjGMyeRupCXUro1CwIfuPDG684zgZEuxv91CRycsvdmtEgw9gkzx7DMKLQmOEAIwbEUokJgAgOUCSmXa24bZM5L/5qDMIzQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620739989279635.1694259952734; Tue, 11 May 2021 06:33:09 -0700 (PDT) Received: from localhost ([::1]:57712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSVW-0007L6-QS for importer@patchew.org; Tue, 11 May 2021 09:33:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQy-0008OY-8b for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQv-00014X-99 for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:24 -0400 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-589-cCukfJb2MjGh4TbO9E13jg-1; Tue, 11 May 2021 09:28:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 507D5801817; Tue, 11 May 2021 13:28:16 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9894D19809; Tue, 11 May 2021 13:28:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739700; 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=GeMQTSzzVOHwDZQ+Xq2Pg+vVFosbE7QueLpfUrF0YiI=; b=D2YrRfD9+wSYUtUfiDNiq58rpTz443QRn61aZRFw9tDh4xBJdekmnNaWcQ3VOYYIu2aV6m 5opufjts0mnYJrlF5y9725O5oALx/p68nyB7m1UnaL0NsaaO7oNFdLO2J8Vy0z9np07udD DHinFEYZld4WPhxtvJYnrg9qIxL1F8o= X-MC-Unique: cCukfJb2MjGh4TbO9E13jg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 07/12] crypto: drop used conditional check Date: Tue, 11 May 2021 14:26:36 +0100 Message-Id: <20210511132641.1022161-8-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The condition being tested has never been set since the day the code was first introduced. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Willian Rampazzo --- crypto/tlscredsx509.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index bc503bab55..d9d6f4421e 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -354,11 +354,9 @@ qcrypto_tls_creds_check_cert_pair(gnutls_x509_crt_t ce= rt, reason =3D "The certificate has been revoked"; } =20 -#ifndef GNUTLS_1_0_COMPAT if (status & GNUTLS_CERT_INSECURE_ALGORITHM) { reason =3D "The certificate uses an insecure algorithm"; } -#endif =20 error_setg(errp, "Our own certificate %s failed validation against %s: %= s", --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620740184; cv=none; d=zohomail.com; s=zohoarc; b=BlVmI/Xc+4S0ZZIZR9ZJZp10PVn0DUfCbHjibUbbIXdwefS5UpUjLd87dM1UAt8G8QNlCRxSiEh/Uim4hlbCHXP/WTaY1NT/8c2LoZa969R1Z9yuliVE8xjt6jUuC5RQYbytQkFjmcAaIPoR6L0ueFMyqOV3QqulOGzZksuQBPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620740184; 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=DCdjhUFyR/zrrQVkCvZkdoJTf1MCO+MSo+/BeXHlvPQ=; b=VIkawh2aM9nSu93Zf3GST4M3wINwEj+O7YS7krvS6d3+ngxwMv6ozkg7AmppKTpyi4NhKH+ud4gMM44y7ZlKlhnIxFNCc5IkNswgZ/+UltqI6M9xpeHdNq9SGTY0ujT4OQAvoMmn1oEm1jNL5TxV0NlU9Wy7FZigDy5FyU6NXcI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620740184065816.6260425855531; Tue, 11 May 2021 06:36:24 -0700 (PDT) Received: from localhost ([::1]:38044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSXR-0004dN-BH for importer@patchew.org; Tue, 11 May 2021 09:35:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSR5-0000V5-O1 for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47880) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSR4-0001A8-1o for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:31 -0400 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-286-k3OwQ-qpPCmW_ODPcmQ7qw-1; Tue, 11 May 2021 09:28:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 99D95102C80A; Tue, 11 May 2021 13:28:19 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADFD919809; Tue, 11 May 2021 13:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739709; 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=DCdjhUFyR/zrrQVkCvZkdoJTf1MCO+MSo+/BeXHlvPQ=; b=PtMhHn6Qqe29h1vuWBgCU19FSUJhD2YzTPJJ8A8b8Y3ZqtJjdUZnQ4XjASI7yqBRsq5LWe 947iu1gayGd48ReCTXFU1JAbqRbxdzLXDgYmft14y6g8vByuz9bIbS450TcmJPvSyzCsGs dkKzdtnTIx3kfLadjN64PslIaeNMHYc= X-MC-Unique: k3OwQ-qpPCmW_ODPcmQ7qw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 08/12] tests/vm: convert centos VM recipe to CentOS 8 Date: Tue, 11 May 2021 14:26:37 +0100 Message-Id: <20210511132641.1022161-9-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/vm/centos | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/vm/centos b/tests/vm/centos index efe3dbbb36..215da14c23 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -26,13 +26,13 @@ class CentosVM(basevm.BaseVM): export SRC_ARCHIVE=3D/dev/vdb; sudo chmod a+r $SRC_ARCHIVE; tar -xf $SRC_ARCHIVE; - make docker-test-block@centos7 {verbose} J=3D{jobs} NETWORK=3D1; - make docker-test-quick@centos7 {verbose} J=3D{jobs} NETWORK=3D1; + make docker-test-block@centos8 {verbose} J=3D{jobs} NETWORK=3D1; + make docker-test-quick@centos8 {verbose} J=3D{jobs} NETWORK=3D1; make docker-test-mingw@fedora {verbose} J=3D{jobs} NETWORK=3D1; """ =20 def build_image(self, img): - cimg =3D self._download_with_cache("https://cloud.centos.org/cento= s/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz") + cimg =3D self._download_with_cache("https://cloud.centos.org/cento= s/8/x86_64/images/CentOS-8-GenericCloud-8.1.1911-20200113.3.x86_64.qcow2") img_tmp =3D img + ".tmp" sys.stderr.write("Extracting the image...\n") subprocess.check_call(["ln", "-f", cimg, img_tmp + ".xz"]) --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620740001; cv=none; d=zohomail.com; s=zohoarc; b=H757q+7kPGEczM0BbXpsSpwZ0vaH6GWWLtfKqRIrnN6eu7kuW7F37t1IZ4amo5GqwnQzv1cUES0IotBFFxN/SCjIq3TwqdsWZ65XoZ8Uc4ALMxtoECHS1XCm8fnpnViruoQwAwMFDTT550KNWn0VZXtNlPTrddNN/SE/2rG7zDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620740001; 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=0nIlbxyQsMUyY8h/WtrFC4FDGoycPbkHNL6GOI7oEKc=; b=k90sxipq23bX6krmpUQUU6FaNn6EiWuAgMTjyUDLWo9BOAcuftnX8S2Oomh6OP+In5LVZEHWJYo1pq/oHt7hzWxNW9pST6bX35uIQ92n2JV+xUKYQ2WpyM5Ze8xRKQ24S2hCiiZX3T2bRy1gp/FmOnqpzYc3U1DfLKE4ZtaL/hM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620740001226894.9263953364929; Tue, 11 May 2021 06:33:21 -0700 (PDT) Received: from localhost ([::1]:58884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSVj-00086u-3J for importer@patchew.org; Tue, 11 May 2021 09:33:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSR2-0000Dj-0N for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41296) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSQz-00016y-I5 for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:27 -0400 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-582-WesPgEcTMDmvUu_Z4BleaQ-1; Tue, 11 May 2021 09:28:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 55618803622; Tue, 11 May 2021 13:28:22 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F7145946E; Tue, 11 May 2021 13:28:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739705; 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=0nIlbxyQsMUyY8h/WtrFC4FDGoycPbkHNL6GOI7oEKc=; b=DnEkpgx4wjZ1CHSzrWC+rHQ98/itMHgyQzYj+XgAsrMe/fFh3tmH5LmyYskalVaLw/imBp 7YHW//GBZVs0pNoAwv/TbgW8RfInpwQFEPqoyDxIlP0uBWaYMyzLOcTRVc0OYhYmchVifU C8qgic6ae81eX3XtX9mDGz4bSYfFGAw= X-MC-Unique: WesPgEcTMDmvUu_Z4BleaQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 09/12] tests/docker: drop CentOS 7 container Date: Tue, 11 May 2021 14:26:38 +0100 Message-Id: <20210511132641.1022161-10-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It has been over two years since RHEL-8 was released, and thus per the platform build policy, we no longer need to support RHEL-7 as a build target. Signed-off-by: Daniel P. Berrang=C3=A9 Acked-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/containers.yml | 5 --- tests/docker/dockerfiles/centos7.docker | 43 ------------------------- 2 files changed, 48 deletions(-) delete mode 100644 tests/docker/dockerfiles/centos7.docker diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 33e4046e23..0fd792dbe7 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -26,11 +26,6 @@ amd64-alpine-container: variables: NAME: alpine =20 -amd64-centos7-container: - <<: *container_job_definition - variables: - NAME: centos7 - amd64-centos8-container: <<: *container_job_definition variables: diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerf= iles/centos7.docker deleted file mode 100644 index 75fdb53c7c..0000000000 --- a/tests/docker/dockerfiles/centos7.docker +++ /dev/null @@ -1,43 +0,0 @@ -FROM centos:7 -RUN yum install -y epel-release centos-release-xen-48 - -RUN yum -y update - -# Please keep this list sorted alphabetically -ENV PACKAGES \ - bzip2 \ - bzip2-devel \ - ccache \ - csnappy-devel \ - dbus-daemon \ - gcc-c++ \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-static \ - gnutls-devel \ - libaio-devel \ - libepoxy-devel \ - libfdt-devel \ - libgcrypt-devel \ - librdmacm-devel \ - libzstd-devel \ - lzo-devel \ - make \ - mesa-libEGL-devel \ - mesa-libgbm-devel \ - nettle-devel \ - ninja-build \ - perl-Test-Harness \ - pixman-devel \ - python3 \ - SDL2-devel \ - spice-glib-devel \ - spice-server-devel \ - tar \ - vte-devel \ - xen-devel \ - zlib-devel -RUN yum install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620740130; cv=none; d=zohomail.com; s=zohoarc; b=lNmEsNiL70eAjfld0LBYssJNXRIovM8eibwUBpobNpExbw+6IlGpnNHibS5xNya4NKzQs8dO8LosAeXv8golUIJaYSv/NAQ1HqYWEReOjWYv49VabhReSOnk3Alo5NAl3XJCzgD1tN6RWZFlzEeQTB04qbp4UNI2wVL9jJ1B4aM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620740130; 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=wAPhYU5OLFq2sZpS1SKm5uq/PilPmWus3PWArecQtMc=; b=T/mrDj0WWxdfvzSqYrLy9ucTAZoBlAQ294MVv5lCSEFeJwtUnrn93+feYv+2vwYY0PlcF57vSusC241IelPGsJUQQWXfIA5rWQ6UbM2TcCsU+0K++rDwQWVx1n+xDKO4lJBe5CtzMZHNopLNB3eWkc77aEvxgEw2qksmAxOjFjc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620740130379919.6661425944636; Tue, 11 May 2021 06:35:30 -0700 (PDT) Received: from localhost ([::1]:36014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSX3-0003IS-VN for importer@patchew.org; Tue, 11 May 2021 09:34:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSR8-0000fZ-5j for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48036) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSR6-0001BM-3H for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:33 -0400 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-403-bSaE_1l_Oh2mJfwDRt-8BA-1; Tue, 11 May 2021 09:28:27 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01DBB107ACF8; Tue, 11 May 2021 13:28:26 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id B77D39CA0; Tue, 11 May 2021 13:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739711; 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=wAPhYU5OLFq2sZpS1SKm5uq/PilPmWus3PWArecQtMc=; b=Z3a44I2R3+xjsJzbwOeC5g4qM5Xc7gAq12jxarZ2ZRy/+zAMPNVpwypVmJZb/dgRlF1VwB hnkkdxL/JNMga85ea47/m/ta9/DuP7vdpY+qWil4bR2rVVtQPW+nCmwHZ8wNz1N+SO5VNY yG4hX/4EVvOwTKYL/0AWbnWvvV1hNvI= X-MC-Unique: bSaE_1l_Oh2mJfwDRt-8BA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 10/12] bump min required glib version to 2.50 Date: Tue, 11 May 2021 14:26:39 +0100 Message-Id: <20210511132641.1022161-11-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The glib version was not previously constrained by RHEL-7 since it rebases fairly often. Instead SLES 12 and Ubuntu 16.04 were the constraints in 00f2cfbbec63fb6f5a7789797a62ccedd22466ea. Both of these are old enough that they are outside our platform support matrix now. Per repology, current shipping versions are: RHEL-8: 2.56.4 Debian Stretch: 2.50.3 Debian Buster: 2.58.3 openSUSE Leap 15.2: 2.62.6 Ubuntu LTS 18.04: 2.56.4 Ubuntu LTS 20.04: 2.64.6 FreeBSD: 2.66.7 Fedora 33: 2.66.8 Fedora 34: 2.68.1 OpenBSD: 2.68.1 macOS HomeBrew: 2.68.1 Thus Debian Stretch is the constraint for GLib version now. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- configure | 2 +- include/glib-compat.h | 9 -- util/oslib-win32.c | 204 ------------------------------------------ 3 files changed, 1 insertion(+), 214 deletions(-) diff --git a/configure b/configure index 69631fad3b..a1a40577c9 100755 --- a/configure +++ b/configure @@ -3296,7 +3296,7 @@ done ########################################## # glib support probe =20 -glib_req_ver=3D2.48 +glib_req_ver=3D2.50 glib_modules=3Dgthread-2.0 if test "$modules" =3D yes; then glib_modules=3D"$glib_modules gmodule-export-2.0" diff --git a/include/glib-compat.h b/include/glib-compat.h index 4542e920d5..f3b2eb04da 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -68,15 +68,6 @@ * without generating warnings. */ =20 -#if defined(_WIN32) && !GLIB_CHECK_VERSION(2, 50, 0) -/* - * g_poll has a problem on Windows when using - * timeouts < 10ms, so use wrapper. - */ -#define g_poll(fds, nfds, timeout) g_poll_fixed(fds, nfds, timeout) -gint g_poll_fixed(GPollFD *fds, guint nfds, gint timeout); -#endif - #if defined(G_OS_UNIX) /* * Note: The fallback implementation is not MT-safe, and it returns a copy= of diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 05e4ee5033..ca99356fdf 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -347,210 +347,6 @@ const char *qemu_get_exec_dir(void) return exec_dir; } =20 -#if !GLIB_CHECK_VERSION(2, 50, 0) -/* - * The original implementation of g_poll from glib has a problem on Windows - * when using timeouts < 10 ms. - * - * Whenever g_poll is called with timeout < 10 ms, it does a quick poll in= stead - * of wait. This causes significant performance degradation of QEMU. - * - * The following code is a copy of the original code from glib/gpoll.c - * (glib commit 20f4d1820b8d4d0fc4447188e33efffd6d4a88d8 from 2014-02-19). - * Some debug code was removed and the code was reformatted. - * All other code modifications are marked with 'QEMU'. - */ - -/* - * gpoll.c: poll(2) abstraction - * Copyright 1998 Owen Taylor - * Copyright 2008 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ - -static int poll_rest(gboolean poll_msgs, HANDLE *handles, gint nhandles, - GPollFD *fds, guint nfds, gint timeout) -{ - DWORD ready; - GPollFD *f; - int recursed_result; - - if (poll_msgs) { - /* Wait for either messages or handles - * -> Use MsgWaitForMultipleObjectsEx - */ - ready =3D MsgWaitForMultipleObjectsEx(nhandles, handles, timeout, - QS_ALLINPUT, MWMO_ALERTABLE); - - if (ready =3D=3D WAIT_FAILED) { - gchar *emsg =3D g_win32_error_message(GetLastError()); - g_warning("MsgWaitForMultipleObjectsEx failed: %s", emsg); - g_free(emsg); - } - } else if (nhandles =3D=3D 0) { - /* No handles to wait for, just the timeout */ - if (timeout =3D=3D INFINITE) { - ready =3D WAIT_FAILED; - } else { - SleepEx(timeout, TRUE); - ready =3D WAIT_TIMEOUT; - } - } else { - /* Wait for just handles - * -> Use WaitForMultipleObjectsEx - */ - ready =3D - WaitForMultipleObjectsEx(nhandles, handles, FALSE, timeout, TR= UE); - if (ready =3D=3D WAIT_FAILED) { - gchar *emsg =3D g_win32_error_message(GetLastError()); - g_warning("WaitForMultipleObjectsEx failed: %s", emsg); - g_free(emsg); - } - } - - if (ready =3D=3D WAIT_FAILED) { - return -1; - } else if (ready =3D=3D WAIT_TIMEOUT || ready =3D=3D WAIT_IO_COMPLETIO= N) { - return 0; - } else if (poll_msgs && ready =3D=3D WAIT_OBJECT_0 + nhandles) { - for (f =3D fds; f < &fds[nfds]; ++f) { - if (f->fd =3D=3D G_WIN32_MSG_HANDLE && f->events & G_IO_IN) { - f->revents |=3D G_IO_IN; - } - } - - /* If we have a timeout, or no handles to poll, be satisfied - * with just noticing we have messages waiting. - */ - if (timeout !=3D 0 || nhandles =3D=3D 0) { - return 1; - } - - /* If no timeout and handles to poll, recurse to poll them, - * too. - */ - recursed_result =3D poll_rest(FALSE, handles, nhandles, fds, nfds,= 0); - return (recursed_result =3D=3D -1) ? -1 : 1 + recursed_result; - } else if (/* QEMU: removed the following unneeded statement which cau= ses - * a compiler warning: ready >=3D WAIT_OBJECT_0 && */ - ready < WAIT_OBJECT_0 + nhandles) { - for (f =3D fds; f < &fds[nfds]; ++f) { - if ((HANDLE) f->fd =3D=3D handles[ready - WAIT_OBJECT_0]) { - f->revents =3D f->events; - } - } - - /* If no timeout and polling several handles, recurse to poll - * the rest of them. - */ - if (timeout =3D=3D 0 && nhandles > 1) { - /* Remove the handle that fired */ - int i; - for (i =3D ready - WAIT_OBJECT_0 + 1; i < nhandles; i++) { - handles[i-1] =3D handles[i]; - } - nhandles--; - recursed_result =3D poll_rest(FALSE, handles, nhandles, fds, n= fds, 0); - return (recursed_result =3D=3D -1) ? -1 : 1 + recursed_result; - } - return 1; - } - - return 0; -} - -gint g_poll_fixed(GPollFD *fds, guint nfds, gint timeout) -{ - HANDLE handles[MAXIMUM_WAIT_OBJECTS]; - gboolean poll_msgs =3D FALSE; - GPollFD *f; - gint nhandles =3D 0; - int retval; - - for (f =3D fds; f < &fds[nfds]; ++f) { - if (f->fd =3D=3D G_WIN32_MSG_HANDLE && (f->events & G_IO_IN)) { - poll_msgs =3D TRUE; - } else if (f->fd > 0) { - /* Don't add the same handle several times into the array, as - * docs say that is not allowed, even if it actually does seem - * to work. - */ - gint i; - - for (i =3D 0; i < nhandles; i++) { - if (handles[i] =3D=3D (HANDLE) f->fd) { - break; - } - } - - if (i =3D=3D nhandles) { - if (nhandles =3D=3D MAXIMUM_WAIT_OBJECTS) { - g_warning("Too many handles to wait for!\n"); - break; - } else { - handles[nhandles++] =3D (HANDLE) f->fd; - } - } - } - } - - for (f =3D fds; f < &fds[nfds]; ++f) { - f->revents =3D 0; - } - - if (timeout =3D=3D -1) { - timeout =3D INFINITE; - } - - /* Polling for several things? */ - if (nhandles > 1 || (nhandles > 0 && poll_msgs)) { - /* First check if one or several of them are immediately - * available - */ - retval =3D poll_rest(poll_msgs, handles, nhandles, fds, nfds, 0); - - /* If not, and we have a significant timeout, poll again with - * timeout then. Note that this will return indication for only - * one event, or only for messages. We ignore timeouts less than - * ten milliseconds as they are mostly pointless on Windows, the - * MsgWaitForMultipleObjectsEx() call will timeout right away - * anyway. - * - * Modification for QEMU: replaced timeout >=3D 10 by timeout > 0. - */ - if (retval =3D=3D 0 && (timeout =3D=3D INFINITE || timeout > 0)) { - retval =3D poll_rest(poll_msgs, handles, nhandles, - fds, nfds, timeout); - } - } else { - /* Just polling for one thing, so no need to check first if - * available immediately - */ - retval =3D poll_rest(poll_msgs, handles, nhandles, fds, nfds, time= out); - } - - if (retval =3D=3D -1) { - for (f =3D fds; f < &fds[nfds]; ++f) { - f->revents =3D 0; - } - } - - return retval; -} -#endif - int getpagesize(void) { SYSTEM_INFO system_info; --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620740225; cv=none; d=zohomail.com; s=zohoarc; b=QhXpeDQRRRwpKxFYEgDTgqtYniufj9ka6q0/psK72Uoibb0jcOqEgEnDaHRMhGIBVFvlsBTtB+Obioshd+6EhIiS1uKZYPnnAoz/evxKcBLC6OUVHUxS79RBQbZOB0H07PuiY1VI4mq2ReiO21WRS6vsq4HpNyGchw39qaE8XNU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620740225; 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=Lc2A1zh8nrAQXAHDxHLXVy8EpKc8QdPVvnaoEIWimJU=; b=KCu803PDTt6HFyOCWV0oUHxfvS5vF2Nb80YzrHjP/qjdQB264c7C2bRiaXzboJ3jRuY7Q9bO3r0NgDS6tMP+k2j3rRZpLJZXbqARWauHsdp7tQ2jvrULM0Tk6psrzc8g3qjoPoYuA8ZMA8vuGB/ugIQFiLeIoyzp9Cb9yJ6NHFo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620740225323257.857304524023; Tue, 11 May 2021 06:37:05 -0700 (PDT) Received: from localhost ([::1]:43498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSZM-0008PF-Ki for importer@patchew.org; Tue, 11 May 2021 09:37:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSR7-0000cA-CJ for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59842) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSR5-0001Ay-OQ for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:33 -0400 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-518-FViSKNIYMJqPDKV0mgHEAw-1; Tue, 11 May 2021 09:28:29 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8B161083E93; Tue, 11 May 2021 13:28:28 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 599B95946E; Tue, 11 May 2021 13:28:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739711; 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=Lc2A1zh8nrAQXAHDxHLXVy8EpKc8QdPVvnaoEIWimJU=; b=G8J2WX0PO62RjfMLIGHQAnUXaK91GrA/k2cNZdPLMyyAJUrR6i19NwcAifdSaqTxeqcIQw Z1V4bzaSe79ULSVf/p+MZzqRzxr67eAZ5htdoQAlDmwiGZ58wFUPA1J1cbE1rkqvDY0yIN KE2jWuH+bUhfrDKp4xYKRJOs9GVc3lA= X-MC-Unique: FViSKNIYMJqPDKV0mgHEAw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 11/12] configure: bump min required GCC to 6.3.0 Date: Tue, 11 May 2021 14:26:40 +0100 Message-Id: <20210511132641.1022161-12-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Several distros have been dropped since the last time we bumped the minimum required GCC version. Per repology, currently shipping versions are: RHEL-8: 8.3.1 Debian Stretch: 6.3.0 Debian Buster: 8.3.0 openSUSE Leap 15.2: 7.5.0 Ubuntu LTS 18.04: 7.5.0 Ubuntu LTS 20.04: 9.3.0 FreeBSD: 10.3.0 Fedora 33: 9.2.0 Fedora 34: 11.0.1 OpenBSD: 8.4.0 macOS HomeBrew: 11.1.0 With this list Debian Stretch is the constraint at 6.3.0 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a1a40577c9..43d2470bb6 100755 --- a/configure +++ b/configure @@ -2059,8 +2059,8 @@ cat > $TMPC << EOF # endif # endif #elif defined(__GNUC__) && defined(__GNUC_MINOR__) -# if __GNUC__ < 4 || (__GNUC__ =3D=3D 4 && __GNUC_MINOR__ < 8) -# error You need at least GCC v4.8 to compile QEMU +# if __GNUC__ < 6 || (__GNUC__ =3D=3D 6 && __GNUC_MINOR__ < 3) +# error You need at least GCC v6.3.0 to compile QEMU # endif #else # error You either need GCC or Clang to compiler QEMU @@ -2068,7 +2068,7 @@ cat > $TMPC << EOF int main (void) { return 0; } EOF if ! compile_prog "" "" ; then - error_exit "You need at least GCC v4.8 or Clang v3.4 (or XCode Clang v= 5.1)" + error_exit "You need at least GCC v6.3 or Clang v3.4 (or XCode Clang v= 5.1)" fi =20 # Accumulate -Wfoo and -Wno-bar separately. --=20 2.31.1 From nobody Tue May 21 14:43:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620740290; cv=none; d=zohomail.com; s=zohoarc; b=XTTuMfCIHDUjqdzoNS336QHE46qE0FPenSLQx1MBsXpeGnfHYk6V/cKRj/ojBQZtkRJAd0+DU4MsEcCihMxicAEPkCtoqhG1cPyvq4vBr4W+wElYSG5HatDZJSmAgpauaSg/XJ4ZUXFhcxBAexGKVzNpS398OOwuopO7SuNSiMw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620740290; 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=1Y6nJ+9b2prx5BuUeL8dWZ1NqwpahEg5UPQFlnZFkDI=; b=Zn5rD/Wn482ShKDCjNPJdz4UfQTzNMyT9ZYUFTjNu9d3lQG2WcFwP/tLlytEouUJaVwWAzD5lXqCDyq8uyzyidFWDX93pcYv0pgmPVfp6k48l/eEx41A35LPQg2x4EWUM/L2s64zn+GmTxy87x/rr3wqpYYx7vo3gdrHn6tECbA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1620740290248247.45011879374113; Tue, 11 May 2021 06:38:10 -0700 (PDT) Received: from localhost ([::1]:46654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgSaP-000270-I7 for importer@patchew.org; Tue, 11 May 2021 09:38:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSRB-0000vR-RQ for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgSRA-0001Et-CQ for qemu-devel@nongnu.org; Tue, 11 May 2021 09:28:37 -0400 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-120-lNxealD7PsKOcYpQGcEgPw-1; Tue, 11 May 2021 09:28:32 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 704E81854E26; Tue, 11 May 2021 13:28:31 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-93.ams2.redhat.com [10.36.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C6695946E; Tue, 11 May 2021 13:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620739715; 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=1Y6nJ+9b2prx5BuUeL8dWZ1NqwpahEg5UPQFlnZFkDI=; b=i85srirrD6nkToX5QvnssIo8O1YiO78eG07CJSh3kUNL78jrOi1ID/nkSc9SC4sNGEokSg xcVqbtRLmHHsb34eETFS2TBQo3UJ98hbPXcsrusAe8DJPOxUIi35HoTofJuDUM3qlHgfBR axi6aNoBFub2cWD+hu4Kz4iQMeBJDGc= X-MC-Unique: lNxealD7PsKOcYpQGcEgPw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 12/12] configure: bump min required CLang to 7.0.0 / XCode 10.2 Date: Tue, 11 May 2021 14:26:41 +0100 Message-Id: <20210511132641.1022161-13-berrange@redhat.com> In-Reply-To: <20210511132641.1022161-1-berrange@redhat.com> References: <20210511132641.1022161-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Several distros have been dropped since the last time we bumped the minimum required CLang version. Per repology, currently shipping versions are: RHEL-8: 10.0.1 Debian Stretch: 7.0.1 Debian Buster: 7.0.1 openSUSE Leap 15.2: 9.0.1 Ubuntu LTS 18.04: 10.0.0 Ubuntu LTS 20.04: 11.0.0 FreeBSD 12: 8.0.1 Fedora 33: 11.0.0 Fedora 34: 11.1.0 With this list Debian Stretch is the constraint at 7.0.1 An LLVM version of 7.0.1 corresponds to macOS XCode version of 10.2 which dates from March 2019. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 43d2470bb6..c41a3e5eef 100755 --- a/configure +++ b/configure @@ -2050,12 +2050,12 @@ fi cat > $TMPC << EOF #if defined(__clang_major__) && defined(__clang_minor__) # ifdef __apple_build_version__ -# if __clang_major__ < 5 || (__clang_major__ =3D=3D 5 && __clang_minor__ = < 1) -# error You need at least XCode Clang v5.1 to compile QEMU +# if __clang_major__ < 10 || (__clang_major__ =3D=3D 10 && __clang_minor_= _ < 2) +# error You need at least XCode Clang v10.2 to compile QEMU # endif # else -# if __clang_major__ < 3 || (__clang_major__ =3D=3D 3 && __clang_minor__ = < 4) -# error You need at least Clang v3.4 to compile QEMU +# if __clang_major__ < 7 || (__clang_major__ =3D=3D 7 && __clang_minor__ = < 0) +# error You need at least Clang v7.0 to compile QEMU # endif # endif #elif defined(__GNUC__) && defined(__GNUC_MINOR__) @@ -2068,7 +2068,7 @@ cat > $TMPC << EOF int main (void) { return 0; } EOF if ! compile_prog "" "" ; then - error_exit "You need at least GCC v6.3 or Clang v3.4 (or XCode Clang v= 5.1)" + error_exit "You need at least GCC v6.3 or Clang v7.0 (or XCode Clang v= 10.2)" fi =20 # Accumulate -Wfoo and -Wno-bar separately. --=20 2.31.1