[v2] stubs: Fix notify-event stub linkage error on MinGW

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

Philippe Mathieu-Daudé posted 2 patches 3 years, 8 months ago

Diff against v1 v3
Download series mbox

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/20200805085526.9787-1-philmd@redhat.com

There is a newer version of this series

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

Expand all Fold all

[PATCH-for-5.1 v2 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

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 v2 0/2] stubs: Fix notify-event stub linkage error on MinGW

Posted by Paolo Bonzini 3 years, 8 months ago

On 05/08/20 10:55, 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
> 
> 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
> 

Patch 1 will be superseded by Claudio's refactoring.  For patch 2 please
respin according to the review.

Paolo

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

Posted by Philippe Mathieu-Daudé 3 years, 8 months ago

On 8/18/20 8:37 AM, Paolo Bonzini wrote:
> On 05/08/20 10:55, 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
>>
>> 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
>>
> 
> Patch 1 will be superseded by Claudio's refactoring.  For patch 2 please
> respin according to the review.

The respin is available as <20200805100126.25583-3-philmd@redhat.com>:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg727616.html