Daniel P. Berrangé <berra...@redhat.com> writes: > On Mon, Aug 05, 2024 at 02:22:47PM +0200, Markus Armbruster wrote: >> Daniel P. Berrangé <berra...@redhat.com> writes: >> >> > This allows us to include multiple QAPI schemas in the same file. >> > >> > Signed-off-by: Daniel P. Berrangé <berra...@redhat.com> >> >> I figure you had reason to simultaneously include headers generated for >> multiple schemas. Do tell :) > > I didn't want to have this patch, but the unit tests do this :-( > > [2/37] Compiling C object > tests/libtestqapi.a.p/meson-generated_.._test-qapi-commands-sub-sub-module.c.o > FAILED: > tests/libtestqapi.a.p/meson-generated_.._test-qapi-commands-sub-sub-module.c.o > > cc -m64 -Itests/libtestqapi.a.p -Itests -I../tests -I. -Iqapi -Itrace -Iui > -Iui/shader -Itests/include -I/usr/include/glib-2.0 > -I/usr/lib64/glib-2.0/include -I/usr/include/sysprof-6 > -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g > -fstack-protector-strong -Wempty-body -Wendif-labels -Wexpansion-to-defined > -Wformat-security -Wformat-y2k -Wignored-qualifiers -Wimplicit-fallthrough=2 > -Winit-self -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs > -Wold-style-declaration -Wold-style-definition -Wredundant-decls > -Wshadow=local -Wstrict-prototypes -Wtype-limits -Wundef -Wvla > -Wwrite-strings -Wno-missing-include-dirs -Wno-psabi > -Wno-shift-negative-value -isystem > /var/home/berrange/src/virt/qemu/linux-headers -isystem linux-headers -iquote > . -iquote /var/home/berrange/src/virt/qemu -iquote > /var/home/berrange/src/virt/qemu/include -iquote > /var/home/berrange/src/virt/qemu/host/include/x86_64 -iquote > /var/home/berrange/src/virt/qemu/host/include/generic -iquote > /var/home/berrange/src/virt/qemu/tcg/i386 -pthread -msse2 -mcx16 > -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-strict-aliasing > -fno-common -fwrapv -ftrivial-auto-var-init=zero > -fzero-call-used-regs=used-gpr -fPIE -MD -MQ > tests/libtestqapi.a.p/meson-generated_.._test-qapi-commands-sub-sub-module.c.o > -MF > tests/libtestqapi.a.p/meson-generated_.._test-qapi-commands-sub-sub-module.c.o.d > -o > tests/libtestqapi.a.p/meson-generated_.._test-qapi-commands-sub-sub-module.c.o > -c tests/test-qapi-commands-sub-sub-module.c > In file included from tests/test-qapi-types-sub-sub-module.h:17, > from tests/test-qapi-visit-sub-sub-module.h:17, > from tests/test-qapi-commands-sub-sub-module.c:19: > tests/test-qapi-features.h:16:5: error: redeclaration of enumerator > ‘QAPI_FEATURE_DEPRECATED’ > 16 | QAPI_FEATURE_DEPRECATED, > | ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from ./qapi/qapi-types-error.h:17, > from > /var/home/berrange/src/virt/qemu/include/qapi/error.h:275, > from > /var/home/berrange/src/virt/qemu/include/qapi/compat-policy.h:16, > from tests/test-qapi-commands-sub-sub-module.c:14: > ./qapi/qapi-features.h:16:5: note: previous definition of > ‘QAPI_FEATURE_DEPRECATED’ with type ‘enum <anonymous>’ > 16 | QAPI_FEATURE_DEPRECATED, > | ^~~~~~~~~~~~~~~~~~~~~~~ > ninja: build stopped: subcommand failed. > make[1]: *** [Makefile:167: run-ninja] Error 1 > make[1]: Leaving directory '/var/home/berrange/src/virt/qemu/build' > make: *** [GNUmakefile:6: build] Error 2
Compiles for me with PATCH 5/6 taken out. What am I doing wrong? > I would be nice to eliminate that, but some parts of the test appear > to pull in more of the system emulator code which forces in the main > qapi schema > > n file included from ./qapi/qapi-types-block-core.h:17, > from > /var/home/berrange/src/virt/qemu/include/block/block-common.h:27, > from > /var/home/berrange/src/virt/qemu/include/block/block-global-state.h:27, > from > /var/home/berrange/src/virt/qemu/include/block/block.h:27, > from > /var/home/berrange/src/virt/qemu/include/monitor/monitor.h:4, > from > /var/home/berrange/src/virt/qemu/include/qapi/qmp/dispatch.h:17, > from tests/test-qapi-init-commands.h:16, > from tests/test-qapi-init-commands.c:15: > ./qapi/qapi-features.h:16:5: error: redeclaration of enumerator > ‘QAPI_FEATURE_DEPRECATED’ > 16 | QAPI_FEATURE_DEPRECATED, > | ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from tests/include/../test-qapi-types-sub-sub-module.h:17, > from tests/include/../test-qapi-commands-sub-sub-module.h:16, > from tests/include/test-qapi-commands-sub-module.h:16, > from tests/test-qapi-commands.h:16, > from tests/test-qapi-init-commands.c:14: > tests/include/../test-qapi-features.h:16:5: note: previous definition of > ‘QAPI_FEATURE_DEPRECATED’ with type ‘enum <anonymous>’ > 16 | QAPI_FEATURE_DEPRECATED, > | ^~~~~~~~~~~~~~~~~~~~~~~ > tests/test-qapi-init-commands.c: In function ‘test_qmp_init_marshal’: > tests/test-qapi-init-commands.c:64:71: error: ‘TEST_QAPI_FEATURE_DEPRECATED’ > undeclared (first use in this function); did you mean > ‘QAPI_FEATURE_DEPRECATED’? > 64 | qmp_marshal_test_command_features1, 0, 1u << > TEST_QAPI_FEATURE_DEPRECATED); > | > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | > QAPI_FEATURE_DEPRECATED > tests/test-qapi-init-commands.c:64:71: note: each undeclared identifier is > reported only once for each function it appears in > > > Maybe the test needs to be split into two ? One test exclusively testing > with the tests/qapi-schema/qapi-schema-test.json, and one test exclusively > with the main QMP QAPI schema ? Which test is it?
