Re: [PULL 4/6] monitor: Fix deadlock in monitor_cleanup

[Kevin Wolf <kwolf@redhat.com>]

Am 04.04.2026 um 08:08 hat Michael Tokarev geschrieben:
> On 04.04.2026 09:02, Michael Tokarev wrote:
> ..
> > This broke qemu guest agent build.
> > 
> > [18/51] Linking target qga/qemu-ga
> > FAILED: qga/qemu-ga
> > ld: libqemuutil.a.p/qapi_qmp-dispatch.c.o: in function
> > `do_qmp_dispatch_bh':
> > qapi/qmp-dispatch.c:140:(.text+0x5c): undefined reference to
> > `aio_wait_kick'
> > collect2: error: ld returned 1 exit status
> 
> To clarify: it is --disable-system --disable-user build - like,
> tools-and-qga-only.

I can reproduce it with a qga-only build, but building tools already
fixes it again. That is, the following configure line breaks:

    ../configure --disable-system --disable-user --enable-guest-agent

But this one works:

    ../configure --disable-system --disable-user --enable-guest-agent --enable-tools

utils_ss in the meson files is messy. Enabling something that needs the
block layer enables additional files for qga, too. It should probably be
split in two and qga should always only be built with what is present
when you build only qga and nothing else.

But for now, the patch below should fix it.

Kevin

diff --git a/util/meson.build b/util/meson.build
index 33132c04ad6..637f0b82dd0 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -78,7 +78,7 @@ if have_system
 endif

 if have_block or have_ga
-  util_ss.add(files('aiocb.c', 'async.c'))
+  util_ss.add(files('aiocb.c', 'aio-wait.c', 'async.c'))
   util_ss.add(files('base64.c'))
   util_ss.add(files('main-loop.c'))
   util_ss.add(files('qemu-coroutine.c', 'qemu-coroutine-lock.c', 'qemu-coroutine-io.c'))
@@ -87,7 +87,6 @@ if have_block or have_ga
   util_ss.add(files('qemu-sockets.c'))
 endif
 if have_block
-  util_ss.add(files('aio-wait.c'))
   util_ss.add(files('buffer.c'))
   util_ss.add(files('bufferiszero.c'))
   util_ss.add(files('hbitmap.c'))