mirror of https://github.com/xemu-project/xemu.git
Stop before shutdown
(Eduardo Felipe) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4192 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
ca10f86763
commit
b2f76161e8
14
vl.c
14
vl.c
|
@ -215,6 +215,7 @@ const char *vnc_display;
|
||||||
int acpi_enabled = 1;
|
int acpi_enabled = 1;
|
||||||
int fd_bootchk = 1;
|
int fd_bootchk = 1;
|
||||||
int no_reboot = 0;
|
int no_reboot = 0;
|
||||||
|
int no_shutdown = 0;
|
||||||
int cursor_hide = 1;
|
int cursor_hide = 1;
|
||||||
int graphic_rotate = 0;
|
int graphic_rotate = 0;
|
||||||
int daemonize = 0;
|
int daemonize = 0;
|
||||||
|
@ -7570,7 +7571,12 @@ static int main_loop(void)
|
||||||
|
|
||||||
if (shutdown_requested) {
|
if (shutdown_requested) {
|
||||||
ret = EXCP_INTERRUPT;
|
ret = EXCP_INTERRUPT;
|
||||||
break;
|
if (no_shutdown) {
|
||||||
|
vm_stop(0);
|
||||||
|
no_shutdown = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
if (reset_requested) {
|
if (reset_requested) {
|
||||||
reset_requested = 0;
|
reset_requested = 0;
|
||||||
|
@ -7729,6 +7735,7 @@ static void help(int exitcode)
|
||||||
"-curses use a curses/ncurses interface instead of SDL\n"
|
"-curses use a curses/ncurses interface instead of SDL\n"
|
||||||
#endif
|
#endif
|
||||||
"-no-reboot exit instead of rebooting\n"
|
"-no-reboot exit instead of rebooting\n"
|
||||||
|
"-no-shutdown stop before shutdown\n"
|
||||||
"-loadvm file start right away with a saved state (loadvm in monitor)\n"
|
"-loadvm file start right away with a saved state (loadvm in monitor)\n"
|
||||||
"-vnc display start a VNC server on display\n"
|
"-vnc display start a VNC server on display\n"
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
@ -7835,6 +7842,7 @@ enum {
|
||||||
QEMU_OPTION_no_acpi,
|
QEMU_OPTION_no_acpi,
|
||||||
QEMU_OPTION_curses,
|
QEMU_OPTION_curses,
|
||||||
QEMU_OPTION_no_reboot,
|
QEMU_OPTION_no_reboot,
|
||||||
|
QEMU_OPTION_no_shutdown,
|
||||||
QEMU_OPTION_show_cursor,
|
QEMU_OPTION_show_cursor,
|
||||||
QEMU_OPTION_daemonize,
|
QEMU_OPTION_daemonize,
|
||||||
QEMU_OPTION_option_rom,
|
QEMU_OPTION_option_rom,
|
||||||
|
@ -7940,6 +7948,7 @@ const QEMUOption qemu_options[] = {
|
||||||
{ "vmwarevga", 0, QEMU_OPTION_vmsvga },
|
{ "vmwarevga", 0, QEMU_OPTION_vmsvga },
|
||||||
{ "no-acpi", 0, QEMU_OPTION_no_acpi },
|
{ "no-acpi", 0, QEMU_OPTION_no_acpi },
|
||||||
{ "no-reboot", 0, QEMU_OPTION_no_reboot },
|
{ "no-reboot", 0, QEMU_OPTION_no_reboot },
|
||||||
|
{ "no-shutdown", 0, QEMU_OPTION_no_shutdown },
|
||||||
{ "show-cursor", 0, QEMU_OPTION_show_cursor },
|
{ "show-cursor", 0, QEMU_OPTION_show_cursor },
|
||||||
{ "daemonize", 0, QEMU_OPTION_daemonize },
|
{ "daemonize", 0, QEMU_OPTION_daemonize },
|
||||||
{ "option-rom", HAS_ARG, QEMU_OPTION_option_rom },
|
{ "option-rom", HAS_ARG, QEMU_OPTION_option_rom },
|
||||||
|
@ -8729,6 +8738,9 @@ int main(int argc, char **argv)
|
||||||
case QEMU_OPTION_no_reboot:
|
case QEMU_OPTION_no_reboot:
|
||||||
no_reboot = 1;
|
no_reboot = 1;
|
||||||
break;
|
break;
|
||||||
|
case QEMU_OPTION_no_shutdown:
|
||||||
|
no_shutdown = 1;
|
||||||
|
break;
|
||||||
case QEMU_OPTION_show_cursor:
|
case QEMU_OPTION_show_cursor:
|
||||||
cursor_hide = 0;
|
cursor_hide = 0;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue