From: Ben Pfaff Date: Sun, 24 Aug 2008 17:16:32 +0000 (+0000) Subject: New option -r to reboot the VM after actions are complete. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d88e8f5938d6aae4b58149b259fd485278a83ef9;p=pintos-anon New option -r to reboot the VM after actions are complete. From Godmar Back, with minor tweaks. --- diff --git a/src/threads/init.c b/src/threads/init.c index bb7e301..9815a20 100644 --- a/src/threads/init.c +++ b/src/threads/init.c @@ -50,6 +50,9 @@ static bool format_filesys; /* -q: Power off after kernel tasks complete? */ bool power_off_when_done; +/* -r: Reboot after kernel tasks complete? */ +static bool reboot_when_done; + static void ram_init (void); static void paging_init (void); @@ -122,6 +125,9 @@ main (void) run_actions (argv); /* Finish up. */ + if (reboot_when_done) + reboot (); + if (power_off_when_done) power_off (); thread_exit (); @@ -237,6 +243,8 @@ parse_options (char **argv) usage (); else if (!strcmp (name, "-q")) power_off_when_done = true; + else if (!strcmp (name, "-r")) + reboot_when_done = true; #ifdef FILESYS else if (!strcmp (name, "-f")) format_filesys = true; @@ -357,6 +365,7 @@ usage (void) "\nOptions:\n" " -h Print this help message and power off.\n" " -q Power off VM after actions or on panic.\n" + " -r Reboot after actions.\n" " -f Format file system disk during startup.\n" " -rs=SEED Set random number seed to SEED.\n" " -mlfqs Use multi-level feedback queue scheduler.\n" @@ -368,6 +377,37 @@ usage (void) } +/* Reboots the machine we're running on. */ +void +reboot (void) +{ + int i; + + printf ("Rebooting...\n"); + + /* based on reboot.c code by Osamu Tomita + * See http://www.win.tue.nl/~aeb/linux/kbd/scancodes-11.html */ + for (i = 0; i < 100; i++) { + int j; + + /* Poll keyboard controller's status byte until + * 'input buffer empty' is reported, so it's ok to write */ + for (j = 0; j < 0x10000; j++) + { + if ((inb (0x64) & 0x02) == 0) + break; + timer_usleep (2); + } + + timer_usleep (50); + + /* Pulse bit 0 of the output port P2 of the keyboard controller. + * This will reset the CPU. */ + outb (0x64, 0xfe); + timer_usleep (50); + } +} + /* Powers down the machine we're running on, as long as we're running on Bochs or QEMU. */ void diff --git a/src/threads/init.h b/src/threads/init.h index a6fec05..963cbd6 100644 --- a/src/threads/init.h +++ b/src/threads/init.h @@ -16,5 +16,6 @@ extern uint32_t *base_page_dir; extern bool power_off_when_done; void power_off (void) NO_RETURN; +void reboot (void); #endif /* threads/init.h */