From nobody Mon May 6 11:20:30 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=1620993950; cv=none; d=zohomail.com; s=zohoarc; b=i6VwIj6+YtZPug71ZJ6pstP03OvuIC20OWULZyPR4jJJ1WgriXP7kVMQ0m4X3TEo4wMD17EIX0fWSI/IwnM9miSIz6K+Rxrs8qmOR+t5tOLH45o70ktLESNl8bxxm8Rrk3CZwjRVVX6/SJADzg6/CdtrXQUgWOimGIy4NCimv8k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620993950; 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=oiiNzwAqC8ElPKrTMjCyssNm6xQYSWclgj3vpdf2uf0=; b=i7QAdICkyyWejbEwje6ZVSuUt0ApIQNo3GYYopylv+n7ke8fBBj0gDBhxpaQRffhy3VEsPY2mEYL09mh39nqPQUeJzqhP3k4ElFu/4UmAtuIVkzMEiz7mk7e1imyKEYvKRN9XdisQVwA68A7T20yz+3hgrOHuKBy5+gVRTxsU4Y= 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 1620993950739394.5495513934229; Fri, 14 May 2021 05:05:50 -0700 (PDT) Received: from localhost ([::1]:38522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWZh-0006eD-Az for importer@patchew.org; Fri, 14 May 2021 08:05:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYX-0004k4-MO for qemu-devel@nongnu.org; Fri, 14 May 2021 08:04:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYW-00065S-5I for qemu-devel@nongnu.org; Fri, 14 May 2021 08:04: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-179-5cPVGQ6KMHS5hHfFtd6-dA-1; Fri, 14 May 2021 08:04:32 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C125107ACCA; Fri, 14 May 2021 12:04:31 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2209B19C59; Fri, 14 May 2021 12:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993875; 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=oiiNzwAqC8ElPKrTMjCyssNm6xQYSWclgj3vpdf2uf0=; b=CzSJ0WF87b9YyQJ0TT1ZtayP8iB0s7mTuXp1n3hAIVdrBRngWH5XjMsesvZPZkZfOiVDAA 8hD0DNfFxiLdD92rpvL4b2ToNvI6js/yv69rCv+oOQ6jRrqPU66l/kngEhaR+n5z3sryJH gSOC8l+vUBS2NODdNrRPRNg9XJ6nrOo= X-MC-Unique: 5cPVGQ6KMHS5hHfFtd6-dA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/12] gitlab: drop linux user build job for CentOS 7 Date: Fri, 14 May 2021 13:04:04 +0100 Message-Id: <20210514120415.1368922-2-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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. The build-user-centos7 job was to detect a failure specific to CentOS 7 and there are already other linux user jobs for other platforms. Thus we can drop this job rather than move it to CentOS 8. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dcb6317aac..726450a46d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -441,15 +441,6 @@ build-user-plugins: MAKE_CHECK_ARGS: check-tcg timeout: 1h 30m =20 -build-user-centos7: - <<: *native_build_job_definition - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - CONFIGURE_ARGS: --disable-system --disable-tools --disable-docs - MAKE_CHECK_ARGS: check-tcg - build-some-softmmu-plugins: <<: *native_build_job_definition needs: --=20 2.31.1 From nobody Mon May 6 11:20:30 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=1620994079; cv=none; d=zohomail.com; s=zohoarc; b=H7GB3joLTEUSl63i4M/Ppb+C+KBsFcsuCNB/1qh9aHHN37LMO8zYr2G+sljlFT4QMTrGkEAvASYT4nW0bSpeFgfUttiro/I8Fb+zSQkeeJ8MUtoibL3CyNEWpYZ/dJlwp/dOi9PMf+fBdrAlio5BUcytPFzXNT0F13PgWH9L96o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620994079; 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=SMVicQebuA0dPkuedf2aAbomxcHcex1RGuWGHBd4bMEcl72eEJ2ev2wAkzh3gfwMXUt1B9xfkt3h17HynQeEc7Bxu2T33TIV6Ugb5i/GRwQv9sBYr6zy9ZZb00bidGlxjA0AI0fTBa1dahp0lQk8XzsCD6NqJpYsYZ8XM9FFABc= 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 1620994079251777.5933527045546; Fri, 14 May 2021 05:07:59 -0700 (PDT) Received: from localhost ([::1]:46488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWbm-0003k2-87 for importer@patchew.org; Fri, 14 May 2021 08:07:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYa-0004o5-06 for qemu-devel@nongnu.org; Fri, 14 May 2021 08:04:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYY-00066c-Fk for qemu-devel@nongnu.org; Fri, 14 May 2021 08:04:39 -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-528-wHa1uOFGOuivSEJ-ElCBqw-1; Fri, 14 May 2021 08:04:34 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E026801B12; Fri, 14 May 2021 12:04:33 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C3BA19C59; Fri, 14 May 2021 12:04:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993877; 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=Qnvxb9KifhZTfR30jFxoAH5zd/3wFLTYxeggCYJONLUR+klm/bEUTRER2tgfgghcakrDpR I6aWhUsLB17zn3U/ViLLjiw6JA1D8Cj/DX52lDqZ7lr55tOfhmQnBDO/fCxG3zL8DEC4dA CagJ6/GT0K43MY9I9rwXk7ecFN4zdQU= X-MC-Unique: wHa1uOFGOuivSEJ-ElCBqw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/12] patchew: move quick build job from CentOS 7 to CentOS 8 container Date: Fri, 14 May 2021 13:04:05 +0100 Message-Id: <20210514120415.1368922-3-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- .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 Mon May 6 11:20:30 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=1620994187; cv=none; d=zohomail.com; s=zohoarc; b=QsEAwgH66xwfvp3cKBQBe7tsM/5Mt23oMhREq8Wva7OKQbPI6YDJFSikBguVUNrpO02xb5Q//ZBvGBML0Y/GKfWykG3whjEIIhlEdFnpUsjFj+egRZm5IjW8s6wSJAiPC91qTsl76/wmZUK8/TCL8Y8P3H9xY9qhJ7DXG3PfS/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620994187; 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=TH9TnKRuETbiJF5vf8an/izkft9YN7Yj8z+Fk/KpytQ=; b=fUi5cp/jmTlQXc4ohjFP+iarU6jBRAFLEgDQsO/c/aiCX5P1FSJ1G6EHKq0WbVPg+2U4YP1BMN9yvOcp6s9gg9Apgpy2exia+ry3kcNBeLLyye1/XUzFZd8D5n0t+Py6DHVh0HS2HbXF+PLav2R3iFULo0sua2yQw88dx7Hvz5o= 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 1620994187425534.5684498084875; Fri, 14 May 2021 05:09:47 -0700 (PDT) Received: from localhost ([::1]:53170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWdW-0008IJ-7C for importer@patchew.org; Fri, 14 May 2021 08:09:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYd-0004wS-4C for qemu-devel@nongnu.org; Fri, 14 May 2021 08:04:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYb-00068x-9V for qemu-devel@nongnu.org; Fri, 14 May 2021 08:04:42 -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-486-C5jBiChbMoyVqqhuHTnXlA-1; Fri, 14 May 2021 08:04:37 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4C8891854E2A; Fri, 14 May 2021 12:04:36 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E93E19C59; Fri, 14 May 2021 12:04:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993880; 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=TH9TnKRuETbiJF5vf8an/izkft9YN7Yj8z+Fk/KpytQ=; b=EL1OOr2BH52enBWmCSyv+YDz9x2huo3L+waPo0qSdjQhqZ2szN6sv5I2AhkKVYQ1kDkfdg 4O4yChsDcucArr3icm1tUzclxj8atyRWyUOtczCxb1iLEgNBVsCqHJbjfij641btvINGkj Bwutqgwclf/+OTv610n7QHzWrlr9WDg= X-MC-Unique: C5jBiChbMoyVqqhuHTnXlA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/12] crypto: bump min nettle to 3.4, dropping RHEL-7 support Date: Fri, 14 May 2021 13:04:06 +0100 Message-Id: <20210514120415.1368922-4-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 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 Ubuntu LTS 18.04 has the oldest version and so 3.4 is the new minimum. Signed-off-by: Daniel P. Berrang=C3=A9 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 726450a46d..f012b16b79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -707,16 +707,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 6fea3210bd..050299290d 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.4"; 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 @@ -5731,7 +5730,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 Mon May 6 11:20:30 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=1620993982; cv=none; d=zohomail.com; s=zohoarc; b=KNNMa0BO19LwL+x2DYO7BZ6OsNXO0WtsKkOCoC3ilg7ysotTFE3oJAsbZOxV6CjVv56czeEu48fI3COZDjNHOf7SeDzES5fg2WLp0xqikwLcj/R3h84lvqMlQmjy/xBk9LmN1MnMkrW2NefxuViEdwfXLwJ/uO0gaWCCxUgKO6Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620993982; 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=zpfzTAtt+LJzfZ5GeV/VxchmS7IGOLw3v5Cwq3Y/XZw=; b=Qww/QkAvBk2Td5RMdnKAmEt1+faZvh+O6iCgQy150PEIHsBpsd61q2azktZIVow9WWHreizedLPfHU2ZnkIuIC227neo2Jak5WzE1xfOOBhgwcsD90YBEm5iEJ2bJYQFwcWt+53cA4E4WS9Zb9bnXNU1BKRzZPwzIVfY7kzL7JA= 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 1620993982869284.80987637362625; Fri, 14 May 2021 05:06:22 -0700 (PDT) Received: from localhost ([::1]:40958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWaD-0008Ni-Eo for importer@patchew.org; Fri, 14 May 2021 08:06:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYr-0005YA-Cu for qemu-devel@nongnu.org; Fri, 14 May 2021 08:04:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYo-0006Ig-F9 for qemu-devel@nongnu.org; Fri, 14 May 2021 08:04:57 -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-5-aCB-Ij5eO7u5CRiCm4mEVA-1; Fri, 14 May 2021 08:04:50 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2BD77802939; Fri, 14 May 2021 12:04:49 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D81E1971B; Fri, 14 May 2021 12:04:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993893; 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=zpfzTAtt+LJzfZ5GeV/VxchmS7IGOLw3v5Cwq3Y/XZw=; b=KmtkbcNi5ZCY6r77HNrT/pA2W2iB7OLruecF/ReFZaAFJRi3NQTVkRweBtpC/l7IE0eD5i junuKiOb1eIpXqaXaaGRC4mSOWxQzS2vQDCMS246eHyabpDjCFSr5NB1jxs/1YMxqaVxdg yBZAohPeUrkINbORUXWP0XJ7AsUA7LU= X-MC-Unique: aCB-Ij5eO7u5CRiCm4mEVA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/12] crypto: drop back compatibility typedefs for nettle Date: Fri, 14 May 2021 13:04:07 +0100 Message-Id: <20210514120415.1368922-5-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 , Richard Henderson , =?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. Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Willian Rampazzo =CC=89=CC=89 --- 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 Mon May 6 11:20:30 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=1620994322; cv=none; d=zohomail.com; s=zohoarc; b=TC+U5xuC0Nd/hQGroQRQWOZgtySiY/IzMjiG96W9V1UEkefB0xMuz6me+eP3+xivnkm4ydRho1I712fssYFZl9U2OWk72LwzPBcFYbnJHslyzgn/hEJGg3tw8jU7jJUhsJp2X2iM480u372/D04CnQPtnUc08u8p1Pj4fUIIbFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620994322; 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=mFx8e8+dEabLfuCBOwhikEnETFkyjPxOBK4g+9jNqkE=; b=nO3c3kJLrVVlvaviK2uFqY+BSSYGVyQxwQd97K9n02Np8Fto+jtgUtSnpjvBtGMsnqfIAViHyVwqITG94qOqcTLivgw8kFMpAoa7GIZ/GzQ2MXDjHCTXdMA6r59xACFHmD/vj27Q2Ndu+suUGAvaPH4kMdIApY+SulocMci4+ys= 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 162099432277038.74503287006132; Fri, 14 May 2021 05:12:02 -0700 (PDT) Received: from localhost ([::1]:58956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWfh-0003ns-F3 for importer@patchew.org; Fri, 14 May 2021 08:12:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYs-0005a6-9h for qemu-devel@nongnu.org; Fri, 14 May 2021 08:04:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYp-0006J0-Ig for qemu-devel@nongnu.org; Fri, 14 May 2021 08:04:57 -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-7-fYvZICyAOkGkuns3PeWQ4g-1; Fri, 14 May 2021 08:04:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11D2910082E0; Fri, 14 May 2021 12:04:52 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8605719C59; Fri, 14 May 2021 12:04:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993894; 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=mFx8e8+dEabLfuCBOwhikEnETFkyjPxOBK4g+9jNqkE=; b=EKViau2LrN/92ErCCpkKcrt+LjrMlIe8gy+T5hE+nwMF6R69+IKN0pYdYJQg3wWI2ulyqN 3N2j/l77z3s3S6UU6oVuqfGypb0Aaeu3yTl+XbVffBJN0TBpQI1X48DYOJQZogUPxq0Mxj rfNEZoNjd6QhIWR1qqUUR13Z4hDWA2g= X-MC-Unique: fYvZICyAOkGkuns3PeWQ4g-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/12] crypto: bump min gcrypt to 1.8.0, dropping RHEL-7 support Date: Fri, 14 May 2021 13:04:08 +0100 Message-Id: <20210514120415.1368922-6-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 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 Ubuntu LTS 18.04 has the oldest version and so 1.8.0 is the new minimum. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- .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 f012b16b79..f44c5b08ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -707,16 +707,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 050299290d..f077cdb9c3 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 8 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); @@ -5722,9 +5709,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 Mon May 6 11:20:30 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=1620993985; cv=none; d=zohomail.com; s=zohoarc; b=Bffq6uImLsFHF8DK4wGbGNlO5ekDyDBnoxbQ28wCQKJjqIifry+/fwCs2SN1isUjPtTOdSO1f3eDqic70U2wAVTjnLdmpBvWdfo1P4DyywWU5Q7ET2iU+oZTZpivNCYa7PkJc7J15WcKjkZnyGSA5PmER130JrwHHOcTReIYzJw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620993985; 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=js88CfIw/sof8cXTkiaHvuNoV7yQFJJrwEDZk5/BaGU=; b=lhDiJGltw2MZmxE3AIBKxVYyccLCMNwVaBkncP6hO2k+dNCd4LJSIocRJ+08PYsCZBeI7GuWPO5D4Y52Dz7ioJCHh7R2n3pMJ3ZV0Oys03uf3IudAAOYkaSzdW2qD7Zt1tToCcDFoc7C+vhfb0y4BtTmqgpzhzyVDzkn8x+6mAE= 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 1620993985177821.4418793153649; Fri, 14 May 2021 05:06:25 -0700 (PDT) Received: from localhost ([::1]:41232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWaF-00007T-R7 for importer@patchew.org; Fri, 14 May 2021 08:06:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYv-0005j5-3b for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55703) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYt-0006Ld-D3 for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:00 -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-593-OoZrzS-eOFW_eheYxvWW4Q-1; Fri, 14 May 2021 08:04:55 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B4DF8015A8; Fri, 14 May 2021 12:04:54 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65FFF1971B; Fri, 14 May 2021 12:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993898; 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=js88CfIw/sof8cXTkiaHvuNoV7yQFJJrwEDZk5/BaGU=; b=bGOCvWjKTeRMMPWC6tMQFZNsVswXkM7kQzWpotPq7+Chk3NMVIXqAE9rKSfhaAHRYNLcmZ FKcVLhsX2yI0sHYhiP7Lr3UhtW+cVLdLaXnENxfbOPHwHH3/JKBfyo8v95C4YQM2Uwbm+W apMSUU5MTlhWg0U4zQLxpUfqm1s66c0= X-MC-Unique: OoZrzS-eOFW_eheYxvWW4Q-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/12] crypto: bump min gnutls to 3.5.18, dropping RHEL-7 support Date: Fri, 14 May 2021 13:04:09 +0100 Message-Id: <20210514120415.1368922-7-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 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 Ubuntu LTS 18.04 has the oldest version and so 3.5.18 is the new minimum. Signed-off-by: Daniel P. Berrang=C3=A9 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 f44c5b08ef..f386f445d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -703,21 +703,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 f077cdb9c3..2fa86ccaa1 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.18"; 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 Mon May 6 11:20:30 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=1620994083; cv=none; d=zohomail.com; s=zohoarc; b=ex+mBrWQlq+Z1pSjyGE2R4sB1rdUDuaOYvdElOnF/4jRpQ9cOQzd1nGdikW3jHvO/lyp9RQZewyi3e1LHdS7yolAd7XHAYFZj7gKb4aNV1DRhRVu/Qr3JB71zi6nJ+mZf8eYu08hGYciM/u911sr40d6A5w34zFyN2oWQEF2Zm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620994083; 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=GS8Q5myV/o+9a7NsGtFfVZMhkiyyUr2i01QVxvdT8Ao=; b=RvEE3LgkpFY4zVBmbHcWKjbkw6jBjK8zsgNFjSVsZl2sL7gu35p58rxlpALw/IzS/chbokbwJb91tqrQekFC/jQX9H2YV/CpTNEPJI/Jamyr4J/KnXrHEOxbUmJ3XW9oPnyqz0OOLYjYpIote1GTYjfdwLcXXOzJt1D9flZWjJA= 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 1620994083629664.0823529233928; Fri, 14 May 2021 05:08:03 -0700 (PDT) Received: from localhost ([::1]:46784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWbq-0003ws-Jh for importer@patchew.org; Fri, 14 May 2021 08:08:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYx-0005uT-U3 for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWYw-0006PJ-AI for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:03 -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-524-ua_w-uggObujQMPlXjIqtQ-1; Fri, 14 May 2021 08:04:58 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1A4938015F7; Fri, 14 May 2021 12:04:57 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id D70F71A873; Fri, 14 May 2021 12:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993901; 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=GS8Q5myV/o+9a7NsGtFfVZMhkiyyUr2i01QVxvdT8Ao=; b=fMgU8v1/7vEzA2nPhsNzGUWOouWobZl10s1+kPsI6M/cdlf1v8ZBvfcUc5SAUfMlRaWc96 2Vt0uPcMo/k3QhUMogd569VMS3X/zMxgao9R5YsQ5EyLS3d4TQHK/7uA77CGUpqiNc7n03 ZQ+sk4rJxBsF0PYn5Bqp/DJgh/JlkVY= X-MC-Unique: ua_w-uggObujQMPlXjIqtQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/12] crypto: drop used conditional check Date: Fri, 14 May 2021 13:04:10 +0100 Message-Id: <20210514120415.1368922-8-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 , Richard Henderson , =?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. Reviewed-by: Willian Rampazzo Reviewed-by: Richard Henderson Signed-off-by: Daniel P. Berrang=C3=A9 --- 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 Mon May 6 11:20:30 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=1620994124; cv=none; d=zohomail.com; s=zohoarc; b=P8c/Pp4UVJsmkUso0FmKVdDKw3bVP/+2mDVYNYYwI2uVzpyuo4iu3J9xwpxDU5DZL+ceaRF2W+TinZChlfOw3HNK8e3LcgotmfWsa6eCLEoBoVrLpWOCH3RIQWMDfc6B3FIiKIyMtuaDhEqEwV6KKF4zOiYz1CiHO5UKSLKeuFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620994124; 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=wB2nO/nngPLpdhou8ajirRF/sE+AlD0hyf1zX1q/xFk=; b=CnSXRmQ8Qo8J5RBlv/xlIC8wo5FfIE1BhGS+/QpCBD1YUNhlwfM7v5TCV49/vDaf1/7fmVDgVW51WtKhjELEmIlcdIIjTd+D8VwvAc/QxgEHesh4ZS+Pe5KW3FmJlqBfQa6d7spvMws1LZdG9vyVnJnwcrpqZo7yLODdsALEHog= 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 1620994124119440.50585884474026; Fri, 14 May 2021 05:08:44 -0700 (PDT) Received: from localhost ([::1]:49256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWcU-0005cr-Vu for importer@patchew.org; Fri, 14 May 2021 08:08:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWZ5-0006P8-DV for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58542) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWZ3-0006Wr-GO for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:11 -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-405-mkN9KGD4NBGCNthFwTss3w-1; Fri, 14 May 2021 08:05:01 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01713800D62; Fri, 14 May 2021 12:05:00 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83C4A1A873; Fri, 14 May 2021 12:04:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993909; 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=wB2nO/nngPLpdhou8ajirRF/sE+AlD0hyf1zX1q/xFk=; b=Ve2fudBn6XC/TUl5u0H14J6MyTc3m/rMh8ZuCdKlI/l/4PMdkgSBa+YkrpHTLLg2yHhytT tvFJxc6s2HVQTvWXeXYoeiPCxXuyVVLV1taaIKWnqFcndvO+gjZLsHi3oT5wmC+3anArPb +uebb542va1u032EZe8sXhecgdbaz58= X-MC-Unique: mkN9KGD4NBGCNthFwTss3w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/12] tests/vm: convert centos VM recipe to CentOS 8 Date: Fri, 14 May 2021 13:04:11 +0100 Message-Id: <20210514120415.1368922-9-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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) Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Willian Rampazzo --- tests/vm/centos | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/vm/centos b/tests/vm/centos index efe3dbbb36..5c7bc1c1a9 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -26,24 +26,23 @@ 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.3.2011-20201204.2.x86_64.qcow2") img_tmp =3D img + ".tmp" - sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["ln", "-f", cimg, img_tmp + ".xz"]) - subprocess.check_call(["xz", "--keep", "-dvf", img_tmp + ".xz"]) + subprocess.check_call(["ln", "-f", cimg, img_tmp]) self.exec_qemu_img("resize", img_tmp, "50G") self.boot(img_tmp, extra_args =3D ["-cdrom", self.gen_cloud_init_i= so()]) self.wait_ssh() self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") - self.ssh_root_check("yum update -y") - self.ssh_root_check("yum install -y docker make ninja-build git py= thon3") - self.ssh_root_check("systemctl enable docker") + self.ssh_root_check("dnf update -y") + self.ssh_root_check("dnf install -y dnf-plugins-core") + self.ssh_root_check("dnf config-manager --set-enabled powertools") + self.ssh_root_check("dnf install -y podman make ninja-build git py= thon3") self.ssh_root("poweroff") self.wait() os.rename(img_tmp, img) --=20 2.31.1 From nobody Mon May 6 11:20:30 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=1620994232; cv=none; d=zohomail.com; s=zohoarc; b=J7lUHyxqEWu8d8OA/mj9wgblNThGEBFVJNiVOcXESrB0iyvAmPg5w184lAmU92ZzBgeDPxxdW9sqo8dx6dJZApXRs78/qe6hO9atnaRbIbmn+9GKrQwrJPYc2VNxjCiIwkkjOWTy8jkh1GSTKKOim2rnLVQNk3odctp4MU3WF50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620994232; 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=JX8Oq8g+jAkxzf/fZzPa1dehHZipXsBMFn/ARknt84s=; b=dNn5i2vi7XiFc7BowZ5BFkbBrIOmHbeKjnkqR9Kff1H1lp2ykTmJdze2pgTdZ8L6SIA+uKJTU5UiednadQWOJrWRMps4Cu0QDAqYGLgP2GxM5ZQ9L9WeTuZZkyAANFT3LWuMpo4v4xUmMLw4zRknJc/fJe41+MFKiW0Bbn5YpWI= 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 1620994232132929.0231040323533; Fri, 14 May 2021 05:10:32 -0700 (PDT) Received: from localhost ([::1]:55488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWeE-0001OR-QC for importer@patchew.org; Fri, 14 May 2021 08:10:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWZV-0007YN-IR for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28326) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWZT-0006yw-UK for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05: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-482-9dy_QafPPU6gyB09Yjuz0A-1; Fri, 14 May 2021 08:05:33 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87CE41009479; Fri, 14 May 2021 12:05:32 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65D5919C59; Fri, 14 May 2021 12:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993935; 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=JX8Oq8g+jAkxzf/fZzPa1dehHZipXsBMFn/ARknt84s=; b=J8zDY4UwJRvDp9fmkKlXKHmVgt+qKK/3HpZVza+kJIbvcdhyybD8UFNpHOLsnZ6pR3Y1XV EQ2RN9PSmorkJ+BqcFwPpZbvNf9pmLYQjkyuJrXmRDIbUfGrZlKRS/sEvHfe6n8ZLBuJbh V5YqMpByGMEmuv649DOGvNzOz4mAKQs= X-MC-Unique: 9dy_QafPPU6gyB09Yjuz0A-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/12] tests/docker: drop CentOS 7 container Date: Fri, 14 May 2021 13:04:12 +0100 Message-Id: <20210514120415.1368922-10-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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. Reviewed-by: Thomas Huth Acked-by: Alex Benn=C3=A9e Reviewed-by: Willian Rampazzo Signed-off-by: Daniel P. Berrang=C3=A9 --- .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 Mon May 6 11:20:30 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=1620994191; cv=none; d=zohomail.com; s=zohoarc; b=fFXAPzPmO7eQlr+8U/C2jiDj9m7+2WxYuo66DFPvSQf0mCEoRI5ypBcWSzccKdZq1b9DB28LOfqt0y+9ivCxE5/RQtzIAMP4FrgDBnqyYCeCPwkKxWGaIMRv0mdmRw5j9zJfj62K+ZulXeFB4/4jyJspPczSHBsZ8PDyziDuJQU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620994191; 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=lsvMU5/K0QLao3PDuyh0FrcCYAdM9P0Qeh2khOayCYM=; b=eNDHIdN5OrE25AzrKf/UQc/DK2KqN1U+A+9FuQ3l8b7aJS1BoBLthbvHW7i113atcx1CzzhsKGiEMu11ZD0CQLMvnQQ90zemqHynkE5RC3o21YhLlJjSu5IXpil+HFaCLOgMguHvKpWHd8A4dWQCITv7+l+MQq49x9WamTFpwq4= 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 1620994191934903.7151759683948; Fri, 14 May 2021 05:09:51 -0700 (PDT) Received: from localhost ([::1]:53532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWda-000055-ER for importer@patchew.org; Fri, 14 May 2021 08:09:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWZo-0008F2-6f for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWZl-0007Il-S4 for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:55 -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-553-5JMewqglNPG4gCihAKTz6w-1; Fri, 14 May 2021 08:05:51 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2A39107ACF7; Fri, 14 May 2021 12:05:49 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id F265419C59; Fri, 14 May 2021 12:05:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993953; 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=lsvMU5/K0QLao3PDuyh0FrcCYAdM9P0Qeh2khOayCYM=; b=RC1/X3W98BROGeGtYLapjpc7cuECGfV4hG1R+tjt5M79mUhB4A7H4ASWT+GxN3Y9kVCozH 2wn0+dklDDK936jKP78FmyZGliEC+KNFFeRATv2Zlk6P7plU26K31Y02RM7nlK79GmMTRY Sc9wtfgrzc9H1aq3ctlVRqntrBmHs/4= X-MC-Unique: 5JMewqglNPG4gCihAKTz6w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/12] configure: bump min required glib version to 2.56 Date: Fri, 14 May 2021 13:04:13 +0100 Message-Id: <20210514120415.1368922-11-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 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 Ubuntu LTS 18.04 / RHEL-8 are the constraint for GLib version at 2.56 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- configure | 2 +- include/glib-compat.h | 13 +-- util/oslib-win32.c | 204 ------------------------------------------ 3 files changed, 3 insertions(+), 216 deletions(-) diff --git a/configure b/configure index 2fa86ccaa1..efd76368b5 100755 --- a/configure +++ b/configure @@ -3296,7 +3296,7 @@ done ########################################## # glib support probe =20 -glib_req_ver=3D2.48 +glib_req_ver=3D2.56 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..9e95c888f5 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -19,12 +19,12 @@ /* Ask for warnings for anything that was marked deprecated in * the defined version, or before. It is a candidate for rewrite. */ -#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48 +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56 =20 /* Ask for warnings if code tries to use function that did not * exist in the defined version. These risk breaking builds */ -#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_48 +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_56 =20 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -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 Mon May 6 11:20:30 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=1620994507; cv=none; d=zohomail.com; s=zohoarc; b=gzdXwr+Aiq60CN0Izxy90rSZAbFwpHS10FILoYgBbel55i5Pl54Q6kjBoQ7xa2MBMFYWFu1qb4bgn2/r/sUSckRscR9yvcfVDysnf0d5izhM9cD2b/X5oLupK/s7lnULsl5346YWTxpiEyuKUnBwcAZD4MgV48o6o0YDurYIWZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620994507; 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=OLPgpn8BKTWljKyDi9rdR2nuT+jp+n8YazeXQdQjz/c=; b=AWHG7485NFBofIjqqpbSYmfRQNlPutOMVF56PCGjHj5eZeN+txdxoNvoumxZPDlgwnX8XGmM7dKognumlxZCXDYvkMEi4toeugGAgZQUCnt/yBjtNkrFHTwn0FZ1+eWDAMZj0Bv9obhkhN9dvcrB2RK9+1RgSEC2UX6r2t8vjOg= 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 1620994507370487.15205692222014; Fri, 14 May 2021 05:15:07 -0700 (PDT) Received: from localhost ([::1]:36764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWig-0007tC-56 for importer@patchew.org; Fri, 14 May 2021 08:15:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWZp-0008Km-N5 for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWZo-0007KS-0M for qemu-devel@nongnu.org; Fri, 14 May 2021 08:05:57 -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-400-yWxihnWhNl2CQQrdtJakBg-1; Fri, 14 May 2021 08:05:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3DA48049C5; Fri, 14 May 2021 12:05:52 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7447719C59; Fri, 14 May 2021 12:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993955; 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=OLPgpn8BKTWljKyDi9rdR2nuT+jp+n8YazeXQdQjz/c=; b=Yl9BxcolOvxU/Qc3omZcbaUrn3d63PlqA/HZYjCe6gU77CnZfyJqXlekX8iUVorjNN7udF CrsghAFU03zpfopaDubKuMM4O7NySc4WZ92c75HCWDBld+DsNoe/bIDK6bAVFwTlvQ1bH2 6jaUKt43PowVTHr8/qPWIISvYuIJXb8= X-MC-Unique: yWxihnWhNl2CQQrdtJakBg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/12] configure: bump min required GCC to 7.5.0 Date: Fri, 14 May 2021 13:04:14 +0100 Message-Id: <20210514120415.1368922-12-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 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 Ubuntu LTS 18.04 / openSUSE Leap 15.2 are the constraint at 7.5.0 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index efd76368b5..ac8520172a 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__ < 7 || (__GNUC__ =3D=3D 7 && __GNUC_MINOR__ < 5) +# error You need at least GCC v7.5.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 v7.5 or Clang v3.4 (or XCode Clang v= 5.1)" fi =20 # Accumulate -Wfoo and -Wno-bar separately. --=20 2.31.1 From nobody Mon May 6 11:20:30 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=1620994468; cv=none; d=zohomail.com; s=zohoarc; b=cAEmxKGQg8w27ubUDsuWvyyorywF2Y3u32sSKw5oR+LDqmWVlNzeXx30sXztNemNs4NQQ9H2O/o9kuJ9IVQC9uIVVqEK2dfKkk2ZeyKN86R1KnjTYOPulO6EA3emzHbaVxKrJxuqmbUZZrf/j9xLxrpySzC3k6Yy4BzgpqHP080= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620994468; 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=jjZQMGPk0AYiuVr47VExOoPSbGm6xGFlVtgfifpj3k8=; b=FgYJzAx2kaG2fgUqG1uCYK2MG3rGKfnX5Qig28TWrzUmrVHa3gjZaEr9QhnUyAMnH70Ij175mPczDiIa++q8jALtwcN/nCBiQBsxNQwUBFOk+8cTMxkBhtiUL/VgYtYh+18jUDdXI98ubElHN7cWrjAmKqol+hN+cs4D8LCcBjY= 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 1620994468758464.33310863560484; Fri, 14 May 2021 05:14:28 -0700 (PDT) Received: from localhost ([::1]:35122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWi2-0006m3-HT for importer@patchew.org; Fri, 14 May 2021 08:14:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWa0-0000Lg-5r for qemu-devel@nongnu.org; Fri, 14 May 2021 08:06:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20586) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWZy-0007U8-Fy for qemu-devel@nongnu.org; Fri, 14 May 2021 08:06:07 -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-290-0x6k3PngODOMIubwYFCfvg-1; Fri, 14 May 2021 08:06:04 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2E3D8818401; Fri, 14 May 2021 12:06:03 +0000 (UTC) Received: from localhost.redhat.com (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 443C219C59; Fri, 14 May 2021 12:05:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620993965; 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=jjZQMGPk0AYiuVr47VExOoPSbGm6xGFlVtgfifpj3k8=; b=KoqhCce6D/TAoA1EosveeH4xICRCpVVfIOCZDQoGnlhjsm20ZrkAttFJWCLb3f9f1L5AyZ VIECKnq6QrXgUGo7jiju8WE1sTca9ZNsA9HDenFpafPGaKqPWOFMXrCwcS/pc5n0zKCadS ZW+PZk787gTXzUN97HaBKcFOIriBRuI= X-MC-Unique: 0x6k3PngODOMIubwYFCfvg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 12/12] configure: bump min required CLang to 6.0 / XCode 10.0 Date: Fri, 14 May 2021 13:04:15 +0100 Message-Id: <20210514120415.1368922-13-berrange@redhat.com> In-Reply-To: <20210514120415.1368922-1-berrange@redhat.com> References: <20210514120415.1368922-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Buster: 7.0.1 openSUSE Leap 15.2: 9.0.1 Ubuntu LTS 18.04: 6.0.0 Ubuntu LTS 20.04: 10.0.0 FreeBSD 12: 8.0.1 Fedora 33: 11.0.0 Fedora 34: 11.1.0 With this list Ubuntu LTS 18.04 is the constraint at 6.0.0 An LLVM version of 6.0.0 corresponds to macOS XCode version of 10.0 which dates from Sept 2018. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index ac8520172a..67e5a267c2 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_= _ < 0) +# error You need at least XCode Clang v10.0 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__ < 6 || (__clang_major__ =3D=3D 6 && __clang_minor__ = < 0) +# error You need at least Clang v6.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 v7.5 or Clang v3.4 (or XCode Clang v= 5.1)" + error_exit "You need at least GCC v7.5 or Clang v6.0 (or XCode Clang v= 10.0)" fi =20 # Accumulate -Wfoo and -Wno-bar separately. --=20 2.31.1