From: Hanna Reitz Date: Wed, 27 Apr 2022 11:40:56 +0000 (+0200) Subject: Revert "main-loop: Disable GLOBAL_STATE_CODE() assertions" X-Git-Tag: v7.1.0-rc0~116^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccfaf783c8eecae99b671e4e892954c9226ef5dc;p=thirdparty%2Fqemu.git Revert "main-loop: Disable GLOBAL_STATE_CODE() assertions" This reverts commit b1c073490553f80594b903ceedfc7c1aef6b1b19. (We wanted to do so once the 7.1 tree opens, which has happened. The issue reported in https://gitlab.com/qemu-project/qemu/-/issues/945 should be fixed by the preceding patches.) Signed-off-by: Hanna Reitz Message-Id: <20220427114057.36651-4-hreitz@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index d3750c8e764..89bd9edefba 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -284,8 +284,7 @@ bool qemu_in_main_thread(void); #else #define GLOBAL_STATE_CODE() \ do { \ - /* FIXME: Re-enable after 7.0 release */ \ - /* assert(qemu_in_main_thread()); */ \ + assert(qemu_in_main_thread()); \ } while (0) #endif /* CONFIG_COCOA */