[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/20] char: use a static array for backends
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 06/20] char: use a static array for backends |
Date: |
Tue, 10 Jan 2017 18:47:56 +0100 |
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 <address@hidden>
---
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;
}
--
2.11.0
- [Qemu-devel] [PATCH v2 00/20] chardev: qom-ify, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 02/20] qemu-options: stdio is available on win32, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 01/20] tests: fix linking test-char on win32, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 03/20] char: add qemu_chr_fe_add_watch() Returns description, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 04/20] doc: fix spelling, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 05/20] char: use a const CharDriver, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 06/20] char: use a static array for backends,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 08/20] char: fold single-user functions in caller, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 09/20] char: introduce generic qemu_chr_get_kind(), Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 10/20] char: use a feature bit for replay, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 07/20] char: move callbacks in CharDriver, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 12/20] bt: use qemu_chr_alloc(), Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 14/20] char: rename TCPChardev and NetChardev, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 15/20] spice-char: improve error reporting, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 11/20] char: allocate CharDriverState as a single object, Marc-André Lureau, 2017/01/10
- [Qemu-devel] [PATCH v2 18/20] baum: use a common prefix for chr callbacks, Marc-André Lureau, 2017/01/10