diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2013-02-07 23:32:48 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2013-02-12 21:03:37 -0500 |
| commit | 897fb1133054e9f1e02931ad782223f40485837e (patch) | |
| tree | a7edc7ab19a7a96d41593807111ebb417e9346c5 /src/resume.c | |
| parent | 02313b205b0a461579c2799e31dc3f898c0b63ae (diff) | |
| download | seabios-hppa-897fb1133054e9f1e02931ad782223f40485837e.zip seabios-hppa-897fb1133054e9f1e02931ad782223f40485837e.tar.gz seabios-hppa-897fb1133054e9f1e02931ad782223f40485837e.tar.bz2 | |
Consistently use CONFIG_COREBOOT, CONFIG_QEMU, and runningOnXen().
CONFIG_QEMU means compile to start from QEMU (and possibly
Xen/KVM/Bochs) and definitely running under QEMU (or Xen/KVM/Bochs).
CONFIG_COREBOOT means compile for coreboot and definitely running
under coreboot. Places that used CONFIG_COREBOOT to mean "running on
real hardware" have been changed to use !CONFIG_QEMU.
CONFIG_QEMU_HARDWARE enables support for some virtual hardware devices
even if QEMU didn't start SeaBIOS.
usingXen() is replaced by runningOnXen().
runningOnQEMU() is added to hardware devices that are only safe to
access when we are sure we are running under QEMU (or Xen/KVM/Bochs).
Neither the coreboot nor the csm code currently enable runningOnQEMU,
but future patches may.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/resume.c')
| -rw-r--r-- | src/resume.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/resume.c b/src/resume.c index ffc84fc..adc3594 100644 --- a/src/resume.c +++ b/src/resume.c @@ -130,11 +130,7 @@ tryReboot(void) dprintf(1, "Attempting a hard reboot\n"); // Setup for reset on qemu. - if (! CONFIG_COREBOOT) { - qemu_prep_reset(); - if (HaveRunPost) - apm_shutdown(); - } + qemu_prep_reset(); // Try keyboard controller reboot. i8042_reboot(); |