aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2018-03-06 13:33:12 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2018-03-12 16:12:46 +0100
commitc8ca2a23a953bcda04b5e10380f462526ed1ed89 (patch)
treebe9fc5a995c5cdb9526c7bb882ad4630d39df7a1
parent205f31a81adbd06830f2048ec00d729ebd67efa6 (diff)
downloadqemu-c8ca2a23a953bcda04b5e10380f462526ed1ed89.zip
qemu-c8ca2a23a953bcda04b5e10380f462526ed1ed89.tar.gz
qemu-c8ca2a23a953bcda04b5e10380f462526ed1ed89.tar.bz2
vl: export machine_init_done
We have that variable but not exported. Export that so modules can have a way to poke on whether machine init has finished. Meanwhile, set that up even before calling the notifiers, so that notifiers who may depend on this field will get a correct answer. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20180306053320.15401-2-peterx@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Acked-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--include/sysemu/sysemu.h2
-rw-r--r--stubs/machine-init-done.c2
-rw-r--r--vl.c4
3 files changed, 6 insertions, 2 deletions
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 356bfdc..2b42151 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -88,6 +88,8 @@ void qemu_system_guest_panicked(GuestPanicInformation *info);
void qemu_add_exit_notifier(Notifier *notify);
void qemu_remove_exit_notifier(Notifier *notify);
+extern bool machine_init_done;
+
void qemu_add_machine_init_done_notifier(Notifier *notify);
void qemu_remove_machine_init_done_notifier(Notifier *notify);
diff --git a/stubs/machine-init-done.c b/stubs/machine-init-done.c
index 9a0d625..4121f17 100644
--- a/stubs/machine-init-done.c
+++ b/stubs/machine-init-done.c
@@ -2,6 +2,8 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
+bool machine_init_done = true;
+
void qemu_add_machine_init_done_notifier(Notifier *notify)
{
}
diff --git a/vl.c b/vl.c
index 3ef04ce..26662eb 100644
--- a/vl.c
+++ b/vl.c
@@ -2696,7 +2696,7 @@ static void qemu_run_exit_notifiers(void)
notifier_list_notify(&exit_notifiers, NULL);
}
-static bool machine_init_done;
+bool machine_init_done;
void qemu_add_machine_init_done_notifier(Notifier *notify)
{
@@ -2713,8 +2713,8 @@ void qemu_remove_machine_init_done_notifier(Notifier *notify)
static void qemu_run_machine_init_done_notifiers(void)
{
- notifier_list_notify(&machine_init_done_notifiers, NULL);
machine_init_done = true;
+ notifier_list_notify(&machine_init_done_notifiers, NULL);
}
static const QEMUOption *lookup_opt(int argc, char **argv,