From nobody Tue Feb 10 16:22:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@gnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@gnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506958605497292.7670628562298; Mon, 2 Oct 2017 08:36:45 -0700 (PDT) Received: from localhost ([::1]:52864 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dz2ln-00080g-6e for importer@patchew.org; Mon, 02 Oct 2017 11:36:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dz2be-0007zF-Il for qemu-devel@nongnu.org; Mon, 02 Oct 2017 11:26:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dz2bc-0007yL-3D for qemu-devel@nongnu.org; Mon, 02 Oct 2017 11:26:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34840) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dz2bb-0007wl-Oc for qemu-devel@nongnu.org; Mon, 02 Oct 2017 11:26:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B75C07E430; Mon, 2 Oct 2017 15:26:02 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-91.ams2.redhat.com [10.36.116.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 528795D723; Mon, 2 Oct 2017 15:26:02 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E2BA711562F1; Mon, 2 Oct 2017 17:25:52 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B75C07E430 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 2 Oct 2017 17:25:50 +0200 Message-Id: <20171002152552.27999-31-armbru@redhat.com> In-Reply-To: <20171002152552.27999-1-armbru@redhat.com> References: <20171002152552.27999-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 02 Oct 2017 15:26:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 30/32] qapi/options: QAPIfy --watchdog-action argument type X-BeenThere: qemu-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@gnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster --- qapi/options.json | 2 +- vl.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/qapi/options.json b/qapi/options.json index 853908560d..eb1a3e2dde 100644 --- a/qapi/options.json +++ b/qapi/options.json @@ -3868,7 +3868,7 @@ # !end texinfo ## { 'option': '--watchdog-action', - 'data': 'str', # FIXME enum + 'data': 'WatchdogAction', 'help': [ "-watchdog-action reset|shutdown|poweroff|inject-nmi|pause|debug|none", " action when watchdog fires [default=3Dreset]"] } diff --git a/vl.c b/vl.c index 4af2905c60..1814a53337 100644 --- a/vl.c +++ b/vl.c @@ -3724,11 +3724,8 @@ int main(int argc, char **argv, char **envp) watchdog =3D qopt[i].u.watchdog.data; break; case QAPI_OPTION_KIND_WATCHDOG_ACTION: - if (select_watchdog_action(qopt[i].u.watchdog_action.data) - =3D=3D -1) { - error_report("unknown -watchdog-action parameter"); - exit(1); - } + qmp_watchdog_set_action(qopt[i].u.watchdog_action.data, + &error_abort); break; case QAPI_OPTION_KIND_VIRTIOCONSOLE: add_device_config(DEV_VIRTCON, qopt[i].u.virtioconsole.dat= a); --=20 2.13.6