From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPBIO-0007H3-Cb for qemu-devel@nongnu.org; Thu, 05 Jan 2017 11:53:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPBIM-0002jL-WF for qemu-devel@nongnu.org; Thu, 05 Jan 2017 11:53:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46882) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cPBIM-0002j1-NB for qemu-devel@nongnu.org; Thu, 05 Jan 2017 11:53:42 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 CEE7A63E01 for ; Thu, 5 Jan 2017 16:53:42 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 5 Jan 2017 17:53:15 +0100 Message-Id: <20170105165329.17227-7-marcandre.lureau@redhat.com> In-Reply-To: <20170105165329.17227-1-marcandre.lureau@redhat.com> References: <20170105165329.17227-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 06/20] char: use a static array for backends List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, eblake@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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=C3=A9 Lureau --- include/sysemu/char.h | 1 + qemu-char.c | 98 ++++++++++++++++++++++++++++++---------------= ------ 2 files changed, 59 insertions(+), 40 deletions(-) diff --git a/include/sysemu/char.h b/include/sysemu/char.h index c05a896578..1b89aedc4a 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -476,6 +476,7 @@ void qemu_chr_set_feature(CharDriverState *chr, QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename)= ; =20 typedef struct CharDriver { + const char *alias; ChardevBackendKind kind; void (*parse)(QemuOpts *opts, ChardevBackend *backend, Error **errp)= ; CharDriverState *(*create)(const char *id, diff --git a/qemu-char.c b/qemu-char.c index 14ab28766c..5897b59c53 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -4094,24 +4094,24 @@ static void qemu_chr_parse_udp(QemuOpts *opts, Ch= ardevBackend *backend, } } =20 -static GSList *backends; +static const CharDriver *backends[CHARDEV_BACKEND_KIND__MAX]; =20 void register_char_driver(const CharDriver *driver) { - /* casting away const */ - backends =3D g_slist_append(backends, (void *)driver); + backends[driver->kind] =3D driver; } =20 CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, Error **errp) { Error *local_err =3D NULL; - CharDriver *cd; + const CharDriver *cd; CharDriverState *chr; - GSList *i; + int i; ChardevReturn *ret =3D NULL; ChardevBackend *backend; const char *id =3D qemu_opts_id(opts); + const char *name =3D qemu_opt_get(opts, "backend"); char *bid =3D NULL; =20 if (qemu_opt_get(opts, "backend") =3D=3D NULL) { @@ -4122,9 +4122,14 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *= opts, =20 if (is_help_option(qemu_opt_get(opts, "backend"))) { fprintf(stderr, "Available chardev backend types:\n"); - for (i =3D backends; i; i =3D i->next) { - cd =3D i->data; - fprintf(stderr, "%s\n", ChardevBackendKind_lookup[cd->kind])= ; + for (i =3D 0; i < ARRAY_SIZE(backends); i++) { + cd =3D backends[i]; + if (cd) { + fprintf(stderr, "%s\n", ChardevBackendKind_lookup[cd->ki= nd]); + if (cd->alias) { + fprintf(stderr, "%s\n", cd->alias); + } + } } exit(!is_help_option(qemu_opt_get(opts, "backend"))); } @@ -4134,17 +4139,20 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts = *opts, goto err; } =20 - for (i =3D backends; i; i =3D i->next) { - cd =3D i->data; + cd =3D NULL; + for (i =3D 0; i < ARRAY_SIZE(backends); i++) { + cd =3D backends[i]; =20 - if (strcmp(ChardevBackendKind_lookup[cd->kind], - qemu_opt_get(opts, "backend")) =3D=3D 0) { + if (!cd) { + continue; + } + if (g_str_equal(ChardevBackendKind_lookup[cd->kind], name) || + (g_strcmp0(cd->alias, name) =3D=3D 0)) { break; } } - if (i =3D=3D NULL) { - error_setg(errp, "chardev: backend \"%s\" not found", - qemu_opt_get(opts, "backend")); + if (cd =3D=3D NULL || i >=3D ARRAY_SIZE(backends)) { + error_setg(errp, "chardev: backend \"%s\" not found", name); goto err; } =20 @@ -4347,20 +4355,35 @@ ChardevInfoList *qmp_query_chardev(Error **errp) return chr_list; } =20 +static ChardevBackendInfoList * +qmp_prepend_backend(ChardevBackendInfoList *list, const CharDriver *c, + const char *name) +{ + ChardevBackendInfoList *info =3D g_malloc0(sizeof(*info)); + info->value =3D g_malloc0(sizeof(*info->value)); + info->value->name =3D g_strdup(name); + info->next =3D list; + return info; + +} + ChardevBackendInfoList *qmp_query_chardev_backends(Error **errp) { ChardevBackendInfoList *backend_list =3D NULL; - CharDriver *c =3D NULL; - GSList *i =3D NULL; + const CharDriver *c; + int i; =20 - for (i =3D backends; i; i =3D i->next) { - ChardevBackendInfoList *info =3D g_malloc0(sizeof(*info)); - c =3D i->data; - info->value =3D g_malloc0(sizeof(*info->value)); - info->value->name =3D g_strdup(ChardevBackendKind_lookup[c->kind= ]); + for (i =3D 0; i < ARRAY_SIZE(backends); i++) { + c =3D backends[i]; + if (!c) { + continue; + } =20 - info->next =3D backend_list; - backend_list =3D info; + backend_list =3D qmp_prepend_backend(backend_list, c, + ChardevBackendKind_lookup[c->= kind]); + if (c->alias) { + backend_list =3D qmp_prepend_backend(backend_list, c, c->ali= as); + } } =20 return backend_list; @@ -4816,9 +4839,8 @@ ChardevReturn *qmp_chardev_add(const char *id, Char= devBackend *backend, { ChardevReturn *ret =3D g_new0(ChardevReturn, 1); CharDriverState *chr =3D NULL; + const CharDriver *cd; Error *local_err =3D NULL; - GSList *i; - CharDriver *cd; bool be_opened =3D true; =20 chr =3D qemu_chr_find(id); @@ -4827,22 +4849,16 @@ ChardevReturn *qmp_chardev_add(const char *id, Ch= ardevBackend *backend, goto out_error; } =20 - for (i =3D backends; i; i =3D i->next) { - cd =3D i->data; - - if (cd->kind =3D=3D backend->type) { - chr =3D cd->create(id, backend, ret, &be_opened, &local_err)= ; - if (local_err) { - error_propagate(errp, local_err); - goto out_error; - } - break; - } + cd =3D (int)backend->type >=3D 0 && backend->type < ARRAY_SIZE(backe= nds) ? + backends[backend->type] : NULL; + if (cd =3D=3D NULL) { + error_setg(errp, "chardev backend not available"); + goto out_error; } =20 - if (chr =3D=3D NULL) { - assert(!i); - error_setg(errp, "chardev backend not available"); + chr =3D cd->create(id, backend, ret, &be_opened, &local_err); + if (local_err) { + error_propagate(errp, local_err); goto out_error; } =20 @@ -4927,6 +4943,7 @@ static void register_types(void) #if defined HAVE_CHARDEV_SERIAL { .kind =3D CHARDEV_BACKEND_KIND_SERIAL, + .alias =3D "tty", .parse =3D qemu_chr_parse_serial, .create =3D qmp_chardev_open_serial, }, @@ -4939,6 +4956,7 @@ static void register_types(void) #ifdef HAVE_CHARDEV_PARPORT { .kind =3D CHARDEV_BACKEND_KIND_PARALLEL, + .alias =3D "parport", .parse =3D qemu_chr_parse_parallel, .create =3D qmp_chardev_open_parallel, }, --=20 2.11.0