summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorHanna Reitz <hreitz@redhat.com>2022-04-27 13:40:56 +0200
committerKevin Wolf <kwolf@redhat.com>2022-05-04 15:55:23 +0200
commitccfaf783c8eecae99b671e4e892954c9226ef5dc (patch)
tree1edc7087645cd8b9ef2a5b455f3b869c0dbb823f
parent06e9cd19a4e9acf8d24327361a999943d846f607 (diff)
downloadfocaccia-qemu-ccfaf783c8eecae99b671e4e892954c9226ef5dc.tar.gz
focaccia-qemu-ccfaf783c8eecae99b671e4e892954c9226ef5dc.zip
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 <hreitz@redhat.com>
Message-Id: <20220427114057.36651-4-hreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--include/qemu/main-loop.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
index d3750c8e76..89bd9edefb 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 */