aboutsummaryrefslogtreecommitdiff
path: root/stubs/cpu-get-icount.c
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2020-09-01 20:53:03 +0200
committerThomas Huth <thuth@redhat.com>2020-09-07 12:34:17 +0200
commitb0476d6602adbf818132dc896b585e01f47eaf96 (patch)
treec7bda200007283ff1b1740f1cc8ece69b656b93f /stubs/cpu-get-icount.c
parente7a222aeb813a06076f5a7b6c56c1b7301b40712 (diff)
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>
Diffstat (limited to 'stubs/cpu-get-icount.c')
-rw-r--r--stubs/cpu-get-icount.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/stubs/cpu-get-icount.c b/stubs/cpu-get-icount.c
index b35f844638..4001613240 100644
--- a/stubs/cpu-get-icount.c
+++ b/stubs/cpu-get-icount.c
@@ -14,8 +14,3 @@ int64_t cpu_get_icount_raw(void)
{
abort();
}
-
-void qemu_timer_notify_cb(void *opaque, QEMUClockType type)
-{
- qemu_notify_event();
-}