Monitor: Return before exiting with 'quit'

[qemu.git] / sysemu.h

diff --git a/sysemu.h b/sysemu.h
index bc33abfc9b1ef870c564a752387a6359283c171f..fa921df94a80bebaba60e061f0a033c1cb90d02f 100644 (file)
--- a/sysemu.h
+++ b/sysemu.h
@@ -6,9 +6,6 @@
 #include "qemu-option.h"
 #include "qemu-queue.h"
 #include "qemu-timer.h"
-#include "qdict.h"
-#include "qerror.h"
-#include "notify.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -48,9 +45,11 @@ void cpu_disable_ticks(void);
 void qemu_system_reset_request(void);
 void qemu_system_shutdown_request(void);
 void qemu_system_powerdown_request(void);
+void qemu_system_exit_request(void);
 int qemu_shutdown_requested(void);
 int qemu_reset_requested(void);
 int qemu_powerdown_requested(void);
+int qemu_exit_requested(void);
 extern qemu_irq qemu_system_powerdown;
 void qemu_system_reset(void);
 
@@ -74,10 +73,6 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f);
 void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f);
 int qemu_loadvm_state(QEMUFile *f);
 
-void exit_notifier_add(Notifier *notifier);
-void exit_notifier_remove(Notifier *notifier);
-
-
 #ifdef _WIN32
 /* Polling handling */
 
@@ -149,13 +144,9 @@ extern uint64_t node_cpumask[MAX_NODES];
 extern const char *option_rom[MAX_OPTION_ROMS];
 extern int nb_option_roms;
 
-#ifdef NEED_CPU_H
-#if defined(TARGET_SPARC) || defined(TARGET_PPC)
 #define MAX_PROM_ENVS 128
 extern const char *prom_envs[MAX_PROM_ENVS];
 extern unsigned int nb_prom_envs;
-#endif
-#endif
 
 typedef enum {
     IF_NONE,