{"id":810891,"url":"http://patchwork.ozlabs.org/api/patches/810891/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/35d6ce6fe3d357122d73b8272bc8198134c74104.1504771369.git.mprivozn@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<35d6ce6fe3d357122d73b8272bc8198134c74104.1504771369.git.mprivozn@redhat.com>","list_archive_url":null,"date":"2017-09-07T08:05:26","name":"[v5,3/3] watchdog: Allow setting action on the fly","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"73585f8d0bed2a8be0de147bfddd89a43e837540","submitter":{"id":11888,"url":"http://patchwork.ozlabs.org/api/people/11888/?format=json","name":"Michal Prívozník","email":"mprivozn@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/35d6ce6fe3d357122d73b8272bc8198134c74104.1504771369.git.mprivozn@redhat.com/mbox/","series":[{"id":1938,"url":"http://patchwork.ozlabs.org/api/series/1938/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1938","date":"2017-09-07T08:05:24","name":"watchdog.h: Drop local redefinition of actions enum","version":5,"mbox":"http://patchwork.ozlabs.org/series/1938/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810891/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810891/checks/","tags":{},"related":[],"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=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mprivozn@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\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 3xntPf3gw2z9sRV\n\tfor ;\n\tThu, 7 Sep 2017 18:08:35 +1000 (AEST)","from localhost ([::1]:39213 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dprrU-00054Z-Uj\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 04:08:32 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:54492)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpros-0003Fb-M8\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 04:06:00 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpron-0000Up-Mq\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 04:05:50 -0400","from mx1.redhat.com ([209.132.183.28]:53188)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpron-0000UA-FJ\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 04:05:45 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 859DF4E4CA\n\tfor ; Thu, 7 Sep 2017 08:05:44 +0000 (UTC)","from moe.brq.redhat.com (unknown [10.43.2.192])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 9070660603;\n\tThu, 7 Sep 2017 08:05:42 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 859DF4E4CA","From":"Michal Privoznik ","To":"qemu-devel@nongnu.org","Date":"Thu, 7 Sep 2017 10:05:26 +0200","Message-Id":"<35d6ce6fe3d357122d73b8272bc8198134c74104.1504771369.git.mprivozn@redhat.com>","In-Reply-To":["",""],"References":["",""],"X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tThu, 07 Sep 2017 08:05:44 +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":"[Qemu-devel] [PATCH v5 3/3] watchdog: Allow setting action on the\n\tfly","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","Cc":"armbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Currently, the only time that users can set watchdog action is at\nthe start as all we expose is this -watchdog-action command line\nargument. This is suboptimal when users want to plug the device\nlater via monitor. Alternatively, they might want to change the\naction for already existing device on the fly.\n\nInspired by: https://bugzilla.redhat.com/show_bug.cgi?id=1447169\n\nSigned-off-by: Michal Privoznik \n---\n hw/watchdog/watchdog.c | 8 +++++++-\n qapi-schema.json | 9 +++++++++\n 2 files changed, 16 insertions(+), 1 deletion(-)","diff":"diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c\nindex 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+}\ndiff --git a/qapi-schema.json b/qapi-schema.json\nindex 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+##\n+{ 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} }\n","prefixes":["v5","3/3"]}