Em Mon, 29 Jul 2024 17:31:09 +0100 Jonathan Cameron <jonathan.came...@huawei.com> escreveu:
> On Mon, 29 Jul 2024 15:21:10 +0200 > Mauro Carvalho Chehab <mchehab+hua...@kernel.org> wrote: ... > Markus suggested: > > > A target-specific command like this one should be conditional. Try > > this: > > > > { 'command': 'arm-inject-error', > > 'data': { 'errortypes': ['ArmProcessorErrorType'] }, > > 'features': [ 'unstable' ], > > 'if': 'TARGET_ARM' } > > > > No need to provide a qmp_arm_inject_error() stub then. > > (I noticed because never knew you could do this.) > > Probably crossed with your v4 posting. Tried it, but can't figure out how to properly set it up at meson.build, as it is basically producing build time errors during qapi file generation on non-ARM platforms. For instance: FAILED: libqemuutil.a.p/meson-generated_.._qapi_qapi-visit-arm-error-inject.c.o cc -m64 -Ilibqemuutil.a.p -I. -I.. -Isubprojects/libvhost-user -I../subprojects/libvhost-user -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -I/usr/include/gio-unix-2.0 -I/usr/include/p11-kit-1 -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 /new_devel/edac/qemu/linux-headers -isystem linux-headers -iquote . -iquote /new_devel/edac/qemu -iquote /new_devel/edac/qemu/include -iquote /new_devel/edac/qemu/host/include/x8 6_64 -iquote /new_devel/edac/qemu/host/include/generic -iquote /new_devel/edac/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 -DWITH_GZFILEOP -MD -MQ libqemuutil.a.p/meson-generated_.._qapi_qapi-visit-arm-error-inject.c.o -MF libqemuutil.a.p/meson-generated_.._qapi_qapi-visit-arm-error-inject.c.o.d -o libqemuutil.a.p/meson-generated_.._qapi_qapi-visit-arm-error-inject.c.o -c qapi/qapi-visit-arm-error-inject.c In file included from qapi/qapi-visit-arm-error-inject.h:17, from qapi/qapi-visit-arm-error-inject.c:15: qapi/qapi-types-arm-error-inject.h:18:13: error: attempt to use poisoned "TARGET_ARM" 18 | #if defined(TARGET_ARM) | ^ In file included from /new_devel/edac/qemu/include/exec/poison.h:7, from /new_devel/edac/qemu/include/qemu/osdep.h:38, from qapi/qapi-visit-arm-error-inject.c:13: ./config-poison.h:718:20: note: poisoned here Such error is created by two files generated from qapi, due to this change: diff --git a/qapi/meson.build b/qapi/meson.build index e7bc54e5d047..5927932c4be3 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -24,2 +24,3 @@ endif qapi_all_modules = [ + 'arm-error-inject', 'authz', No idea how to fix it. Thanks, Mauro