{"id":810517,"url":"http://patchwork.ozlabs.org/api/patches/810517/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/dbd61a0928821348486d0d6260be2bd3b02b6402.1504696921.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":"","list_archive_url":null,"date":"2017-09-06T11:24:38","name":"[v4,1/3] qapi: Rename WatchdogExpirationAction enum","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"899b30dc5246e62e94797483dcafda391addf91b","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/dbd61a0928821348486d0d6260be2bd3b02b6402.1504696921.git.mprivozn@redhat.com/mbox/","series":[{"id":1768,"url":"http://patchwork.ozlabs.org/api/series/1768/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1768","date":"2017-09-06T11:24:37","name":"watchdog: Allow setting action on the fly","version":4,"mbox":"http://patchwork.ozlabs.org/series/1768/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810517/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810517/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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.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 3xnLsK6rgqz9s9Y\n\tfor ;\n\tWed, 6 Sep 2017 21:27:17 +1000 (AEST)","from localhost ([::1]:35489 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpYUG-0003P2-3J\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 07:27:16 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51422)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpYRx-0001aI-Bu\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:24:58 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpYRs-0005DH-UF\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:24:53 -0400","from mx1.redhat.com ([209.132.183.28]:49340)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpYRs-0005D5-Ls\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:24:48 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 C10C680F99\n\tfor ; Wed, 6 Sep 2017 11:24:47 +0000 (UTC)","from moe.brq.redhat.com (unknown [10.43.2.192])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C04DE7B604;\n\tWed, 6 Sep 2017 11:24:46 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C10C680F99","From":"Michal Privoznik ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 13:24:38 +0200","Message-Id":"","In-Reply-To":["",""],"References":["",""],"X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tWed, 06 Sep 2017 11:24:47 +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 v4 1/3] qapi: Rename WatchdogExpirationAction\n\tenum","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":"The new name is WatchdogAction which is shorter,\n\nSigned-off-by: Michal Privoznik \n---\n hw/watchdog/watchdog.c | 14 +++++++-------\n monitor.c | 4 ++--\n qapi/run-state.json | 6 +++---\n 3 files changed, 12 insertions(+), 12 deletions(-)","diff":"diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c\nindex 0c5c9cde1c..358d79804d 100644\n--- a/hw/watchdog/watchdog.c\n+++ b/hw/watchdog/watchdog.c\n@@ -109,17 +109,17 @@ void watchdog_perform_action(void)\n {\n switch (watchdog_action) {\n case WDT_RESET: /* same as 'system_reset' in monitor */\n- qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_RESET, &error_abort);\n+ qapi_event_send_watchdog(WATCHDOG_ACTION_RESET, &error_abort);\n qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);\n break;\n \n case WDT_SHUTDOWN: /* same as 'system_powerdown' in monitor */\n- qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_SHUTDOWN, &error_abort);\n+ qapi_event_send_watchdog(WATCHDOG_ACTION_SHUTDOWN, &error_abort);\n qemu_system_powerdown_request();\n break;\n \n case WDT_POWEROFF: /* same as 'quit' command in monitor */\n- qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_POWEROFF, &error_abort);\n+ qapi_event_send_watchdog(WATCHDOG_ACTION_POWEROFF, &error_abort);\n exit(0);\n \n case WDT_PAUSE: /* same as 'stop' command in monitor */\n@@ -127,21 +127,21 @@ void watchdog_perform_action(void)\n * you would get a deadlock. Bypass the problem.\n */\n qemu_system_vmstop_request_prepare();\n- qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_PAUSE, &error_abort);\n+ qapi_event_send_watchdog(WATCHDOG_ACTION_PAUSE, &error_abort);\n qemu_system_vmstop_request(RUN_STATE_WATCHDOG);\n break;\n \n case WDT_DEBUG:\n- qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_DEBUG, &error_abort);\n+ qapi_event_send_watchdog(WATCHDOG_ACTION_DEBUG, &error_abort);\n fprintf(stderr, \"watchdog: timer fired\\n\");\n break;\n \n case WDT_NONE:\n- qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_NONE, &error_abort);\n+ qapi_event_send_watchdog(WATCHDOG_ACTION_NONE, &error_abort);\n break;\n \n case WDT_NMI:\n- qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_INJECT_NMI,\n+ qapi_event_send_watchdog(WATCHDOG_ACTION_INJECT_NMI,\n &error_abort);\n nmi_monitor_handle(0, NULL);\n break;\ndiff --git a/monitor.c b/monitor.c\nindex 9239f7adde..e6a6675c15 100644\n--- a/monitor.c\n+++ b/monitor.c\n@@ -3537,8 +3537,8 @@ void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str)\n return;\n }\n readline_set_completion_index(rs, strlen(str));\n- for (i = 0; i < WATCHDOG_EXPIRATION_ACTION__MAX; i++) {\n- add_completion_option(rs, str, WatchdogExpirationAction_str(i));\n+ for (i = 0; i < WATCHDOG_ACTION__MAX; i++) {\n+ add_completion_option(rs, str, WatchdogAction_str(i));\n }\n }\n \ndiff --git a/qapi/run-state.json b/qapi/run-state.json\nindex d36ff49834..bca46a8785 100644\n--- a/qapi/run-state.json\n+++ b/qapi/run-state.json\n@@ -253,10 +253,10 @@\n #\n ##\n { 'event': 'WATCHDOG',\n- 'data': { 'action': 'WatchdogExpirationAction' } }\n+ 'data': { 'action': 'WatchdogAction' } }\n \n ##\n-# @WatchdogExpirationAction:\n+# @WatchdogAction:\n #\n # An enumeration of the actions taken when the watchdog device's timer is\n # expired\n@@ -279,7 +279,7 @@\n #\n # Since: 2.1\n ##\n-{ 'enum': 'WatchdogExpirationAction',\n+{ 'enum': 'WatchdogAction',\n 'data': [ 'reset', 'shutdown', 'poweroff', 'pause', 'debug', 'none',\n 'inject-nmi' ] }\n \n","prefixes":["v4","1/3"]}