Revision d1beab82 vl.c

b/vl.c
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 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 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 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 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 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
    }

Also available in: Unified diff