diff options
author | Thomas Huth <thuth@redhat.com> | 2020-09-01 20:53:03 +0200 |
---|---|---|
committer | Thomas Huth <thuth@redhat.com> | 2020-09-07 12:34:17 +0200 |
commit | b0476d6602adbf818132dc896b585e01f47eaf96 (patch) | |
tree | c7bda200007283ff1b1740f1cc8ece69b656b93f /stubs/meson.build | |
parent | e7a222aeb813a06076f5a7b6c56c1b7301b40712 (diff) | |
download | qemu-b0476d6602adbf818132dc896b585e01f47eaf96.zip qemu-b0476d6602adbf818132dc896b585e01f47eaf96.tar.gz qemu-b0476d6602adbf818132dc896b585e01f47eaf96.tar.bz2 |
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/meson.build')
-rw-r--r-- | stubs/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stubs/meson.build b/stubs/meson.build index 019bd79..e2dfedc 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -24,9 +24,9 @@ stub_ss.add(files('machine-init-done.c')) stub_ss.add(files('migr-blocker.c')) stub_ss.add(files('monitor.c')) stub_ss.add(files('monitor-core.c')) -stub_ss.add(files('notify-event.c')) stub_ss.add(files('pci-bus.c')) stub_ss.add(files('pci-host-piix.c')) +stub_ss.add(files('qemu-timer-notify-cb.c')) stub_ss.add(files('qmp_memory_device.c')) stub_ss.add(files('qtest.c')) stub_ss.add(files('ram-block.c')) |