Paolo Bonzini <pbonz...@redhat.com> writes:
> On 16/03/21 10:07, Markus Armbruster wrote:
>> I suspect the linker happens to pick the one that makes things work,
>> until something in my patch makes it pick the other one.
>
> Ouch. Fortunately the stub is unnecessary and can be removed.
>
> ----------- 8< ------------
> From fe45350cc11434efe3461c540bb0f258bbe010f7 Mon Sep 17 00:00:00 2001
> From: Paolo Bonzini <pbonz...@redhat.com>
> Date: Tue, 16 Mar 2021 05:25:48 -0400
> Subject: [PATCH] qemuutil: remove qemu_set_fd_handler duplicate symbol
>
> libqemuutil has two definitions of qemu_set_fd_handler. This
> is not needed since the only users of the function are
> qemu-io.c and the emulators, both of which already include
> util/main-loop.c.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
>
> diff --git a/stubs/meson.build b/stubs/meson.build
> index a054d5877f..8a3e804cf0 100644
> --- a/stubs/meson.build
> +++ b/stubs/meson.build
> @@ -34,7 +34,6 @@ stub_ss.add(files('ram-block.c'))
> stub_ss.add(files('ramfb.c'))
> stub_ss.add(files('replay.c'))
> stub_ss.add(files('runstate-check.c'))
> -stub_ss.add(files('set-fd-handler.c'))
> stub_ss.add(files('sysbus.c'))
> stub_ss.add(files('target-get-monitor-def.c'))
> stub_ss.add(files('target-monitor-defs.c'))
> diff --git a/stubs/set-fd-handler.c b/stubs/set-fd-handler.c
> deleted file mode 100644
> index bff7e0a45a..0000000000
> --- a/stubs/set-fd-handler.c
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -#include "qemu/osdep.h"
> -#include "qemu/main-loop.h"
> -
> -void qemu_set_fd_handler(int fd,
> - IOHandler *fd_read,
> - IOHandler *fd_write,
> - void *opaque)
> -{
> - abort();
> -}
Tested-by: Markus Armbruster <arm...@redhat.com>
I'll include this in my pull request, if you don't mind.
>> Is qemu_set_fd_handler() the only one? Nope:
>> $ nm --defined-only bld-x86/libqemuutil.a | awk '/ T / { print
>> $NF }' | sort | uniq -c | grep -v '^ *1 '
>> 2 qemu_set_fd_handler
>> 2 yank_generic_iochannel
>> 2 yank_register_function
>> 2 yank_register_instance
>> 2 yank_unregister_function
>> 2 yank_unregister_instance
>> I didn't run into this issue when I posted my series last Friday.
>> The
>> issue now blocks its merge, and today is the soft freeze. Help!
>
> For yank_*, I suggest moving the non-stub version to monitor/ and
> adding it to the qmp_ss sourceset.
I can give it a try after the soft freeze.
