| Message ID | 20241017064742.2770242-1-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | crypto/hash-afalg: Fix broken build | expand |
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 <armbru@redhat.com> My bad :/ Obviously, I didn't catch this at compile time, nor did CI. Reviewed-by: Cédric Le Goater <clg@redhat.com> 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); > } >
Cédric Le Goater <clg@redhat.com> writes: > 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 <armbru@redhat.com> > > My bad :/ Obviously, I didn't catch this at compile time, nor did CI. Not blaming you; this is something CI should catch. How could we close the CI gap? > Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks!
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 <armbru@redhat.com> > > 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 <clg@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > 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
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); }
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 <armbru@redhat.com> --- crypto/hash-afalg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)