diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2015-11-09 15:00:19 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2016-01-12 14:01:07 -0500 |
| commit | b837e68d5a6c1a5945513f1995875445a1594c8a (patch) | |
| tree | 47afc3c7cc77702367764067bcea656b00585618 /src/resume.c | |
| parent | 3e8d75f3bef0f36a807303d58523ef5eba4a386f (diff) | |
| download | seabios-hppa-b837e68d5a6c1a5945513f1995875445a1594c8a.zip seabios-hppa-b837e68d5a6c1a5945513f1995875445a1594c8a.tar.gz seabios-hppa-b837e68d5a6c1a5945513f1995875445a1594c8a.tar.bz2 | |
resume: Make KVM soft reboot loop detection more flexible
Move the check for soft reboot loops from resume.c to shadow.c and
directly check for the case where the copy of the BIOS in flash
appears to be a memory alias instead. This prevents a hang if an
external reboot request occurs during the BIOS memcpy.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/resume.c')
| -rw-r--r-- | src/resume.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/resume.c b/src/resume.c index a5465d8..afeadcf 100644 --- a/src/resume.c +++ b/src/resume.c @@ -114,19 +114,10 @@ s3_resume(void) farcall16big(&br); } -u8 HaveAttemptedReboot VARLOW; - // Attempt to invoke a hard-reboot. static void tryReboot(void) { - if (HaveAttemptedReboot) { - // Hard reboot has failed - try to shutdown machine. - dprintf(1, "Unable to hard-reboot machine - attempting shutdown.\n"); - apm_shutdown(); - } - HaveAttemptedReboot = 1; - dprintf(1, "Attempting a hard reboot\n"); // Setup for reset on qemu. |