mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 04:13:53 -06:00
fa3f3a33f3
On MacOS, UI event loop has to be ran in the main thread of a process.
Because of that restriction, on this platform, qemu main event loop is
ran on another thread [1].
This breaks record/replay feature, which expects thread running qemu_init
to initialize hold this lock, breaking associated functional tests on
MacOS.
Thus, as a generalization, and similar to how BQL is handled, we release
it after init, and reacquire the lock before entering main event loop,
avoiding a special case if a separate thread is used.
Tested on MacOS with:
$ meson test -C build --setup thorough --print-errorlogs \
func-x86_64-x86_64_replay func-arm-arm_replay func-aarch64-aarch64_replay
$ ./build/qemu-system-x86_64 -nographic -icount shift=auto,rr=record,rrfile=replay.log
$ ./build/qemu-system-x86_64 -nographic -icount shift=auto,rr=replay,rrfile=replay.log
[1] f5ab12caba
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2907
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250410225550.46807-2-pierrick.bouvier@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
83 lines
2.4 KiB
C
83 lines
2.4 KiB
C
/*
|
|
* QEMU System Emulator
|
|
*
|
|
* Copyright (c) 2003-2020 Fabrice Bellard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu-main.h"
|
|
#include "qemu/main-loop.h"
|
|
#include "system/replay.h"
|
|
#include "system/system.h"
|
|
|
|
#ifdef CONFIG_SDL
|
|
/*
|
|
* SDL insists on wrapping the main() function with its own implementation on
|
|
* some platforms; it does so via a macro that renames our main function, so
|
|
* <SDL.h> must be #included here even with no SDL code called from this file.
|
|
*/
|
|
#include <SDL.h>
|
|
#endif
|
|
|
|
#ifdef CONFIG_DARWIN
|
|
#include <CoreFoundation/CoreFoundation.h>
|
|
#endif
|
|
|
|
static void *qemu_default_main(void *opaque)
|
|
{
|
|
int status;
|
|
|
|
replay_mutex_lock();
|
|
bql_lock();
|
|
status = qemu_main_loop();
|
|
qemu_cleanup(status);
|
|
bql_unlock();
|
|
replay_mutex_unlock();
|
|
|
|
exit(status);
|
|
}
|
|
|
|
int (*qemu_main)(void);
|
|
|
|
#ifdef CONFIG_DARWIN
|
|
static int os_darwin_cfrunloop_main(void)
|
|
{
|
|
CFRunLoopRun();
|
|
g_assert_not_reached();
|
|
}
|
|
int (*qemu_main)(void) = os_darwin_cfrunloop_main;
|
|
#endif
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
qemu_init(argc, argv);
|
|
bql_unlock();
|
|
replay_mutex_unlock();
|
|
if (qemu_main) {
|
|
QemuThread main_loop_thread;
|
|
qemu_thread_create(&main_loop_thread, "qemu_main",
|
|
qemu_default_main, NULL, QEMU_THREAD_DETACHED);
|
|
return qemu_main();
|
|
} else {
|
|
qemu_default_main(NULL);
|
|
g_assert_not_reached();
|
|
}
|
|
}
|