diff to v3:
- Broken the last patch into two:
  - dropping local redefine of the WatchdogAction enum,
  - introducing new monitor command.
- Dropped two unused #include-s

Michal Privoznik (3):
  qapi: Rename WatchdogExpirationAction enum
  watchdog.h: Drop local redefinition of actions enum
  watchdog: Allow setting action on the fly

 hw/watchdog/watchdog.c    | 62 +++++++++++++++++++++++------------------------
 hw/watchdog/wdt_diag288.c |  6 ++---
 include/sysemu/watchdog.h | 12 ++-------
 monitor.c                 |  4 +--
 qapi-schema.json          |  9 +++++++
 qapi/run-state.json       |  6 ++---
 6 files changed, 49 insertions(+), 50 deletions(-)

-- 
2.13.5

Series
Reviewed-by: Markus Armbruster <armbru@redhat.com>

Perhaps Rich would like to have a look, too.

On Wed, Sep 06, 2017 at 05:32:08PM +0200, Markus Armbruster wrote:
> Series
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> 
> Perhaps Rich would like to have a look, too.

I looked at them and they seemed OK but I didn't review them.

I also added this comment on the bug which maybe relevant,
maybe not ...

https://bugzilla.redhat.com/show_bug.cgi?id=1447169#c4

  "Not that it matters, but the real hardware was built into the
   southbridge and so not hotpluggable.

   Do you know what happens (or should happen) if the guest kernel
   loads the i6300esb driver with nowayout=1 and the hardware is
   unplugged?  My reading of the driver says that this will not break
   or crash, although it probably won't work as the guest user
   expects.  You can tell from the qemu side if the guest selected
   nowayout because ESB_WDT_LOCK is written to the ESB_LOCK_REG
   register.

   Anyway, this may not matter."

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v

On 09/06/2017 05:37 PM, Richard W.M. Jones wrote:
> On Wed, Sep 06, 2017 at 05:32:08PM +0200, Markus Armbruster wrote:
>> Series
>> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>>
>> Perhaps Rich would like to have a look, too.
> 
> I looked at them and they seemed OK but I didn't review them.
> 
> I also added this comment on the bug which maybe relevant,
> maybe not ...
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=1447169#c4
> 
>   "Not that it matters, but the real hardware was built into the
>    southbridge and so not hotpluggable.
> 
>    Do you know what happens (or should happen) if the guest kernel
>    loads the i6300esb driver with nowayout=1 and the hardware is
>    unplugged?  My reading of the driver says that this will not break
>    or crash, although it probably won't work as the guest user
>    expects.  You can tell from the qemu side if the guest selected
>    nowayout because ESB_WDT_LOCK is written to the ESB_LOCK_REG
>    register.
> 
>    Anyway, this may not matter."

I've tested this and the guest continued running happily after I've
detached the watchdog.

Michal