stubs: Move qemu_timer_notify_cb() and remove qemu_notify_event() stub
PATCH 1/1 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.
--- stubs/cpu-get-icount.c | 5 ----- stubs/meson.build | 2 +- stubs/notify-event.c | 6 ------ stubs/qemu-timer-notify-cb.c | 8 ++++++++ 4 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 stubs/notify-event.c create mode 100644 stubs/qemu-timer-notify-cb.c
stubs/cpu-get-icount.c +0 -5
@@ -14,8 +14,3 @@ int64_t cpu_get_icount_raw(void) {abort (); } - -void qemu_timer_notify_cb (void *opaque,QEMUClockType type) -{ -qemu_notify_event (); -}
stubs/meson.build +1 -1
@@ -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'))
stubs/notify-event.c deleted +0 -6
@@ -1,6 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu/main-loop.h" - -void qemu_notify_event (void ) -{ -}
stubs/qemu-timer-notify-cb.c new file +8 -0
@@ -0,0 +1,8 @@ +#include "qemu/osdep.h" +#include "sysemu/cpus.h" +#include "qemu/main-loop.h" + +void qemu_timer_notify_cb (void *opaque,QEMUClockType type) +{ +qemu_notify_event (); +}
Signature · 1 line
2.18.2
Quoted 77 lines · Thomas Huth
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'
failedIt seems like it works better when the
qemu_timer_notify_cb()stub (which callsqemu_notify_event()) is in a separate file - then we can also even remove theqemu_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.Signed-off-by Thomas Huth <[email protected]>--- stubs/cpu-get-icount.c | 5 ----- stubs/meson.build | 2 +- stubs/notify-event.c | 6 ------ stubs/qemu-timer-notify-cb.c | 8 ++++++++ 4 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 stubs/notify-event.c create mode 100644 stubs/qemu-timer-notify-cb.cstubs/cpu-get-icount.c +0
-5@@ -14,8 +14,3 @@ int64_t cpu_get_icount_raw(void) {abort (); } - -void qemu_timer_notify_cb (void *opaque,QEMUClockType type) -{ -qemu_notify_event (); -}stubs/meson.build +1
-1@@ -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'))stubs/notify-event.c deleted +0
-6@@ -1,6 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu/main-loop.h" - -void qemu_notify_event (void ) -{ -}stubs/qemu-timer-notify-cb.c new file +0
-0
stubs/qemu-timer-notify-cb.c line 8
Quoted 8 lines
stubs/qemu-timer-notify-cb.c new file +8
-0@@ -0,0 +1,8 @@ +#include "qemu/osdep.h" +#include "sysemu/cpus.h" +#include "qemu/main-loop.h" + +void qemu_timer_notify_cb (void *opaque,QEMUClockType type) +{ +qemu_notify_event (); +}
Quoted 84 lines · Paolo Bonzini
Quoted 7 lines · Thomas Huth
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:
Quoted 3 lines
first defined here
collect2: error: ld returned 1 exit status
/builds/huth/qemu/rules.mak:88: recipe for target'tests/test-timed-average.exe'
Quoted 7 lines
failed
It seems like it works better when the
qemu_timer_notify_cb()stub (which callsqemu_notify_event()) is in a separate file - then we can also even remove theqemu_notify_event()stub now.This patch is based on ideas from the patch "stubs: Remove
qemu_notify_event()"Quoted 1 line
by Philippe Mathieu-Daudé and the patch "cpu-timers, icount: new
modules" from
Quoted 61 lines
Claudio Fontana.
Signed-off-by Thomas Huth <[email protected]>--- stubs/cpu-get-icount.c | 5 ----- stubs/meson.build | 2 +- stubs/notify-event.c | 6 ------ stubs/qemu-timer-notify-cb.c | 8 ++++++++ 4 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 stubs/notify-event.c create mode 100644 stubs/qemu-timer-notify-cb.cstubs/cpu-get-icount.c +0
-5@@ -14,8 +14,3 @@ int64_t cpu_get_icount_raw(void) {abort (); } - -void qemu_timer_notify_cb (void *opaque,QEMUClockType type) -{ -qemu_notify_event (); -}stubs/meson.build +1
-1@@ -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'))stubs/notify-event.c deleted +0
-6@@ -1,6 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu/main-loop.h" - -void qemu_notify_event (void ) -{ -}stubs/qemu-timer-notify-cb.c new file +3
-0@@ -0,0 +1,8 @@ +#include "qemu/osdep.h" +#include "sysemu/cpus.h" +#include "qemu/main-loop.h"
Quoted 9 lines
stubs/qemu-timer-notify-cb.c line 8
Quoted 6 lines
stubs/qemu-timer-notify-cb.c new file +5
-0+ +void qemu_timer_notify_cb (void *opaque,QEMUClockType type) +{ +qemu_notify_event (); +}Acked-by Paolo Bonzini <[email protected]>
LGTM, can you queue this patch,
Signature · 6 lines
此致
礼
罗勇刚
Yours
sincerely,
Yonggang LuoQuoted 104 lines · 罗勇刚(Yonggang Luo)
On Wed, Sep 2, 2020 at 6:33 PM Paolo Bonzini <[email protected] <mailto:[email protected]>> wrote:
On 02/09/20 12:24, Thomas Huth wrote: > 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. > > Signed-off-by: Thomas Huth <[email protected] <mailto:[email protected]>> > --- > stubs/cpu-get-icount.c | 5 ----- > stubs/meson.build | 2 +- > stubs/notify-event.c | 6 ------ > stubs/qemu-timer-notify-cb.c | 8 ++++++++ > 4 files changed, 9 insertions(+), 12 deletions(-) > delete mode 100644 stubs/notify-event.c > create mode 100644 stubs/qemu-timer-notify-cb.c > > 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(); > -} > diff --git a/stubs/meson.build b/stubs/meson.build > index 019bd79c7a..e2dfedc2a7 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')) > diff --git a/stubs/notify-event.c b/stubs/notify-event.c > deleted file mode 100644 > index 827bb52d1a..0000000000 > --- a/stubs/notify-event.c > +++ /dev/null > @@ -1,6 +0,0 @@ > -#include "qemu/osdep.h" > -#include "qemu/main-loop.h" > - > -void qemu_notify_event(void) > -{ > -} > diff --git a/stubs/qemu-timer-notify-cb.c b/stubs/qemu-timer-notify-cb.c > new file mode 100644 > index 0000000000..054b408b1c > --- /dev/null > +++ b/stubs/qemu-timer-notify-cb.c > @@ -0,0 +1,8 @@ > +#include "qemu/osdep.h" > +#include "sysemu/cpus.h" > +#include "qemu/main-loop.h" > + > +void qemu_timer_notify_cb(void *opaque, QEMUClockType type) > +{ > + qemu_notify_event(); > +} > Acked-by: Paolo Bonzini <[email protected] <mailto:[email protected]>>
Quoted 1 line
LGTM, can you queue this patch,
Yes, I've got it in my queue for the patch series that enables cross-compilers on gitlab. I just want to wait for Paolo's latest meson series to hit the master branch before I send my pull request for the cross-compiler series.
Thomas