From patchwork Tue Jul 29 22:22:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hani Benhabiles X-Patchwork-Id: 374617 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E089A14013E for ; Wed, 30 Jul 2014 08:23:17 +1000 (EST) Received: from localhost ([::1]:48157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCFng-0000zx-0m for incoming@patchwork.ozlabs.org; Tue, 29 Jul 2014 18:23:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCFnK-0000i2-9N for qemu-devel@nongnu.org; Tue, 29 Jul 2014 18:23:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCFnE-0002em-AW for qemu-devel@nongnu.org; Tue, 29 Jul 2014 18:22:54 -0400 Received: from mail-wg0-x22a.google.com ([2a00:1450:400c:c00::22a]:48960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCFnE-0002ei-3N; Tue, 29 Jul 2014 18:22:48 -0400 Received: by mail-wg0-f42.google.com with SMTP id l18so306801wgh.25 for ; Tue, 29 Jul 2014 15:22:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=cg+I7JPpnZfgARdMtZgsUWNMOiaHBhqKEQK4ZRFECN8=; b=fo+dgVxllcowBLzRKPfx8uY5dXlRfpNuzW4sn5wPeIPcAIxs3JxJ7wWnLs4r/RMXJi mo7bbUbDCTZn5f2+HEt4L3axxgrtxc/RC1ZDlK3fcBYzwnas0h/yc7WrVE25i77Zcf6R foV9wXsgGEjB6xqRVpzns6hNkaXf7Gpg7P/WNsL6WTAK+LKLS1/hp7XzLLChp7BqIY0Q /MVMpcr4M2CArkAXyGT3iIfHDzcG1n+iHlfILfQwDT7usGIZPVyad2wE4IixKsWgS3hc VvDRjyyfYjJnJUqPPsV1i/1Xuz8HUvnK758TpNkLik1NaaWdqwNjJ9x+cKUB8y9n16Fa HYZw== X-Received: by 10.194.90.4 with SMTP id bs4mr7802171wjb.71.1406672566917; Tue, 29 Jul 2014 15:22:46 -0700 (PDT) Received: from localhost.localdomain ([41.103.28.105]) by mx.google.com with ESMTPSA id a4sm47980051wie.21.2014.07.29.15.22.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Jul 2014 15:22:46 -0700 (PDT) From: Hani Benhabiles To: qemu-devel@nongnu.org Date: Tue, 29 Jul 2014 23:22:40 +0100 Message-Id: <1406672560-21029-1-git-send-email-kroosec@gmail.com> X-Mailer: git-send-email 1.8.3.2 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22a Cc: qemu-trivial@nongnu.org, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH] monitor: Remove hardcoded watchdog event names X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Hani Benhabiles --- monitor.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index 5bc70a6..7465775 100644 --- a/monitor.c +++ b/monitor.c @@ -4520,16 +4520,15 @@ void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str) void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str) { + int i; + if (nb_args != 2) { return; } readline_set_completion_index(rs, strlen(str)); - add_completion_option(rs, str, "reset"); - add_completion_option(rs, str, "shutdown"); - add_completion_option(rs, str, "poweroff"); - add_completion_option(rs, str, "pause"); - add_completion_option(rs, str, "debug"); - add_completion_option(rs, str, "none"); + for (i = 0; WatchdogExpirationAction_lookup[i]; i++) { + add_completion_option(rs, str, WatchdogExpirationAction_lookup[i]); + } } void migrate_set_capability_completion(ReadLineState *rs, int nb_args,