From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FBC8C433E0 for ; Thu, 11 Mar 2021 16:53:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D4AE64FE9 for ; Thu, 11 Mar 2021 16:53:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D4AE64FE9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKOYg-00041o-8k for qemu-devel@archiver.kernel.org; Thu, 11 Mar 2021 11:53:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKOOy-0002fm-N4 for qemu-devel@nongnu.org; Thu, 11 Mar 2021 11:43:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39248) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKOOw-0003RE-QY for qemu-devel@nongnu.org; Thu, 11 Mar 2021 11:43:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615480986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QwFiGvOWGoqmRcBJnmrX+Q8xgVhXHyuSLKF45wdYMqo=; b=eH0/HAk423L5bHP0HiqtanQVgg2qmTyR1oKtmIeuLEtZzv4O/3H3sQxQg0kzDwgZiXcABk bNnQllv7PN34Ezf5k6mWbL+oOXz0EY662V8W71/PR53ojxjx78ERdbMVPqNOkviEchdwL6 s1EThOSOYYsN6ISq+QX7baKq0uIpeOY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-541-pfAy45POPUic6c3SKyPIjg-1; Thu, 11 Mar 2021 11:43:04 -0500 X-MC-Unique: pfAy45POPUic6c3SKyPIjg-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D21D80D6AC for ; Thu, 11 Mar 2021 16:43:03 +0000 (UTC) Received: from merkur.fritz.box (ovpn-114-112.ams2.redhat.com [10.36.114.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3894D5D9F0; Thu, 11 Mar 2021 16:43:02 +0000 (UTC) From: Kevin Wolf To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] char: Simplify chardev_name_foreach() Date: Thu, 11 Mar 2021 17:42:53 +0100 Message-Id: <20210311164253.338723-4-kwolf@redhat.com> In-Reply-To: <20210311164253.338723-1-kwolf@redhat.com> References: <20210311164253.338723-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pbonzini@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Both callers use callbacks that don't do anything when they are called for CLI aliases. Instead of passing the cli_alias parameter, just don't call the callbacks for aliases in the first place. Signed-off-by: Kevin Wolf --- chardev/char.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/chardev/char.c b/chardev/char.c index 7be9579dd8..140d6d9d36 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -548,7 +548,7 @@ static struct ChardevAlias { }; typedef struct ChadevClassFE { - void (*fn)(const char *name, bool is_cli_alias, void *opaque); + void (*fn)(const char *name, void *opaque); void *opaque; } ChadevClassFE; @@ -562,33 +562,23 @@ chardev_class_foreach(ObjectClass *klass, void *opaque) return; } - fe->fn(object_class_get_name(klass) + 8, false, fe->opaque); + fe->fn(object_class_get_name(klass) + 8, fe->opaque); } static void -chardev_name_foreach(void (*fn)(const char *name, bool is_cli_alias, - void *opaque), +chardev_name_foreach(void (*fn)(const char *name, void *opaque), void *opaque) { ChadevClassFE fe = { .fn = fn, .opaque = opaque }; - int i; object_class_foreach(chardev_class_foreach, TYPE_CHARDEV, false, &fe); - - for (i = 0; i < (int)ARRAY_SIZE(chardev_alias_table); i++) { - fn(chardev_alias_table[i].alias, true, opaque); - } } static void -help_string_append(const char *name, bool is_cli_alias, void *opaque) +help_string_append(const char *name, void *opaque) { GString *str = opaque; - if (is_cli_alias) { - return; - } - g_string_append_printf(str, "\n %s", name); } @@ -810,15 +800,11 @@ ChardevInfoList *qmp_query_chardev(Error **errp) } static void -qmp_prepend_backend(const char *name, bool is_cli_alias, void *opaque) +qmp_prepend_backend(const char *name, void *opaque) { ChardevBackendInfoList **list = opaque; ChardevBackendInfo *value; - if (is_cli_alias) { - return; - } - value = g_new0(ChardevBackendInfo, 1); value->name = g_strdup(name); QAPI_LIST_PREPEND(*list, value); -- 2.29.2