[PATCH-for-5.1 v3 0/2] stubs: Fix notify-event stub linkage error on MinGW

Philippe Mathieu-Daudé posted 2 patches 3 years, 8 months ago
Test docker-quick@centos7 failed
Test docker-mingw@fedora failed
Test checkpatch failed
Test FreeBSD failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200805100126.25583-1-philmd@redhat.com
include/sysemu/cpus.h  | 4 ++++
exec.c                 | 4 ----
softmmu/cpus.c         | 7 +++++++
stubs/cpu-get-icount.c | 2 +-
stubs/notify-event.c   | 6 ------
stubs/Makefile.objs    | 1 -
6 files changed, 12 insertions(+), 12 deletions(-)
delete mode 100644 stubs/notify-event.c
[PATCH-for-5.1 v3 0/2] stubs: Fix notify-event stub linkage error on MinGW
Posted by Philippe Mathieu-Daudé 3 years, 8 months ago
2 trivial patches to fix the link error reported by Thomas:

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

Since v2:
- Remove incorrectly added abort() in qemu_timer_notify_cb()

Philippe Mathieu-Daudé (2):
  exec: Restrict icount to softmmu
  stubs: Remove qemu_notify_event()

 include/sysemu/cpus.h  | 4 ++++
 exec.c                 | 4 ----
 softmmu/cpus.c         | 7 +++++++
 stubs/cpu-get-icount.c | 2 +-
 stubs/notify-event.c   | 6 ------
 stubs/Makefile.objs    | 1 -
 6 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 stubs/notify-event.c

-- 
2.21.3


Re: [PATCH-for-5.1 v3 0/2] stubs: Fix notify-event stub linkage error on MinGW
Posted by Thomas Huth 3 years, 8 months ago
On 05/08/2020 12.01, Philippe Mathieu-Daudé wrote:
> 2 trivial patches to fix the link error reported by Thomas:
> 
>   LINK    tests/test-timed-average.exe
>  libqemuutil.a(main-loop.o): In function `qemu_notify_event':
>  util/main-loop.c:139: multiple definition of `qemu_notify_event'
>  tests/test-timed-average.o:/builds/huth/qemu/tests/../stubs/notify-event.c:5: first defined here
>  collect2: error: ld returned 1 exit status
>  rules.mak:124: recipe for target 'tests/test-timed-average.exe' failed
> 
> Since v2:
> - Remove incorrectly added abort() in qemu_timer_notify_cb()

Works for me (tested here:
https://gitlab.com/huth/qemu/-/pipelines/174503835 ) ... but I wonder
whether there is a code path that uses the stub from
stubs/cpu-get-icount.c but the qemu_notify_event() from util/main-loop.c ?

 Thomas