stubs: Move qemu_fd_register stub to util/main-loop.c
commit8c2787629eee73ca8ce4f100cff4f4946583b4e8
authorThomas Huth <thuth@redhat.com>
Wed, 2 Sep 2020 11:17:24 +0000 (2 13:17 +0200)
committerThomas Huth <thuth@redhat.com>
Mon, 7 Sep 2020 10:34:17 +0000 (7 12:34 +0200)
tree481dea6366977d060266d740d1106d049b31b6dd
parentb0476d6602adbf818132dc896b585e01f47eaf96
stubs: Move qemu_fd_register stub to util/main-loop.c

The linker of MinGW sometimes runs into the following problem:

libqemuutil.a(util_main-loop.c.obj): In function `qemu_fd_register':
/builds/huth/qemu/build/../util/main-loop.c:331: multiple definition of
 `qemu_fd_register'
libqemuutil.a(stubs_fd-register.c.obj):/builds/huth/qemu/stubs/fd-register.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

qemu_fd_register() is defined in util/main-loop.c for WIN32, so let's simply
move the stub also there in the #else part of the corresponding #ifndef
to fix this problem.

Message-Id: <20200903054503.425435-1-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
stubs/fd-register.c [deleted file]
stubs/meson.build
util/main-loop.c