mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Watchdog: disable watchdog timer when hard-rebooting a guest.

Browse Source 
This commit causes the watchdog timer to be reset when a guest is
hard-rebooted.

The failure case previously was as follows:

  (a) guest boots, watchdog is enabled

  (b) guest does a reset eg:
        echo 'b' > /proc/sysrq-trigger
    (note that an ordinary /sbin/reboot wouldn't hit this case
    since as the watchdog daemon is shut down, the daemon would
    properly disable the watchdog device)

  (c) the reboot takes longer than the remaining time on the
    watchdog

  (d) the watchdog therefore fires during the reboot

  (e) probably the VM would just reboot again at this point which
    is pretty benign, but it could depend on the action that the
    user had selected for the watchdog

Now we use the qdev reset function to register a reset handler
which disables the timer.  Note the handler is called _either_
just after init _or_ when the guest reboots.

In the i6300esb case there is a small refactoring of the code so
that the device's internal state is now fully restored to defaults
on a reboot.

Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Richard W.M. Jones 2010-09-24 16:08:06 +01:00 committed by Blue Swirl
parent 962630f207
commit 36888c6335
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/wdt_i6300esb.c
View File

@ -149,6 +149,8 @@ static void i6300esb_reset(DeviceState *dev)
i6300esb_disable_timer(d); i6300esb_disable_timer(d);
/* NB: Don't change d->previous_reboot_flag in this function. */
d->reboot_enabled = 1; d->reboot_enabled = 1;
d->clock_scale = CLOCK_SCALE_1KHZ; d->clock_scale = CLOCK_SCALE_1KHZ;
d->int_type = INT_TYPE_IRQ; d->int_type = INT_TYPE_IRQ;
@ -159,7 +161,6 @@ static void i6300esb_reset(DeviceState *dev)
d->timer2_preload = 0xfffff; d->timer2_preload = 0xfffff;
d->stage = 1; d->stage = 1;
d->unlock_state = 0; d->unlock_state = 0;
d->previous_reboot_flag = 0;
} }
/* This function is called when the watchdog expires. Note that /* This function is called when the watchdog expires. Note that
@ -193,6 +194,7 @@ static void i6300esb_timer_expired(void *vp)
if (d->reboot_enabled) { if (d->reboot_enabled) {
d->previous_reboot_flag = 1; d->previous_reboot_flag = 1;
watchdog_perform_action(); /* This reboots, exits, etc */ watchdog_perform_action(); /* This reboots, exits, etc */
i6300esb_reset(&d->dev.qdev);
} }
/* In "free running mode" we start stage 1 again. */ /* In "free running mode" we start stage 1 again. */
@ -409,6 +411,7 @@ static int i6300esb_init(PCIDevice *dev)
i6300esb_debug("I6300State = %p\n", d); i6300esb_debug("I6300State = %p\n", d);
d->timer = qemu_new_timer(vm_clock, i6300esb_timer_expired, d); d->timer = qemu_new_timer(vm_clock, i6300esb_timer_expired, d);
d->previous_reboot_flag = 0;
pci_conf = d->dev.config; pci_conf = d->dev.config;
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL); pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);

12
hw/wdt_ib700.c
View File

@ -97,6 +97,8 @@ static int wdt_ib700_init(ISADevice *dev)
{ {
IB700State *s = DO_UPCAST(IB700State, dev, dev); IB700State *s = DO_UPCAST(IB700State, dev, dev);
ib700_debug("watchdog init\n");
s->timer = qemu_new_timer(vm_clock, ib700_timer_expired, s); s->timer = qemu_new_timer(vm_clock, ib700_timer_expired, s);
register_ioport_write(0x441, 2, 1, ib700_write_disable_reg, s); register_ioport_write(0x441, 2, 1, ib700_write_disable_reg, s);
register_ioport_write(0x443, 2, 1, ib700_write_enable_reg, s); register_ioport_write(0x443, 2, 1, ib700_write_enable_reg, s);
@ -104,6 +106,15 @@ static int wdt_ib700_init(ISADevice *dev)
return 0; return 0;
} }
static void wdt_ib700_reset(DeviceState *dev)
{
IB700State *s = DO_UPCAST(IB700State, dev.qdev, dev);
ib700_debug("watchdog reset\n");
qemu_del_timer(s->timer);
}
static WatchdogTimerModel model = { static WatchdogTimerModel model = {
.wdt_name = "ib700", .wdt_name = "ib700",
.wdt_description = "iBASE 700", .wdt_description = "iBASE 700",
@ -113,6 +124,7 @@ static ISADeviceInfo wdt_ib700_info = {
.qdev.name = "ib700", .qdev.name = "ib700",
.qdev.size = sizeof(IB700State), .qdev.size = sizeof(IB700State),
.qdev.vmsd = &vmstate_ib700, .qdev.vmsd = &vmstate_ib700,
.qdev.reset = wdt_ib700_reset,
.init = wdt_ib700_init, .init = wdt_ib700_init,
}; };