diff options
| author | Akihiko Odaki | 2022-08-19 15:27:55 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2022-09-23 14:36:33 +0200 |
| commit | 2dc7f90a835a4cd2362ace5e2388687afd296b85 (patch) | |
| tree | 62cbfe0a9dc87a1c6e6def625feb59cfa6c6767e /include/qemu | |
| parent | ui/cocoa: Run qemu_init in the main thread (diff) | |
| download | qemu-2dc7f90a835a4cd2362ace5e2388687afd296b85.tar.gz qemu-2dc7f90a835a4cd2362ace5e2388687afd296b85.tar.xz qemu-2dc7f90a835a4cd2362ace5e2388687afd296b85.zip | |
Revert "main-loop: Disable block backend global state assertion on Cocoa"
This reverts commit 47281859f66bdab1974fb122cab2cbb4a1c9af7f.
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220819132756.74641-3-akihiko.odaki@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'include/qemu')
| -rw-r--r-- | include/qemu/main-loop.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index c50d1b7e3a..aac707d073 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -284,23 +284,10 @@ bool qemu_in_main_thread(void); * Please refer to include/block/block-global-state.h for more * information about GS API. */ -#ifdef CONFIG_COCOA -/* - * When using the Cocoa UI, addRemovableDevicesMenuItems() is called from - * a thread different from the QEMU main thread and can not take the BQL, - * triggering this assertions in the block layer (commit 0439c5a462). - * As the Cocoa fix is not trivial, disable this assertion for the v7.0.0 - * release (when using Cocoa); we will restore it immediately after the - * release. - * This issue is tracked as https://gitlab.com/qemu-project/qemu/-/issues/926 - */ -#define GLOBAL_STATE_CODE() -#else #define GLOBAL_STATE_CODE() \ do { \ assert(qemu_in_main_thread()); \ } while (0) -#endif /* CONFIG_COCOA */ /* * Mark and check that the function is part of the I/O API. |