[{"id":1767008,"web_url":"http://patchwork.ozlabs.org/comment/1767008/","msgid":"<20170912130442.GI17633@redhat.com>","list_archive_url":null,"date":"2017-09-12T13:04:42","subject":"Re: [Qemu-devel] [PATCH v5 3/3] watchdog: Allow setting action on\n\tthe fly","submitter":{"id":2694,"url":"http://patchwork.ozlabs.org/api/people/2694/","name":"Daniel P. Berrange","email":"berrange@redhat.com"},"content":"On Thu, Sep 07, 2017 at 10:05:26AM +0200, Michal Privoznik wrote:\n> Currently, the only time that users can set watchdog action is at\n> the start as all we expose is this -watchdog-action command line\n> argument. This is suboptimal when users want to plug the device\n> later via monitor. Alternatively, they might want to change the\n> action for already existing device on the fly.\n> \n> Inspired by: https://bugzilla.redhat.com/show_bug.cgi?id=1447169\n> \n> Signed-off-by: Michal Privoznik \n> ---\n> hw/watchdog/watchdog.c | 8 +++++++-\n> qapi-schema.json | 9 +++++++++\n> 2 files changed, 16 insertions(+), 1 deletion(-)\n> \n> diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c\n> index 0d3eeed187..670114ecfe 100644\n> --- a/hw/watchdog/watchdog.c\n> +++ b/hw/watchdog/watchdog.c\n> @@ -29,6 +29,7 @@\n> #include \"qapi-event.h\"\n> #include \"hw/nmi.h\"\n> #include \"qemu/help_option.h\"\n> +#include \"qmp-commands.h\"\n> \n> static WatchdogAction watchdog_action = WATCHDOG_ACTION_RESET;\n> static QLIST_HEAD(watchdog_list, WatchdogTimerModel) watchdog_list;\n> @@ -85,7 +86,7 @@ int select_watchdog_action(const char *p)\n> g_free(qapi_value);\n> if (action < 0)\n> return -1;\n> - watchdog_action = action;\n> + qmp_watchdog_set_action(action, &error_abort);\n> return 0;\n> }\n> \n> @@ -142,3 +143,8 @@ void watchdog_perform_action(void)\n> assert(0);\n> }\n> }\n> +\n> +void qmp_watchdog_set_action(WatchdogAction action, Error **errp)\n> +{\n> + watchdog_action = action;\n> +}\n> diff --git a/qapi-schema.json b/qapi-schema.json\n> index f3af2cb851..f5db401838 100644\n> --- a/qapi-schema.json\n> +++ b/qapi-schema.json\n> @@ -3143,3 +3143,12 @@\n> # Since 2.9\n> ##\n> { 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' }\n> +\n> +##\n> +# @watchdog-set-action:\n> +#\n> +# Set watchdog action\n> +#\n> +# Since 2.11\n\nNot sure how much it matters, but the standard syntax has a ':' following\nthe 'Since' word\n\nI do notice that query-vm-generation-id violates this rule though, which\nI what I guess you copied ?\n\n> +##\n> +{ 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} }\n> --\n\nAssuming the ':' is added in next posting (or by the committer), then\n\nReviewed-by: Daniel P. Berrange \n\nRegards,\nDaniel","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=berrange@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xs4m01sp0z9rxl\n\tfor ;\n\tTue, 12 Sep 2017 23:05:36 +1000 (AEST)","from localhost ([::1]:35745 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drksg-0006nn-Cp\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 09:05:34 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33451)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drks1-0006gI-Ln\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:04:59 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drkrv-0001dL-LH\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:04:53 -0400","from mx1.redhat.com ([209.132.183.28]:64728)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1drkrv-0001cg-Cg\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:04:47 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 50F6C883BE\n\tfor ; Tue, 12 Sep 2017 13:04:46 +0000 (UTC)","from redhat.com (unknown [10.42.22.189])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 6F8AC77DD8;\n\tTue, 12 Sep 2017 13:04:44 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 50F6C883BE","Date":"Tue, 12 Sep 2017 14:04:42 +0100","From":"\"Daniel P. Berrange\" ","To":"Michal Privoznik ","Message-ID":"<20170912130442.GI17633@redhat.com>","References":"\n\t<35d6ce6fe3d357122d73b8272bc8198134c74104.1504771369.git.mprivozn@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<35d6ce6fe3d357122d73b8272bc8198134c74104.1504771369.git.mprivozn@redhat.com>","User-Agent":"Mutt/1.8.3 (2017-05-23)","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tTue, 12 Sep 2017 13:04:46 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v5 3/3] watchdog: Allow setting action on\n\tthe fly","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Reply-To":"\"Daniel P. Berrange\" ","Cc":"qemu-devel@nongnu.org, armbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]