From patchwork Sun Mar 30 10:58:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hani Benhabiles X-Patchwork-Id: 335089 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 4B8F31400C7 for ; Sun, 30 Mar 2014 21:59:45 +1100 (EST) Received: from localhost ([::1]:43701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUDSo-0008Cf-BH for incoming@patchwork.ozlabs.org; Sun, 30 Mar 2014 06:59:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUDS9-0008Bb-Cu for qemu-devel@nongnu.org; Sun, 30 Mar 2014 06:59:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUDS3-0003UP-DH for qemu-devel@nongnu.org; Sun, 30 Mar 2014 06:59:01 -0400 Received: from mail-ee0-x22d.google.com ([2a00:1450:4013:c00::22d]:50878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUDS3-0003UC-3O for qemu-devel@nongnu.org; Sun, 30 Mar 2014 06:58:55 -0400 Received: by mail-ee0-f45.google.com with SMTP id d17so5560444eek.18 for ; Sun, 30 Mar 2014 03:58:54 -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:in-reply-to:references; bh=hVvV/bqqxA2ZDiC36Cr5DS8I4+4hWsYfrMJKuYipIeQ=; b=aF9yKL9uxcgGsAj77KyoD20ODzML+5VVnP8uzdEHZ5hI0gj0qjv95eG1U6mTwh+gIo eRTkHIMlbPCHuouwQhey1uFk713S5fKKW5jJqQtq0Kgwns6zuGc29ENgXKSJ9xdtnKus fRQs/KqL7y3XfRr1W9TikS4MI1uU4p1ohnjcySuiiQjIWz9bF7lvIBVFGEtrt/3etktD O+0FI5m0Gu41ywS9sUdJChZrBA2DmDcfXCZpR30gGRpT0zkY99dhtly9MlERWcuO5n0s OJstTYJnIjjohCS83GkHYSeb7nx+cMHaGS+AYoWbSJ7T14l929tsBZii1f2+YwjCNNJl 2SFA== X-Received: by 10.14.241.139 with SMTP id g11mr10913981eer.49.1396177134209; Sun, 30 Mar 2014 03:58:54 -0700 (PDT) Received: from localhost.localdomain ([41.109.152.17]) by mx.google.com with ESMTPSA id y51sm25023258eeu.0.2014.03.30.03.58.52 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Mar 2014 03:58:53 -0700 (PDT) From: Hani Benhabiles To: qemu-devel@nongnu.org Date: Sun, 30 Mar 2014 11:58:25 +0100 Message-Id: <1396177119-24955-4-git-send-email-kroosec@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1396177119-24955-1-git-send-email-kroosec@gmail.com> References: <1396177119-24955-1-git-send-email-kroosec@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::22d Cc: kwolf@redhat.com, aliguori@amazon.com, lcapitulino@redhat.com, stefanha@redhat.com, imammedo@redhat.com Subject: [Qemu-devel] [PATCH v2 03/17] monitor: Add device_add and device_del completion. 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 --- hmp-commands.hx | 2 ++ hmp.h | 2 ++ monitor.c | 34 +++++++++++++++++++++------------- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 1b382b6..4c4d261 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -658,6 +658,7 @@ ETEXI .help = "add device, like -device on the command line", .user_print = monitor_user_noop, .mhandler.cmd_new = do_device_add, + .command_completion = device_add_completion, }, STEXI @@ -673,6 +674,7 @@ ETEXI .params = "device", .help = "remove device", .mhandler.cmd = hmp_device_del, + .command_completion = device_del_completion, }, STEXI diff --git a/hmp.h b/hmp.h index 2f2c059..20ef454 100644 --- a/hmp.h +++ b/hmp.h @@ -95,5 +95,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict); void hmp_object_del(Monitor *mon, const QDict *qdict); void object_add_completion(ReadLineState *rs, int nb_args, const char *str); void object_del_completion(ReadLineState *rs, int nb_args, const char *str); +void device_add_completion(ReadLineState *rs, int nb_args, const char *str); +void device_del_completion(ReadLineState *rs, int nb_args, const char *str); #endif diff --git a/monitor.c b/monitor.c index 566a83f..710ba25 100644 --- a/monitor.c +++ b/monitor.c @@ -4278,11 +4278,15 @@ static const char *next_arg_type(const char *typestr) return (p != NULL ? ++p : typestr); } -static void device_add_completion(ReadLineState *rs, const char *str) +void device_add_completion(ReadLineState *rs, int nb_args, const char *str) { GSList *list, *elt; size_t len; + if (nb_args != 2) { + return; + } + len = strlen(str); readline_set_completion_index(rs, len); list = elt = object_class_get_list(TYPE_DEVICE, false); @@ -4323,8 +4327,8 @@ void object_add_completion(ReadLineState *rs, int nb_args, const char *str) g_slist_free(list); } -static void device_del_completion(ReadLineState *rs, BusState *bus, - const char *str, size_t len) +static void device_del_bus_completion(ReadLineState *rs, BusState *bus, + const char *str, size_t len) { BusChild *kid; @@ -4337,11 +4341,24 @@ static void device_del_completion(ReadLineState *rs, BusState *bus, } QLIST_FOREACH(dev_child, &dev->child_bus, sibling) { - device_del_completion(rs, dev_child, str, len); + device_del_bus_completion(rs, dev_child, str, len); } } } +void device_del_completion(ReadLineState *rs, int nb_args, const char *str) +{ + size_t len; + + if (nb_args != 2) { + return; + } + + len = strlen(str); + readline_set_completion_index(rs, len); + device_del_bus_completion(rs, sysbus_get_default(), str, len); +} + void object_del_completion(ReadLineState *rs, int nb_args, const char *str) { ObjectPropertyInfoList *list, *start; @@ -4432,11 +4449,6 @@ static void monitor_find_completion_by_table(Monitor *mon, readline_set_completion_index(mon->rs, strlen(str)); bdrv_iterate(block_completion_it, &mbs); break; - case 'O': - if (!strcmp(cmd->name, "device_add") && nb_args == 2) { - device_add_completion(mon->rs, str); - } - break; case 's': case 'S': if (!strcmp(cmd->name, "sendkey")) { @@ -4450,10 +4462,6 @@ static void monitor_find_completion_by_table(Monitor *mon, } else if (!strcmp(cmd->name, "help|?")) { monitor_find_completion_by_table(mon, cmd_table, &args[1], nb_args - 1); - } else if (!strcmp(cmd->name, "device_del") && nb_args == 2) { - size_t len = strlen(str); - readline_set_completion_index(mon->rs, len); - device_del_completion(mon->rs, sysbus_get_default(), str, len); } break; default: