gwj / at91sam9263 · Commits

Commit d1beab8220d1a7535bbaa44e3821922dbbad3677

Authored by bellard
1 parent e3e97e7c

no-reboot option 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2192 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 15 additions and 1 deletions
qemu-doc.texi
  View file @d1beab8
... ... @@ -634,6 +634,9 @@ Disable ACPI (Advanced Configuration and Power Interface) support. Use
634 634 it if your guest OS complains about ACPI problems (PC target machine
635 635 only).
636 636  
  637 +@item -no-reboot
  638 +Exit instead of rebooting.
  639 +
637 640 @item -loadvm file
638 641 Start right away with a saved state (@code{loadvm} in monitor)
639 642 @end table
... ...
... ... @@ -161,6 +161,7 @@ int vnc_display = -1;
161 161 #endif
162 162 int acpi_enabled = 1;
163 163 int fd_bootchk = 1;
  164 +int no_reboot = 0;
164 165  
165 166 /***********************************************************/
166 167 /* x86 ISA bus support */
... ... @@ -5627,7 +5628,11 @@ void qemu_system_reset(void)
5627 5628  
5628 5629 void qemu_system_reset_request(void)
5629 5630 {
5630   - reset_requested = 1;
  5631 + if (no_reboot) {
  5632 + shutdown_requested = 1;
  5633 + } else {
  5634 + reset_requested = 1;
  5635 + }
5631 5636 if (cpu_single_env)
5632 5637 cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
5633 5638 }
... ... @@ -5925,6 +5930,7 @@ void help(void)
5925 5930 " (default is CL-GD5446 PCI VGA)\n"
5926 5931 "-no-acpi disable ACPI\n"
5927 5932 #endif
  5933 + "-no-reboot exit instead of rebooting\n"
5928 5934 "-loadvm file start right away with a saved state (loadvm in monitor)\n"
5929 5935 "-vnc display start a VNC server on display\n"
5930 5936 "\n"
... ... @@ -6005,6 +6011,7 @@ enum {
6005 6011 QEMU_OPTION_smp,
6006 6012 QEMU_OPTION_vnc,
6007 6013 QEMU_OPTION_no_acpi,
  6014 + QEMU_OPTION_no_reboot,
6008 6015 };
6009 6016  
6010 6017 typedef struct QEMUOption {
... ... @@ -6081,6 +6088,7 @@ const QEMUOption qemu_options[] = {
6081 6088 { "usb", 0, QEMU_OPTION_usb },
6082 6089 { "cirrusvga", 0, QEMU_OPTION_cirrusvga },
6083 6090 { "no-acpi", 0, QEMU_OPTION_no_acpi },
  6091 + { "no-reboot", 0, QEMU_OPTION_no_reboot },
6084 6092 { NULL },
6085 6093 };
6086 6094  
... ... @@ -6725,6 +6733,9 @@ int main(int argc, char **argv)
6725 6733 case QEMU_OPTION_no_acpi:
6726 6734 acpi_enabled = 0;
6727 6735 break;
  6736 + case QEMU_OPTION_no_reboot:
  6737 + no_reboot = 1;
  6738 + break;
6728 6739 }
6729 6740 }
6730 6741 }
... ...