From patchwork Thu Oct 23 15:19:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 402567 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 2FDE6140082 for ; Fri, 24 Oct 2014 02:24:49 +1100 (AEDT) Received: from localhost ([::1]:40770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhKFq-0002Aa-UI for incoming@patchwork.ozlabs.org; Thu, 23 Oct 2014 11:24:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhKBY-0003p3-88 for qemu-devel@nongnu.org; Thu, 23 Oct 2014 11:20:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XhKBS-0000Wy-Lc for qemu-devel@nongnu.org; Thu, 23 Oct 2014 11:20:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhKBS-0000Wt-Ed for qemu-devel@nongnu.org; Thu, 23 Oct 2014 11:20:14 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9NFKCUe001449 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 Oct 2014 11:20:12 -0400 Received: from localhost (ovpn-116-128.ams2.redhat.com [10.36.116.128]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9NFKB1W013426; Thu, 23 Oct 2014 11:20:11 -0400 From: Luiz Capitulino To: peter.maydell@linaro.org Date: Thu, 23 Oct 2014 11:19:50 -0400 Message-Id: <1414077590-18036-8-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.24 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 7/7] monitor: delete device_del_bus_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 From: Zhu Guihua device_del_bus_completion() that gathers devices from buses is unused; delete it. Signed-off-by: Zhu Guihua Reviewed-by: Marcel Apfelbaum Reviewed-by: Igor Mammedov Signed-off-by: Luiz Capitulino --- monitor.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/monitor.c b/monitor.c index e3799f9..07fb36e 100644 --- a/monitor.c +++ b/monitor.c @@ -4322,25 +4322,6 @@ void object_add_completion(ReadLineState *rs, int nb_args, const char *str) g_slist_free(list); } -static void device_del_bus_completion(ReadLineState *rs, BusState *bus, - const char *str, size_t len) -{ - BusChild *kid; - - QTAILQ_FOREACH(kid, &bus->children, sibling) { - DeviceState *dev = kid->child; - BusState *dev_child; - - if (dev->id && !strncmp(str, dev->id, len)) { - readline_add_completion(rs, dev->id); - } - - QLIST_FOREACH(dev_child, &dev->child_bus, sibling) { - device_del_bus_completion(rs, dev_child, str, len); - } - } -} - static void peripheral_device_del_completion(ReadLineState *rs, const char *str, size_t len) { @@ -4438,7 +4419,6 @@ 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); }