From patchwork Tue Jan 10 17:47:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 713344 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 3tyfmC3ZwBz9t2p for ; Wed, 11 Jan 2017 04:54:19 +1100 (AEDT) Received: from localhost ([::1]:48874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cR0cj-0002Zb-50 for incoming@patchwork.ozlabs.org; Tue, 10 Jan 2017 12:54:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cR0X4-00055r-Em for qemu-devel@nongnu.org; Tue, 10 Jan 2017 12:48:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cR0X3-0007lK-DX for qemu-devel@nongnu.org; Tue, 10 Jan 2017 12:48:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49602) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cR0X3-0007km-5b for qemu-devel@nongnu.org; Tue, 10 Jan 2017 12:48:25 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4CAE081227 for ; Tue, 10 Jan 2017 17:48:25 +0000 (UTC) Received: from localhost (ovpn-116-107.ams2.redhat.com [10.36.116.107]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0AHmOwM021290; Tue, 10 Jan 2017 12:48:24 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 10 Jan 2017 18:47:56 +0100 Message-Id: <20170110174810.17748-7-marcandre.lureau@redhat.com> In-Reply-To: <20170110174810.17748-1-marcandre.lureau@redhat.com> References: <20170110174810.17748-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 10 Jan 2017 17:48:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 06/20] char: use a static array for backends X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Number and kinds of backends is known at compile-time, use a fixed-sized static array to simplify iterations & lookups. Add an alias field to the CharDriver structure to cover the cases where we previously registered a driver twice under two names. Signed-off-by: Marc-André Lureau Reviewed-by: Eric Blake --- qemu-char.c | 68 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index e00559f31b..f3756a373f 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -4099,21 +4099,20 @@ static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend, } } -static GSList *backends; +static const CharDriver *backends[CHARDEV_BACKEND_KIND__MAX]; void register_char_driver(const CharDriver *driver) { - /* casting away const */ - backends = g_slist_append(backends, (void *)driver); + backends[driver->kind] = driver; } CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, Error **errp) { Error *local_err = NULL; - CharDriver *cd; + const CharDriver *cd = NULL; CharDriverState *chr; - GSList *i; + int i; ChardevReturn *ret = NULL; ChardevBackend *backend; const char *name = qemu_opt_get(opts, "backend"); @@ -4128,11 +4127,13 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, if (is_help_option(name)) { fprintf(stderr, "Available chardev backend types:\n"); - for (i = backends; i; i = i->next) { - cd = i->data; - fprintf(stderr, "%s\n", ChardevBackendKind_lookup[cd->kind]); - if (cd->alias) { - fprintf(stderr, "%s\n", cd->alias); + for (i = 0; i < ARRAY_SIZE(backends); i++) { + cd = backends[i]; + if (cd) { + fprintf(stderr, "%s\n", ChardevBackendKind_lookup[cd->kind]); + if (cd->alias) { + fprintf(stderr, "%s\n", cd->alias); + } } } exit(0); @@ -4143,15 +4144,17 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, goto err; } - for (i = backends; i; i = i->next) { - cd = i->data; - + for (i = 0; i < ARRAY_SIZE(backends); i++) { + cd = backends[i]; + if (!cd) { + continue; + } if (g_strcmp0(ChardevBackendKind_lookup[cd->kind], name) == 0 || g_strcmp0(cd->alias, name) == 0) { break; } } - if (i == NULL) { + if (i == ARRAY_SIZE(backends)) { error_setg(errp, "chardev: backend \"%s\" not found", name); goto err; } @@ -4368,11 +4371,15 @@ qmp_prepend_backend(ChardevBackendInfoList *list, const char *name) ChardevBackendInfoList *qmp_query_chardev_backends(Error **errp) { ChardevBackendInfoList *backend_list = NULL; - CharDriver *c; - GSList *i; + const CharDriver *c; + int i; + + for (i = 0; i < ARRAY_SIZE(backends); i++) { + c = backends[i]; + if (!c) { + continue; + } - for (i = backends; i; i = i->next) { - c = i->data; backend_list = qmp_prepend_backend(backend_list, ChardevBackendKind_lookup[c->kind]); if (c->alias) { @@ -4833,9 +4840,8 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, { ChardevReturn *ret = g_new0(ChardevReturn, 1); CharDriverState *chr = NULL; + const CharDriver *cd; Error *local_err = NULL; - GSList *i; - CharDriver *cd; bool be_opened = true; chr = qemu_chr_find(id); @@ -4844,22 +4850,16 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, goto out_error; } - for (i = backends; i; i = i->next) { - cd = i->data; - - if (cd->kind == backend->type) { - chr = cd->create(id, backend, ret, &be_opened, &local_err); - if (local_err) { - error_propagate(errp, local_err); - goto out_error; - } - break; - } + cd = (int)backend->type >= 0 && backend->type < ARRAY_SIZE(backends) ? + backends[backend->type] : NULL; + if (cd == NULL) { + error_setg(errp, "chardev backend not available"); + goto out_error; } - if (chr == NULL) { - assert(!i); - error_setg(errp, "chardev backend not available"); + chr = cd->create(id, backend, ret, &be_opened, &local_err); + if (local_err) { + error_propagate(errp, local_err); goto out_error; }