On Mon, Oct 31, 2022 at 03:19:25PM -0400, Stefan Hajnoczi wrote:
> On Mon, 31 Oct 2022 at 15:14, Stefan Hajnoczi <stefa...@gmail.com> wrote:
> >
> > On Mon, 31 Oct 2022 at 08:52, Michael S. Tsirkin <m...@redhat.com> wrote:
> > > Lei He (4):
> > > virtio-crypto: Support asynchronous mode
> >
> > The following clang warning breaks the build. Please resend a fixed
> > pull request, thanks!
>
> On second thought, I have fixed up the merge commit manually since
> Michael is offline tomorrow for the soft freeze deadline. If CI passes
> then I'll apply this pull request (with my fixup) and you won't need
> to resend.
Hmm what's the fixup?
I came up with:
diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
index 39c8f5914e..855b5d60a2 100644
--- a/hw/virtio/virtio-crypto.c
+++ b/hw/virtio/virtio-crypto.c
@@ -495,6 +495,7 @@ static void virtio_crypto_free_request(VirtIOCryptoReq *req)
}
}
+ g_free(req->in_iov);
g_free(req);
}
@@ -566,7 +567,6 @@ static void virtio_crypto_req_complete(void *opaque, int
ret)
VirtIOCrypto *vcrypto = req->vcrypto;
VirtIODevice *vdev = VIRTIO_DEVICE(vcrypto);
uint8_t status = -ret;
- g_autofree struct iovec *in_iov_copy = req->in_iov;
if (req->flags == CRYPTODEV_BACKEND_ALG_SYM) {
virtio_crypto_sym_input_data_helper(vdev, req, status,
> >
> > clang -m64 -mcx16 -Ilibqemu-x86_64-softmmu.fa.p -I. -I.. -Itarget/i386
> > -I../target/i386 -Iqapi -Itrace -Iui -Iui/shader
> > -I/usr/include/pixman-1 -I/usr/include/capstone
> > -I/usr/include/spice-server -I/usr/include/spice-1
> > -I/usr/include/cacard -I/usr/include/glib-2.0
> > -I/usr/lib64/glib-2.0/include -I/usr/include/sysprof-4
> > -I/usr/include/nss3 -I/usr/include/nspr4 -I/usr/include/PCSC -flto
> > -fcolor-diagnostics -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g
> > -isystem /builds/qemu-project/qemu/linux-headers -isystem
> > linux-headers -iquote . -iquote /builds/qemu-project/qemu -iquote
> > /builds/qemu-project/qemu/include -iquote
> > /builds/qemu-project/qemu/tcg/i386 -pthread -D_GNU_SOURCE
> > -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
> > -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes
> > -fno-strict-aliasing -fno-common -fwrapv -Wold-style-definition
> > -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self
> > -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels
> > -Wexpansion-to-defined -Wno-initializer-overrides
> > -Wno-missing-include-dirs -Wno-shift-negative-value
> > -Wno-string-plus-int -Wno-typedef-redefinition
> > -Wno-tautological-type-limit-compare -Wno-psabi
> > -Wno-gnu-variable-sized-type-not-at-end -fstack-protector-strong
> > -fsanitize=safe-stack -fsanitize=cfi-icall
> > -fsanitize-cfi-icall-generalize-pointers -fno-sanitize-trap=cfi-icall
> > -fPIE -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H
> > '-DCONFIG_TARGET="x86_64-softmmu-config-target.h"'
> > '-DCONFIG_DEVICES="x86_64-softmmu-config-devices.h"' -MD -MQ
> > libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o -MF
> > libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o.d -o
> > libqemu-x86_64-softmmu.fa.p/hw_virtio_virtio-crypto.c.o -c
> > ../hw/virtio/virtio-crypto.c
> > ../hw/virtio/virtio-crypto.c:569:30: error: unused variable
> > 'in_iov_copy' [-Werror,-Wunused-variable]
> > g_autofree struct iovec *in_iov_copy = req->in_iov;
> > ^
> >
> > https://gitlab.com/qemu-project/qemu/-/jobs/3253703167
> >
> > Stefan
