From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D8549D2F7FD for ; Thu, 17 Oct 2024 08:12:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1LcB-0001Ql-KW; Thu, 17 Oct 2024 04:12:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1Lc5-0001QR-Uh for qemu-devel@nongnu.org; Thu, 17 Oct 2024 04:12:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1Lc4-0005NW-CH for qemu-devel@nongnu.org; Thu, 17 Oct 2024 04:12:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729152721; h=from:from:reply-to: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=gVAGaBvuCY6JlId0LiXsQitr1nNbAhkBdI+45fAxrRE=; b=NA84BkSuJ5TtwOAzMeWcx2wTPi4l+jNSUObA8pOuml/6StDSsWhKmRhXv/D8Nn6jyzvlrK n44s4oCMCVi/sZ7p8crdyQId6oE3nX/+1SVEJpNpvUxsjLww50v2XeU88gA6rEMuieyifK zzI9J4lkQrQPV8BF10joGNO3khraO3A= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-674-F0iAS8N4NoqXDVP3Kt5UFw-1; Thu, 17 Oct 2024 04:11:57 -0400 X-MC-Unique: F0iAS8N4NoqXDVP3Kt5UFw-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7AFA41955D42; Thu, 17 Oct 2024 08:11:56 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.94]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 87FF1300018D; Thu, 17 Oct 2024 08:11:54 +0000 (UTC) Date: Thu, 17 Oct 2024 09:11:50 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: =?utf-8?Q?C=C3=A9dric?= Le Goater Cc: Markus Armbruster , qemu-devel@nongnu.org, alejandro.zeise@seagate.com, peter.maydell@linaro.org Subject: Re: [PATCH] crypto/hash-afalg: Fix broken build Message-ID: References: <20241017064742.2770242-1-armbru@redhat.com> <0a727cfe-af7c-4838-9336-2a6b2b555b8e@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <0a727cfe-af7c-4838-9336-2a6b2b555b8e@redhat.com> User-Agent: Mutt/2.2.12 (2023-09-09) X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.038, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, Oct 17, 2024 at 08:54:04AM +0200, Cédric Le Goater wrote: > On 10/17/24 08:47, Markus Armbruster wrote: > > Fux build broken by semantic conflict with commit > > 8f525028bc6 (qapi/crypto: Rename QCryptoAFAlg to QCryptoAFAlgo). > > > > Fixes: 90c3dc60735a (crypto/hash-afalg: Implement new hash API) > > Signed-off-by: Markus Armbruster > > My bad :/ Obviously, I didn't catch this at compile time, nor did CI. Yeah, this is a clear gap in our CI that I will post a patch for. > Reviewed-by: Cédric Le Goater Reviewed-by: Daniel P. Berrangé > > Thanks, > > C. > > > > --- > > crypto/hash-afalg.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/crypto/hash-afalg.c b/crypto/hash-afalg.c > > index 06e1e4699c..8c0ce5b520 100644 > > --- a/crypto/hash-afalg.c > > +++ b/crypto/hash-afalg.c > > @@ -142,7 +142,7 @@ QCryptoHash *qcrypto_afalg_hash_new(QCryptoHashAlgo alg, Error **errp) > > static > > void qcrypto_afalg_hash_free(QCryptoHash *hash) > > { > > - QCryptoAFAlg *ctx = hash->opaque; > > + QCryptoAFAlgo *ctx = hash->opaque; > > if (ctx) { > > qcrypto_afalg_comm_free(ctx); > > @@ -159,7 +159,7 @@ void qcrypto_afalg_hash_free(QCryptoHash *hash) > > * be provided to calculate the final hash. > > */ > > static > > -int qcrypto_afalg_send_to_kernel(QCryptoAFAlg *afalg, > > +int qcrypto_afalg_send_to_kernel(QCryptoAFAlgo *afalg, > > const struct iovec *iov, > > size_t niov, > > bool more_data, > > @@ -183,7 +183,7 @@ int qcrypto_afalg_send_to_kernel(QCryptoAFAlg *afalg, > > } > > static > > -int qcrypto_afalg_recv_from_kernel(QCryptoAFAlg *afalg, > > +int qcrypto_afalg_recv_from_kernel(QCryptoAFAlgo *afalg, > > QCryptoHashAlgo alg, > > uint8_t **result, > > size_t *result_len, > > @@ -222,7 +222,7 @@ int qcrypto_afalg_hash_update(QCryptoHash *hash, > > size_t niov, > > Error **errp) > > { > > - return qcrypto_afalg_send_to_kernel((QCryptoAFAlg *) hash->opaque, > > + return qcrypto_afalg_send_to_kernel((QCryptoAFAlgo *) hash->opaque, > > iov, niov, true, errp); > > } > > @@ -232,7 +232,7 @@ int qcrypto_afalg_hash_finalize(QCryptoHash *hash, > > size_t *result_len, > > Error **errp) > > { > > - return qcrypto_afalg_recv_from_kernel((QCryptoAFAlg *) hash->opaque, > > + return qcrypto_afalg_recv_from_kernel((QCryptoAFAlgo *) hash->opaque, > > hash->alg, result, result_len, errp); > > } > > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|