openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow silent system resets 

This allows qemu_system_reset to be issued silently for internal
purposes, ie. without sending out a monitor event. Convert the system
reset after startup to the silent mode.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Jan Kiszka 2011-06-14 18:29:43 +02:00 committed by Luiz Capitulino
parent e4ea5e2d0e
commit e063eb1f4a
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysemu.h
View File

@ -34,6 +34,9 @@ void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
#define VMSTOP_LOADVM 7 #define VMSTOP_LOADVM 7
#define VMSTOP_MIGRATE 8 #define VMSTOP_MIGRATE 8
#define VMRESET_SILENT false
#define VMRESET_REPORT true
void vm_start(void); void vm_start(void);
void vm_stop(int reason); void vm_stop(int reason);
@ -50,7 +53,7 @@ int qemu_powerdown_requested(void);
void qemu_system_killed(int signal, pid_t pid); void qemu_system_killed(int signal, pid_t pid);
void qemu_kill_report(void); void qemu_kill_report(void);
extern qemu_irq qemu_system_powerdown; extern qemu_irq qemu_system_powerdown;
void qemu_system_reset(void); void qemu_system_reset(bool report);
void qemu_add_exit_notifier(Notifier *notify); void qemu_add_exit_notifier(Notifier *notify);
void qemu_remove_exit_notifier(Notifier *notify); void qemu_remove_exit_notifier(Notifier *notify);

10
vl.c
View File

@ -1253,7 +1253,7 @@ void qemu_unregister_reset(QEMUResetHandler *func, void *opaque)
} }
} }
void qemu_system_reset(void) void qemu_system_reset(bool report)
{ {
QEMUResetEntry *re, *nre; QEMUResetEntry *re, *nre;
@ -1261,7 +1261,9 @@ void qemu_system_reset(void)
QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) { QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) {
re->func(re->opaque); re->func(re->opaque);
} }
monitor_protocol_event(QEVENT_RESET, NULL); if (report) {
monitor_protocol_event(QEVENT_RESET, NULL);
}
cpu_synchronize_all_post_reset(); cpu_synchronize_all_post_reset();
} }
@ -1403,7 +1405,7 @@ static void main_loop(void)
if (qemu_reset_requested()) { if (qemu_reset_requested()) {
pause_all_vcpus(); pause_all_vcpus();
cpu_synchronize_all_states(); cpu_synchronize_all_states();
qemu_system_reset(); qemu_system_reset(VMRESET_REPORT);
resume_all_vcpus(); resume_all_vcpus();
} }
if (qemu_powerdown_requested()) { if (qemu_powerdown_requested()) {
@ -3293,7 +3295,7 @@ int main(int argc, char **argv, char **envp)
qemu_register_reset(qbus_reset_all_fn, sysbus_get_default()); qemu_register_reset(qbus_reset_all_fn, sysbus_get_default());
qemu_run_machine_init_done_notifiers(); qemu_run_machine_init_done_notifiers();
qemu_system_reset(); qemu_system_reset(VMRESET_SILENT);
if (loadvm) { if (loadvm) {
if (load_vmstate(loadvm) < 0) { if (load_vmstate(loadvm) < 0) {
autostart = 0; autostart = 0;

2
xen-all.c
View File

@ -452,7 +452,7 @@ static void cpu_handle_ioreq(void *opaque)
destroy_hvm_domain(); destroy_hvm_domain();
} }
if (qemu_reset_requested_get()) { if (qemu_reset_requested_get()) {
qemu_system_reset(); qemu_system_reset(VMRESET_REPORT);
} }
} }