From patchwork Thu Oct 23 15:19:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 402563 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 F214A14009A for ; Fri, 24 Oct 2014 02:23:08 +1100 (AEDT) Received: from localhost ([::1]:40755 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhKEE-0007sr-Op for incoming@patchwork.ozlabs.org; Thu, 23 Oct 2014 11:23:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhKBV-0003km-Pe for qemu-devel@nongnu.org; Thu, 23 Oct 2014 11:20:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XhKBR-0000WY-6M for qemu-devel@nongnu.org; Thu, 23 Oct 2014 11:20:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62562) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhKBQ-0000WS-QK for qemu-devel@nongnu.org; Thu, 23 Oct 2014 11:20:13 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9NFKABQ017831 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 Oct 2014 11:20:10 -0400 Received: from localhost (ovpn-116-128.ams2.redhat.com [10.36.116.128]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9NFK8HQ031447; Thu, 23 Oct 2014 11:20:09 -0400 From: Luiz Capitulino To: peter.maydell@linaro.org Date: Thu, 23 Oct 2014 11:19:49 -0400 Message-Id: <1414077590-18036-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1414077590-18036-1-git-send-email-lcapitulino@redhat.com> References: <1414077590-18036-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 6/7] monitor: add del completion for peripheral device 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 From: Zhu Guihua Add peripheral_device_del_completion() to let peripheral device del completion be possible. Signed-off-by: Zhu Guihua Reviewed-by: Marcel Apfelbaum Reviewed-by: Igor Mammedov Signed-off-by: Luiz Capitulino --- monitor.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/monitor.c b/monitor.c index fba4ce2..e3799f9 100644 --- a/monitor.c +++ b/monitor.c @@ -4341,6 +4341,31 @@ static void device_del_bus_completion(ReadLineState *rs, BusState *bus, } } +static void peripheral_device_del_completion(ReadLineState *rs, + const char *str, size_t len) +{ + Object *peripheral; + GSList *list = NULL, *item; + + peripheral = object_resolve_path("/machine/peripheral/", NULL); + if (peripheral == NULL) { + return; + } + + object_child_foreach(peripheral, qdev_build_hotpluggable_device_list, + &list); + + for (item = list; item; item = g_slist_next(item)) { + DeviceState *dev = item->data; + + if (dev->id && !strncmp(str, dev->id, len)) { + readline_add_completion(rs, dev->id); + } + } + + g_slist_free(list); +} + void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str) { size_t len; @@ -4414,6 +4439,7 @@ void device_del_completion(ReadLineState *rs, int nb_args, const char *str) len = strlen(str); readline_set_completion_index(rs, len); device_del_bus_completion(rs, sysbus_get_default(), str, len); + peripheral_device_del_completion(rs, str, len); } void object_del_completion(ReadLineState *rs, int nb_args, const char *str)