From: Peter Maydell Date: Tue, 3 Oct 2017 14:11:00 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-10-02' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0b7fe5aed7381802600a844742920935774bb6c6;p=qemu.git 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 " # gpg: aka "Markus Armbruster " # 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 --- 0b7fe5aed7381802600a844742920935774bb6c6