[Qemu-commits] [qemu/qemu] 14d53b: qapi: Rename WatchdogExpirationAction enum

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 14d53b4f4a88e82b4e62907ec64feafac1986531
      
https://github.com/qemu/qemu/commit/14d53b4f4a88e82b4e62907ec64feafac1986531
  Author: Michal Privoznik <address@hidden>
  Date:   2017-10-02 (Mon, 02 Oct 2017)

  Changed paths:
    M hw/watchdog/watchdog.c
    M monitor.c
    M qapi/run-state.json

  Log Message:
  -----------
  qapi: Rename WatchdogExpirationAction enum

The new name is WatchdogAction which is shorter,

Signed-off-by: Michal Privoznik <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 4c7f4426c454f5787154b86406188d90d4c1b267
      
https://github.com/qemu/qemu/commit/4c7f4426c454f5787154b86406188d90d4c1b267
  Author: Michal Privoznik <address@hidden>
  Date:   2017-10-02 (Mon, 02 Oct 2017)

  Changed paths:
    M hw/watchdog/watchdog.c
    M hw/watchdog/wdt_diag288.c
    M include/sysemu/watchdog.h

  Log Message:
  -----------
  watchdog.h: Drop local redefinition of actions enum

We already have enum that enumerates all the actions that a
watchdog can take when hitting its timeout: WatchdogAction.
Use that instead of inventing our own.

Signed-off-by: Michal Privoznik <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: f0df84c6c46cb632dac2d9fae5fdbe6001527c3b
      
https://github.com/qemu/qemu/commit/f0df84c6c46cb632dac2d9fae5fdbe6001527c3b
  Author: Michal Privoznik <address@hidden>
  Date:   2017-10-02 (Mon, 02 Oct 2017)

  Changed paths:
    M hw/watchdog/watchdog.c
    M qapi-schema.json

  Log Message:
  -----------
  watchdog: Allow setting action on the fly

Currently, the only time that users can set watchdog action is at
the start as all we expose is this -watchdog-action command line
argument. This is suboptimal when users want to plug the device
later via monitor. Alternatively, they might want to change the
action for already existing device on the fly.

Inspired by: https://bugzilla.redhat.com/show_bug.cgi?id=1447169

Signed-off-by: Michal Privoznik <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
[Missing colon in doc comment fixed]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 0b7fe5aed7381802600a844742920935774bb6c6
      
https://github.com/qemu/qemu/commit/0b7fe5aed7381802600a844742920935774bb6c6
  Author: Peter Maydell <address@hidden>
  Date:   2017-10-03 (Tue, 03 Oct 2017)

  Changed paths:
    M hw/watchdog/watchdog.c
    M hw/watchdog/wdt_diag288.c
    M include/sysemu/watchdog.h
    M monitor.c
    M qapi-schema.json
    M qapi/run-state.json

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-10-02' into 
staging

QAPI patches for 2017-10-02

# gpg: Signature made Mon 02 Oct 2017 12:09:32 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <address@hidden>"
# gpg:                 aka "Markus Armbruster <address@hidden>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2017-10-02:
  watchdog: Allow setting action on the fly
  watchdog.h: Drop local redefinition of actions enum
  qapi: Rename WatchdogExpirationAction enum

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/2c9482216767...0b7fe5aed738