OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

no-reboot option 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2192 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2006-10-02 19:44:22 +00:00
parent e3e97e7c90
commit d1beab8220
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qemu-doc.texi
View File

@ -634,6 +634,9 @@ Disable ACPI (Advanced Configuration and Power Interface) support. Use
it if your guest OS complains about ACPI problems (PC target machine it if your guest OS complains about ACPI problems (PC target machine
only). only).
@item -no-reboot
Exit instead of rebooting.
@item -loadvm file @item -loadvm file
Start right away with a saved state (@code{loadvm} in monitor) Start right away with a saved state (@code{loadvm} in monitor)
@end table @end table

13
vl.c
View File

@ -161,6 +161,7 @@ int vnc_display = -1;
#endif #endif
int acpi_enabled = 1; int acpi_enabled = 1;
int fd_bootchk = 1; int fd_bootchk = 1;
int no_reboot = 0;
/***********************************************************/ /***********************************************************/
/* x86 ISA bus support */ /* x86 ISA bus support */
@ -5627,7 +5628,11 @@ void qemu_system_reset(void)
void qemu_system_reset_request(void) void qemu_system_reset_request(void)
{ {
reset_requested = 1; if (no_reboot) {
shutdown_requested = 1;
} else {
reset_requested = 1;
}
if (cpu_single_env) if (cpu_single_env)
cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT); cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
} }
@ -5925,6 +5930,7 @@ void help(void)
" (default is CL-GD5446 PCI VGA)\n" " (default is CL-GD5446 PCI VGA)\n"
"-no-acpi disable ACPI\n" "-no-acpi disable ACPI\n"
#endif #endif
"-no-reboot exit instead of rebooting\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"
"\n" "\n"
@ -6005,6 +6011,7 @@ enum {
QEMU_OPTION_smp, QEMU_OPTION_smp,
QEMU_OPTION_vnc, QEMU_OPTION_vnc,
QEMU_OPTION_no_acpi, QEMU_OPTION_no_acpi,
QEMU_OPTION_no_reboot,
}; };
typedef struct QEMUOption { typedef struct QEMUOption {
@ -6081,6 +6088,7 @@ const QEMUOption qemu_options[] = {
{ "usb", 0, QEMU_OPTION_usb }, { "usb", 0, QEMU_OPTION_usb },
{ "cirrusvga", 0, QEMU_OPTION_cirrusvga }, { "cirrusvga", 0, QEMU_OPTION_cirrusvga },
{ "no-acpi", 0, QEMU_OPTION_no_acpi }, { "no-acpi", 0, QEMU_OPTION_no_acpi },
{ "no-reboot", 0, QEMU_OPTION_no_reboot },
{ NULL }, { NULL },
}; };
@ -6725,6 +6733,9 @@ int main(int argc, char **argv)
case QEMU_OPTION_no_acpi: case QEMU_OPTION_no_acpi:
acpi_enabled = 0; acpi_enabled = 0;
break; break;
case QEMU_OPTION_no_reboot:
no_reboot = 1;
break;
} }
} }
} }