Received: from eggs.gnu.org ([2001:4830:134:3::10]:33864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqRiZ-0001aL-SG for qemu-devel@nongnu.org; Mon, 26 Feb 2018 17:58:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqRiW-0004Ef-M9 for qemu-devel@nongnu.org; Mon, 26 Feb 2018 17:57:59 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:44284 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqRiW-0004E7-I6 for qemu-devel@nongnu.org; Mon, 26 Feb 2018 17:57:56 -0500 From: Eric Blake Date: Mon, 26 Feb 2018 16:57:43 -0600 Message-Id: <20180226225744.26356-1-eblake@redhat.com> In-Reply-To: <20180211093607.27351-1-armbru@redhat.com> References: <20180211093607.27351-1-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 23.5/29] watchdog: Consolidate QAPI into single file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mprivozn@redhat.com, armbru@redhat.com, marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com, Paolo Bonzini Commit f0df84c6 added watchdog-set-action in the main qapi-schema.json, but it belongs better in qapi/run-state.json alongside the definition of WatchdogAction. Signed-off-by: Eric Blake --- Based on my review of 24/29, I'm inserting this patch right before rebasing that one onto master. qapi-schema.json | 9 --------- qapi/run-state.json | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 05cc58e121e..93912e804ab 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3180,12 +3180,3 @@ # Since: 2.9 ## { 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' } - -## -# @watchdog-set-action: -# -# Set watchdog action -# -# Since: 2.11 -## -{ 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} } diff --git a/qapi/run-state.json b/qapi/run-state.json index bca46a8785f..3924357fef4 100644 --- a/qapi/run-state.json +++ b/qapi/run-state.json @@ -283,6 +283,15 @@ 'data': [ 'reset', 'shutdown', 'poweroff', 'pause', 'debug', 'none', 'inject-nmi' ] } +## +# @watchdog-set-action: +# +# Set watchdog action +# +# Since: 2.11 +## +{ 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} } + ## # @GUEST_PANICKED: # -- 2.14.3