The following CI failures were reported. I think they may be related
to this pull request:
cc -m64 -mcx16 -Ilibblock.fa.p -I. -I.. -Iqapi -Itrace -Iui
-Iui/shader -Iblock -I/usr/include/p11-kit-1
-I/usr/include/x86_64-linux-gnu -I/usr/include/uuid
-I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
-fdiagnostics-color=auto -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 -pthread -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_LARGEFILE_SOURCE
-Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings
-Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv
-Wold-style-declaration -Wold-style-definition -Wtype-limits
-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers
-Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined
-Wimplicit-fallthrough=2 -Wno-missing-include-dirs
-Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE
-D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D__USE_LARGEFILE64
-DUSE_POSIX_ACLS=1 -MD -MQ libblock.fa.p/block_rbd.c.o -MF
libblock.fa.p/block_rbd.c.o.d -o libblock.fa.p/block_rbd.c.o -c
../block/rbd.c
../block/rbd.c: In function ‘qemu_rbd_do_create’:
../block/rbd.c:545:15: error: ‘BlockdevCreateOptionsRbd’ {aka ‘struct
BlockdevCreateOptionsRbd’} has no member named ‘has_encrypt’; did you
mean ‘encrypt’?
545 | if (opts->has_encrypt) {
| ^~~~~~~~~~~
| encrypt
https://gitlab.com/qemu-project/qemu/-/jobs/3225215747
I think this will solve it:
diff --cc block/rbd.c
index f826410f40,d809b8e0a3..3aa6aae0e0
--- a/block/rbd.c
+++ b/block/rbd.c
@@@ -542,7 -542,7 +542,7 @@@ static int qemu_rbd_do_create(BlockdevC
}
#ifndef LIBRBD_SUPPORTS_ENCRYPTION
-- if (opts->has_encrypt) {
++ if (opts->encrypt) {
error_setg(errp, "RBD library does not support image encryption");
return -ENOTSUP;
}
cc -m64 -mcx16 -Ilibqemuutil.a.p -I. -I.. -Iqapi -Itrace -Iui/shader
-I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
-fdiagnostics-color=auto -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 -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=2 -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-declaration -Wold-style-definition -Wtype-limits
-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers
-Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined
-Wimplicit-fallthrough=2 -Wno-missing-include-dirs
-Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE
-MD -MQ libqemuutil.a.p/stubs_qdev.c.o -MF
libqemuutil.a.p/stubs_qdev.c.o.d -o libqemuutil.a.p/stubs_qdev.c.o -c
../stubs/qdev.c
../stubs/qdev.c:18:6: error: conflicting types for
'qapi_event_send_device_deleted'
18 | void qapi_event_send_device_deleted(bool has_device,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../stubs/qdev.c:16:
./qapi/qapi-events-qdev.h:20:6: note: previous declaration of
'qapi_event_send_device_deleted' was here
20 | void qapi_event_send_device_deleted(const char *device, const char *path);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../stubs/qdev.c:25:6: error: conflicting types for
'qapi_event_send_device_unplug_guest_error'
25 | void qapi_event_send_device_unplug_guest_error(bool has_device,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../stubs/qdev.c:16:
./qapi/qapi-events-qdev.h:22:6: note: previous declaration of
'qapi_event_send_device_unplug_guest_error' was here
22 | void qapi_event_send_device_unplug_guest_error(const char
*device, const char *path);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
https://gitlab.com/qemu-project/qemu/-/jobs/3225215726
