OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

char: move QemuOpts->ChardevBackend translation to a separate func

Browse Source 
parse function will be used by the following patch

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Message-Id: <1499342940-56739-2-git-send-email-anton.nefedov@virtuozzo.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Anton Nefedov 2017-07-06 15:08:48 +03:00 committed by Paolo Bonzini
parent bcdeb9be56
commit 313e45b5fe
1 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
chardev/char.c
View File

@ -556,17 +556,23 @@ help_string_append(const char *name, void *opaque)
g_string_append_printf(str, "\n%s", name); g_string_append_printf(str, "\n%s", name);
} }
Chardev *qemu_chr_new_from_opts(QemuOpts *opts, static const char *chardev_alias_translate(const char *name)
Error **errp) {
int i;
for (i = 0; i < (int)ARRAY_SIZE(chardev_alias_table); i++) {
if (g_strcmp0(chardev_alias_table[i].alias, name) == 0) {
return chardev_alias_table[i].typename;
}
}
return name;
}
static ChardevBackend *qemu_chr_parse_opts(QemuOpts *opts, Error **errp)
{ {
Error *local_err = NULL; Error *local_err = NULL;
const ChardevClass *cc; const ChardevClass *cc;
Chardev *chr;
int i;
ChardevBackend *backend = NULL; ChardevBackend *backend = NULL;
const char *name = qemu_opt_get(opts, "backend"); const char *name = chardev_alias_translate(qemu_opt_get(opts, "backend"));
const char *id = qemu_opts_id(opts);
char *bid = NULL;
if (name == NULL) { if (name == NULL) {
error_setg(errp, "chardev: \"%s\" missing backend", error_setg(errp, "chardev: \"%s\" missing backend",
@ -574,7 +580,40 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts,
return NULL; return NULL;
} }
if (is_help_option(name)) { cc = char_get_class(name, errp);
if (cc == NULL) {
return NULL;
}
backend = g_new0(ChardevBackend, 1);
backend->type = CHARDEV_BACKEND_KIND_NULL;
if (cc->parse) {
cc->parse(opts, backend, &local_err);
if (local_err) {
error_propagate(errp, local_err);
qapi_free_ChardevBackend(backend);
return NULL;
}
} else {
ChardevCommon *ccom = g_new0(ChardevCommon, 1);
qemu_chr_parse_common(opts, ccom);
backend->u.null.data = ccom; /* Any ChardevCommon member would work */
}
return backend;
}
Chardev *qemu_chr_new_from_opts(QemuOpts *opts, Error **errp)
{
const ChardevClass *cc;
Chardev *chr = NULL;
ChardevBackend *backend = NULL;
const char *name = chardev_alias_translate(qemu_opt_get(opts, "backend"));
const char *id = qemu_opts_id(opts);
char *bid = NULL;
if (name && is_help_option(name)) {
GString *str = g_string_new(""); GString *str = g_string_new("");
chardev_name_foreach(help_string_append, str); chardev_name_foreach(help_string_append, str);
@ -589,38 +628,20 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts,
return NULL; return NULL;
} }
for (i = 0; i < (int)ARRAY_SIZE(chardev_alias_table); i++) { backend = qemu_chr_parse_opts(opts, errp);
if (g_strcmp0(chardev_alias_table[i].alias, name) == 0) { if (backend == NULL) {
name = chardev_alias_table[i].typename; return NULL;
break;
}
} }
cc = char_get_class(name, errp); cc = char_get_class(name, errp);
if (cc == NULL) { if (cc == NULL) {
return NULL; goto out;
} }
backend = g_new0(ChardevBackend, 1);
backend->type = CHARDEV_BACKEND_KIND_NULL;
if (qemu_opt_get_bool(opts, "mux", 0)) { if (qemu_opt_get_bool(opts, "mux", 0)) {
bid = g_strdup_printf("%s-base", id); bid = g_strdup_printf("%s-base", id);
} }
chr = NULL;
if (cc->parse) {
cc->parse(opts, backend, &local_err);
if (local_err) {
error_propagate(errp, local_err);
goto out;
}
} else {
ChardevCommon *ccom = g_new0(ChardevCommon, 1);
qemu_chr_parse_common(opts, ccom);
backend->u.null.data = ccom; /* Any ChardevCommon member would work */
}
chr = qemu_chardev_new(bid ? bid : id, chr = qemu_chardev_new(bid ? bid : id,
object_class_get_name(OBJECT_CLASS(cc)), object_class_get_name(OBJECT_CLASS(cc)),
backend, errp); backend, errp);