diff options
| author | hangaohuai | 2016-12-19 07:03:36 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2017-01-16 17:52:34 +0100 |
| commit | bf7bb91e3c998f80d72b69707f3f6050587eddc0 (patch) | |
| tree | da1893e40df377a7466a03ba1cf3aa3fb163babf /hw/timer | |
| parent | Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' ... (diff) | |
| download | qemu-bf7bb91e3c998f80d72b69707f3f6050587eddc0.tar.gz qemu-bf7bb91e3c998f80d72b69707f3f6050587eddc0.tar.xz qemu-bf7bb91e3c998f80d72b69707f3f6050587eddc0.zip | |
bugfix: vm halt when in reset looping
reset mc146818rtc device when RESET event happens.
Fix the problem:
1. Guest boot the second cpu, set CMOS_RESET_CODE 0x0a to protect selfboot;
2. VM being reset by others, hmp_system_reset;
3. seabios resume check the CMOS_RESET_CODE, if 0x0a, jump to the BDA
resume execution by jump via 40h:0067h;
4. Guest halt;
Signed-off-by: hangaohuai <hangaohuai@huawei.com>
Message-Id: <20161219060336.10176-1-hangaohuai@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/timer')
| -rw-r--r-- | hw/timer/mc146818rtc.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index da209d02f0..637f8722a7 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -946,11 +946,23 @@ static Property mc146818rtc_properties[] = { DEFINE_PROP_END_OF_LIST(), }; +static void rtc_resetdev(DeviceState *d) +{ + RTCState *s = MC146818_RTC(d); + + /* Reason: VM do suspend self will set 0xfe + * Reset any values other than 0xfe(Guest suspend case) */ + if (s->cmos_data[0x0f] != 0xfe) { + s->cmos_data[0x0f] = 0x00; + } +} + static void rtc_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = rtc_realizefn; + dc->reset = rtc_resetdev; dc->vmsd = &vmstate_rtc; dc->props = mc146818rtc_properties; /* Reason: needs to be wired up by rtc_init() */ |