stubs: Move qemu_timer_notify_cb() and remove qemu_notify_event() stub
commitb0476d6602adbf818132dc896b585e01f47eaf96
authorThomas Huth <thuth@redhat.com>
Tue, 1 Sep 2020 18:53:03 +0000 (1 20:53 +0200)
committerThomas Huth <thuth@redhat.com>
Mon, 7 Sep 2020 10:34:17 +0000 (7 12:34 +0200)
treec7bda200007283ff1b1740f1cc8ece69b656b93f
parente7a222aeb813a06076f5a7b6c56c1b7301b40712
stubs: Move qemu_timer_notify_cb() and remove qemu_notify_event() stub

When cross-compiling with MinGW, there are sometimes some weird linker
errors like:

ibqemuutil.a(util_main-loop.c.obj): In function `qemu_notify_event':
/builds/huth/qemu/build/../util/main-loop.c:139: multiple definition of
 `qemu_notify_event'
libqemuutil.a(stubs_notify-event.c.obj):/builds/huth/qemu/stubs/notify-event.c:5:
 first defined here
collect2: error: ld returned 1 exit status
/builds/huth/qemu/rules.mak:88: recipe for target 'tests/test-timed-average.exe'
 failed

It seems like it works better when the qemu_timer_notify_cb() stub (which
calls qemu_notify_event()) is in a separate file - then we can also even
remove the qemu_notify_event() stub now.

This patch is based on ideas from the patch "stubs: Remove qemu_notify_event()"
by Philippe Mathieu-Daudé and the patch "cpu-timers, icount: new modules" from
Claudio Fontana.

Message-Id: <20200902102433.304737-1-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
stubs/cpu-get-icount.c
stubs/meson.build
stubs/notify-event.c [deleted file]
stubs/qemu-timer-notify-cb.c [copied from stubs/cpu-get-icount.c with 54% similarity]