[v3] Green the msys2 CI make

[PATCH v3 09/12] stubs: qemu_notify_event have no need to stub

Yonggang Luo posted 12 patches 5 years, 1 month ago

Diff against v1 v2 v4 v5
Download mbox

Maintainers: Markus Armbruster <armbru@redhat.com>, Michael Roth <mdroth@linux.vnet.ibm.com>, Wen Congyang <wencongyang2@huawei.com>, Kevin Wolf <kwolf@redhat.com>, Li-Wen Hsu <lwhsu@freebsd.org>, Xie Changlong <xiechanglong.d@gmail.com>, Ed Maste <emaste@freebsd.org>, Max Reitz <mreitz@redhat.com>, Peter Lieven <pl@kamp.de>, Paolo Bonzini <pbonzini@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>, Cleber Rosa <crosa@redhat.com>, Richard Henderson <rth@twiddle.net>

There is a newer version of this series

Expand all Fold all

[PATCH v3 09/12] stubs: qemu_notify_event have no need to stub

Posted by Yonggang Luo 5 years, 1 month ago

  LINK    tests/test-qdev-global-props.exe
  LINK    tests/test-timed-average.exe
C:/CI-Tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: libqemuutil.a(util_main-loop.c.obj): in function `qemu_notify_event':
C:\work\xemu\qemu-build/../qemu/util/main-loop.c:139: multiple definition of `qemu_notify_event'; libqemuutil.a(stubs_notify-event.c.obj):C:\work\xemu\qemu-build/../qemu/stubs/notify-event.c:6: first defined here
collect2.exe: error: ld returned 1 exit status
make: *** [C:/work/xemu/qemu/rules.mak:88：tests/test-timed-average.exe] 错误 1

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 stubs/notify-event.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/stubs/notify-event.c b/stubs/notify-event.c
index 827bb52d1a..59935db11e 100644
--- a/stubs/notify-event.c
+++ b/stubs/notify-event.c
@@ -1,6 +1,2 @@
-#include "qemu/osdep.h"
-#include "qemu/main-loop.h"
-
-void qemu_notify_event(void)
-{
-}
+#include "qemu/osdep.h"
+#include "qemu/main-loop.h"
-- 
2.28.0.windows.1