[PATCH v2 0/1] stubs: Add missing qga stubs

[PATCH v2 0/1] stubs: Add missing qga stubs

[Konstantin Kostiuk]

v1 -> v2:
- Added the link failure output


Konstantin Kostiuk (1):
  stubs: Add missing qga stubs

 stubs/meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--
2.44.0

[PATCH v2 1/1] stubs: Add missing qga stubs

[Konstantin Kostiuk]

Compilation QGA without system and user fails
./configure --disable-system --disable-user --enable-guest-agent

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.

Fixes: 3a15604900 ("stubs: include stubs only if needed")

Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
 stubs/meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/stubs/meson.build b/stubs/meson.build
index 8ee1fd5753..3b9d42023c 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -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'))
--
2.44.0

Re: [PATCH v2 1/1] stubs: Add missing qga stubs

[Konstantin Kostiuk]

[-- Attachment #1: Type: text/plain, Size: 2672 bytes --]

Hi Paolo,

Are you ok if I merge this patch with other QGA patches?
Or don't you agree with this version of the patch?

Best Regards,
Konstantin Kostiuk.


On Fri, Apr 26, 2024 at 3:15 PM Konstantin Kostiuk <kkostiuk@redhat.com>
wrote:

> Compilation QGA without system and user fails
> ./configure --disable-system --disable-user --enable-guest-agent
>
> 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.
>
> Fixes: 3a15604900 ("stubs: include stubs only if needed")
>
> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> ---
>  stubs/meson.build | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/stubs/meson.build b/stubs/meson.build
> index 8ee1fd5753..3b9d42023c 100644
> --- a/stubs/meson.build
> +++ b/stubs/meson.build
> @@ -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'))
> --
> 2.44.0
>
>
>

[-- Attachment #2: Type: text/html, Size: 3682 bytes --]

Re: [PATCH v2 1/1] stubs: Add missing qga stubs

[Thomas Huth]

On 29/04/2024 12.09, Konstantin Kostiuk wrote:
> Hi Paolo,
> 
> Are you ok if I merge this patch with other QGA patches?
> Or don't you agree with this version of the patch?

Phil asked me in IRC to pick this patch up, so I'll include it in my next 
pull request.

  Thomas