{"id":810890,"url":"http://patchwork.ozlabs.org/api/patches/810890/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/ce2790634e6a1b3b6cf90462399d17bad83f0290.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":"","list_archive_url":null,"date":"2017-09-07T08:05:25","name":"[v5,2/3] watchdog.h: Drop local redefinition of actions enum","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c6b0ab195e43bd885559fcf2b4614b09067d1c1b","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/ce2790634e6a1b3b6cf90462399d17bad83f0290.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/810890/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810890/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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.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 3xntMM26HTz9sRV\n\tfor ;\n\tThu, 7 Sep 2017 18:06:39 +1000 (AEST)","from localhost ([::1]:39208 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dprpd-0003Ka-By\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 04:06:37 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:54454)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dprop-0003DK-N8\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 04:05:57 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dprol-0000TP-ER\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 04:05:47 -0400","from mx1.redhat.com ([209.132.183.28]:33966)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dprol-0000Sq-6C\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 04:05:43 -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 4807E85542\n\tfor ; Thu, 7 Sep 2017 08:05:42 +0000 (UTC)","from moe.brq.redhat.com (unknown [10.43.2.192])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 8475A60603;\n\tThu, 7 Sep 2017 08:05:40 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 4807E85542","From":"Michal Privoznik ","To":"qemu-devel@nongnu.org","Date":"Thu, 7 Sep 2017 10:05:25 +0200","Message-Id":"","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.28]);\n\tThu, 07 Sep 2017 08:05:42 +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 2/3] watchdog.h: Drop local redefinition of\n\tactions enum","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":"We already have enum that enumerates all the actions that a\nwatchdog can take when hitting its timeout: WatchdogAction.\nUse that instead of inventing our own.\n\nSigned-off-by: Michal Privoznik \n---\n hw/watchdog/watchdog.c | 45 ++++++++++++++++++++-------------------------\n hw/watchdog/wdt_diag288.c | 6 +++---\n include/sysemu/watchdog.h | 12 ++----------\n 3 files changed, 25 insertions(+), 38 deletions(-)","diff":"diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c\nindex 358d79804d..0d3eeed187 100644\n--- a/hw/watchdog/watchdog.c\n+++ b/hw/watchdog/watchdog.c\n@@ -30,7 +30,7 @@\n #include \"hw/nmi.h\"\n #include \"qemu/help_option.h\"\n \n-static int watchdog_action = WDT_RESET;\n+static WatchdogAction watchdog_action = WATCHDOG_ACTION_RESET;\n static QLIST_HEAD(watchdog_list, WatchdogTimerModel) watchdog_list;\n \n void watchdog_add_model(WatchdogTimerModel *model)\n@@ -77,27 +77,19 @@ int select_watchdog(const char *p)\n \n int select_watchdog_action(const char *p)\n {\n- if (strcasecmp(p, \"reset\") == 0)\n- watchdog_action = WDT_RESET;\n- else if (strcasecmp(p, \"shutdown\") == 0)\n- watchdog_action = WDT_SHUTDOWN;\n- else if (strcasecmp(p, \"poweroff\") == 0)\n- watchdog_action = WDT_POWEROFF;\n- else if (strcasecmp(p, \"pause\") == 0)\n- watchdog_action = WDT_PAUSE;\n- else if (strcasecmp(p, \"debug\") == 0)\n- watchdog_action = WDT_DEBUG;\n- else if (strcasecmp(p, \"none\") == 0)\n- watchdog_action = WDT_NONE;\n- else if (strcasecmp(p, \"inject-nmi\") == 0)\n- watchdog_action = WDT_NMI;\n- else\n- return -1;\n+ int action;\n+ char *qapi_value;\n \n+ qapi_value = g_ascii_strdown(p, -1);\n+ action = qapi_enum_parse(&WatchdogAction_lookup, qapi_value, -1, NULL);\n+ g_free(qapi_value);\n+ if (action < 0)\n+ return -1;\n+ watchdog_action = action;\n return 0;\n }\n \n-int get_watchdog_action(void)\n+WatchdogAction get_watchdog_action(void)\n {\n return watchdog_action;\n }\n@@ -108,21 +100,21 @@ int get_watchdog_action(void)\n void watchdog_perform_action(void)\n {\n switch (watchdog_action) {\n- case WDT_RESET: /* same as 'system_reset' in monitor */\n+ case WATCHDOG_ACTION_RESET: /* same as 'system_reset' in monitor */\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+ case WATCHDOG_ACTION_SHUTDOWN: /* same as 'system_powerdown' in monitor */\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+ case WATCHDOG_ACTION_POWEROFF: /* same as 'quit' command in monitor */\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+ case WATCHDOG_ACTION_PAUSE: /* same as 'stop' command in monitor */\n /* In a timer callback, when vm_stop calls qemu_clock_enable\n * you would get a deadlock. Bypass the problem.\n */\n@@ -131,19 +123,22 @@ void watchdog_perform_action(void)\n qemu_system_vmstop_request(RUN_STATE_WATCHDOG);\n break;\n \n- case WDT_DEBUG:\n+ case WATCHDOG_ACTION_DEBUG:\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+ case WATCHDOG_ACTION_NONE:\n qapi_event_send_watchdog(WATCHDOG_ACTION_NONE, &error_abort);\n break;\n \n- case WDT_NMI:\n+ case WATCHDOG_ACTION_INJECT_NMI:\n qapi_event_send_watchdog(WATCHDOG_ACTION_INJECT_NMI,\n &error_abort);\n nmi_monitor_handle(0, NULL);\n break;\n+\n+ default:\n+ assert(0);\n }\n }\ndiff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c\nindex 47f289216a..1475743527 100644\n--- a/hw/watchdog/wdt_diag288.c\n+++ b/hw/watchdog/wdt_diag288.c\n@@ -57,9 +57,9 @@ static void diag288_timer_expired(void *dev)\n * the BQL; reset before triggering the action to avoid races with\n * diag288 instructions. */\n switch (get_watchdog_action()) {\n- case WDT_DEBUG:\n- case WDT_NONE:\n- case WDT_PAUSE:\n+ case WATCHDOG_ACTION_DEBUG:\n+ case WATCHDOG_ACTION_NONE:\n+ case WATCHDOG_ACTION_PAUSE:\n break;\n default:\n wdt_diag288_reset(dev);\ndiff --git a/include/sysemu/watchdog.h b/include/sysemu/watchdog.h\nindex 72a4da07a6..677ace3945 100644\n--- a/include/sysemu/watchdog.h\n+++ b/include/sysemu/watchdog.h\n@@ -23,15 +23,7 @@\n #define QEMU_WATCHDOG_H\n \n #include \"qemu/queue.h\"\n-\n-/* Possible values for action parameter. */\n-#define WDT_RESET 1 /* Hard reset. */\n-#define WDT_SHUTDOWN 2 /* Shutdown. */\n-#define WDT_POWEROFF 3 /* Quit. */\n-#define WDT_PAUSE 4 /* Pause. */\n-#define WDT_DEBUG 5 /* Prints a message and continues running. */\n-#define WDT_NONE 6 /* Do nothing. */\n-#define WDT_NMI 7 /* Inject nmi into the guest. */\n+#include \"qapi-types.h\"\n \n struct WatchdogTimerModel {\n QLIST_ENTRY(WatchdogTimerModel) entry;\n@@ -46,7 +38,7 @@ typedef struct WatchdogTimerModel WatchdogTimerModel;\n /* in hw/watchdog.c */\n int select_watchdog(const char *p);\n int select_watchdog_action(const char *action);\n-int get_watchdog_action(void);\n+WatchdogAction get_watchdog_action(void);\n void watchdog_add_model(WatchdogTimerModel *model);\n void watchdog_perform_action(void);\n \n","prefixes":["v5","2/3"]}