stubs: Add missing qga stubs
PATCH 1/1 stubs: Add missing qga stubs
Compilation QGA without system and user fails ./configure --disable-system --disable-user --enable-guest-agent
--- stubs/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
stubs/meson.build +5 -1
@@ -21,12 +21,12 @@ if have_block stub_ss.add(files('migr-blocker.c')) stub_ss.add(files('physmem.c')) stub_ss.add(files('ram-block.c')) - stub_ss.add(files('replay-tools.c')) stub_ss.add(files('runstate-check.c')) stub_ss.add(files('uuid.c')) endif if have_block or have_ga + stub_ss.add(files('replay-tools.c')) # stubs for hooks in util/main-loop.c, util/async.c etc. stub_ss.add(files('cpus-get-virtual-clock.c')) stub_ss.add(files('icount.c'))
@@ -45,6 +45,10 @@ if have_block or have_ga stub_ss.add(files('qmp-quit.c')) endif +if have_ga + stub_ss.add(files('error-printf.c')) +endif + if have_block or have_user stub_ss.add(files('qtest.c')) stub_ss.add(files('vm-stop.c'))
Signature · 1 line
2.44.0
Quoted 2 lines · Konstantin Kostiuk
Compilation QGA without system and user fails ./configure --disable-system --disable-user --enable-guest-agent
So this config isn't tested on CI.
Maybe worth enabling QGA in the build-tools-and-docs-debian job?
Please include the link failure:
/usr/bin/ld: libqemuutil.a.p/util_main-loop.c.o: in function
`os_host_main_loop_wait':
../util/main-loop.c:303: undefined reference to `replay_mutex_unlock' /usr/bin/ld: ../util/main-loop.c:307: undefined reference to
`replay_mutex_lock'
/usr/bin/ld: libqemuutil.a.p/util_error-report.c.o: in function
`error_printf':
../util/error-report.c:38: undefined reference to `error_vprintf' /usr/bin/ld: libqemuutil.a.p/util_error-report.c.o: in function
`vreport':
../util/error-report.c:225: undefined reference to `error_vprintf' /usr/bin/ld: libqemuutil.a.p/util_qemu-timer.c.o: in function
`timerlist_run_timers':
../util/qemu-timer.c:562: undefined reference to `replay_checkpoint' /usr/bin/ld: ../util/qemu-timer.c:530: undefined reference to
`replay_checkpoint'
/usr/bin/ld: ../util/qemu-timer.c:525: undefined reference to
`replay_checkpoint'
ninja: build stopped: subcommand failed.
Quoted 1 line
Fixes 3a15604900c4f433c970cc6294520a98f201287e
Quoted 24 lines
Signed-off-by Konstantin Kostiuk <[email protected]>--- stubs/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)stubs/meson.build +1
-1@@ -21,12 +21,12 @@ if have_block stub_ss.add(files('migr-blocker.c')) stub_ss.add(files('physmem.c')) stub_ss.add(files('ram-block.c')) - stub_ss.add(files('replay-tools.c')) stub_ss.add(files('runstate-check.c')) stub_ss.add(files('uuid.c')) endif if have_block or have_ga + stub_ss.add(files('replay-tools.c')) # stubs for hooks in util/main-loop.c, util/async.c etc. stub_ss.add(files('cpus-get-virtual-clock.c')) stub_ss.add(files('icount.c'))
stubs/meson.build if have_block or have_ga · line 49
Quoted 5 lines
stubs/meson.build +2
-0@@ -45,6 +45,10 @@ if have_block or have_ga stub_ss.add(files('qmp-quit.c')) endif +if have_ga + stub_ss.add(files('error-printf.c'))
So now included twice, not a big deal.
stubs/meson.build if have_block or have_ga · line 54
Quoted 5 lines
stubs/meson.build +2
-0+endif + if have_block or have_user stub_ss.add(files('qtest.c')) stub_ss.add(files('vm-stop.c'))
# more symbols provided by the monitor
stub_ss.add(files('error-printf.c'))
endifWith updated description:
Quoted 8 lines · Philippe Mathieu-Daudé
Quoted 2 lines · Konstantin Kostiuk
Compilation QGA without system and user fails ./configure --disable-system --disable-user --enable-guest-agent
So this config isn't tested on CI.
Maybe worth enabling QGA in the build-tools-and-docs-debian job?
I am not sure that this is very often use case. I used it only during qga cross-compilation for Windows to speed up build.
Quoted 55 lines
Please include the link failure:
/usr/bin/ld:libqemuutil.a.p/util_main-loop.c.o: in function
`os_host_main_loop_wait':
../util/main-loop.c:303: undefined reference to `replay_mutex_unlock'/usr/bin/ld:../util/main-loop.c:307: undefined reference to
`replay_mutex_lock'
/usr/bin/ld:libqemuutil.a.p/util_error-report.c.o: in function
`error_printf':
../util/error-report.c:38: undefined reference to `error_vprintf'/usr/bin/ld:libqemuutil.a.p/util_error-report.c.o: in function
`vreport':
../util/error-report.c:225: undefined reference to `error_vprintf'/usr/bin/ld:libqemuutil.a.p/util_qemu-timer.c.o: in function
`timerlist_run_timers':
../util/qemu-timer.c:562: undefined reference to `replay_checkpoint'/usr/bin/ld:../util/qemu-timer.c:530: undefined reference to
`replay_checkpoint'
/usr/bin/ld:../util/qemu-timer.c:525: undefined reference to
`replay_checkpoint'
ninja: build stopped: subcommand failed.Quoted 1 line
Fixes 3a15604900c4f433c970cc6294520a98f201287eFixes 3a15604900 ("stubs: include stubs only if needed")Quoted 27 lines
Signed-off-by Konstantin Kostiuk <[email protected]>--- stubs/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)stubs/meson.build +1
-1@@ -21,12 +21,12 @@ if have_block stub_ss.add(files('migr-blocker.c')) stub_ss.add(files('physmem.c')) stub_ss.add(files('ram-block.c')) - stub_ss.add(files('replay-tools.c')) stub_ss.add(files('runstate-check.c')) stub_ss.add(files('uuid.c')) endif if have_block or have_ga + stub_ss.add(files('replay-tools.c')) # stubs for hooks in util/main-loop.c, util/async.c etc. stub_ss.add(files('cpus-get-virtual-clock.c')) stub_ss.add(files('icount.c'))@@ -45,6 +45,10 @@ if have_block or have_ga stub_ss.add(files('qmp-quit.c')) endif
Quoted 5 lines
stubs/meson.build if have_block or have_ga · line 49
Quoted 2 lines
stubs/meson.build +2
-0+if have_ga + stub_ss.add(files('error-printf.c'))So now included twice, not a big deal.
we can fix this only with more if
split if have_block or have_user into 2 blocks
should I do this?
Quoted 17 lines
stubs/meson.build if have_block or have_ga · line 54
Quoted 6 lines
stubs/meson.build +2
-0+endif + if have_block or have_user stub_ss.add(files('qtest.c')) stub_ss.add(files('vm-stop.c'))# more symbols provided by the monitor stub_ss.add(files('error-printf.c')) endifWith updated description:
Reviewed-by Philippe Mathieu-Daudé <[email protected]>