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:
parent
e4ea5e2d0e
commit
e063eb1f4a
5
sysemu.h
5
sysemu.h
@ -34,6 +34,9 @@ void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
|
||||
#define VMSTOP_LOADVM 7
|
||||
#define VMSTOP_MIGRATE 8
|
||||
|
||||
#define VMRESET_SILENT false
|
||||
#define VMRESET_REPORT true
|
||||
|
||||
void vm_start(void);
|
||||
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_kill_report(void);
|
||||
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_remove_exit_notifier(Notifier *notify);
|
||||
|
10
vl.c
10
vl.c
@ -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;
|
||||
|
||||
@ -1261,7 +1261,9 @@ void qemu_system_reset(void)
|
||||
QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) {
|
||||
re->func(re->opaque);
|
||||
}
|
||||
monitor_protocol_event(QEVENT_RESET, NULL);
|
||||
if (report) {
|
||||
monitor_protocol_event(QEVENT_RESET, NULL);
|
||||
}
|
||||
cpu_synchronize_all_post_reset();
|
||||
}
|
||||
|
||||
@ -1403,7 +1405,7 @@ static void main_loop(void)
|
||||
if (qemu_reset_requested()) {
|
||||
pause_all_vcpus();
|
||||
cpu_synchronize_all_states();
|
||||
qemu_system_reset();
|
||||
qemu_system_reset(VMRESET_REPORT);
|
||||
resume_all_vcpus();
|
||||
}
|
||||
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_run_machine_init_done_notifiers();
|
||||
|
||||
qemu_system_reset();
|
||||
qemu_system_reset(VMRESET_SILENT);
|
||||
if (loadvm) {
|
||||
if (load_vmstate(loadvm) < 0) {
|
||||
autostart = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user