[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/49] qemu-char: cleanup qmp_chardev_add
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 23/49] qemu-char: cleanup qmp_chardev_add |
Date: |
Fri, 16 Oct 2015 10:49:45 +0200 |
Use the usual idioms for error propagation.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-char.c | 56 +++++++++++++++++++++++++++++++-------------------------
1 file changed, 31 insertions(+), 25 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 653ea10..f51c0aa 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -4214,6 +4214,7 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
{
ChardevReturn *ret = g_new0(ChardevReturn, 1);
CharDriverState *base, *chr = NULL;
+ Error *local_err = NULL;
chr = qemu_chr_find(id);
if (chr) {
@@ -4224,22 +4225,22 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
switch (backend->kind) {
case CHARDEV_BACKEND_KIND_FILE:
- chr = qmp_chardev_open_file(backend->file, errp);
+ chr = qmp_chardev_open_file(backend->file, &local_err);
break;
case CHARDEV_BACKEND_KIND_SERIAL:
- chr = qmp_chardev_open_serial(backend->serial, errp);
+ chr = qmp_chardev_open_serial(backend->serial, &local_err);
break;
case CHARDEV_BACKEND_KIND_PARALLEL:
- chr = qmp_chardev_open_parallel(backend->parallel, errp);
+ chr = qmp_chardev_open_parallel(backend->parallel, &local_err);
break;
case CHARDEV_BACKEND_KIND_PIPE:
chr = qemu_chr_open_pipe(backend->pipe);
break;
case CHARDEV_BACKEND_KIND_SOCKET:
- chr = qmp_chardev_open_socket(backend->socket, errp);
+ chr = qmp_chardev_open_socket(backend->socket, &local_err);
break;
case CHARDEV_BACKEND_KIND_UDP:
- chr = qmp_chardev_open_udp(backend->udp, errp);
+ chr = qmp_chardev_open_udp(backend->udp, &local_err);
break;
#ifdef HAVE_CHARDEV_TTY
case CHARDEV_BACKEND_KIND_PTY:
@@ -4252,7 +4253,7 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
case CHARDEV_BACKEND_KIND_MUX:
base = qemu_chr_find(backend->mux->chardev);
if (base == NULL) {
- error_setg(errp, "mux: base chardev %s not found",
+ error_setg(&local_err, "mux: base chardev %s not found",
backend->mux->chardev);
break;
}
@@ -4290,11 +4291,11 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
break;
case CHARDEV_BACKEND_KIND_RINGBUF:
case CHARDEV_BACKEND_KIND_MEMORY:
- chr = qemu_chr_open_ringbuf(backend->ringbuf, errp);
+ chr = qemu_chr_open_ringbuf(backend->ringbuf, &local_err);
break;
default:
error_setg(errp, "unknown chardev backend (%d)", backend->kind);
- break;
+ goto out_error;
}
/*
@@ -4303,25 +4304,30 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
* error then.
* TODO full conversion to Error API
*/
- if (chr == NULL && errp && !*errp) {
- error_setg(errp, "Failed to create chardev");
- }
- if (chr) {
- chr->label = g_strdup(id);
- chr->avail_connections =
- (backend->kind == CHARDEV_BACKEND_KIND_MUX) ? MAX_MUX : 1;
- if (!chr->filename) {
- chr->filename = g_strdup(ChardevBackendKind_lookup[backend->kind]);
- }
- if (!chr->explicit_be_open) {
- qemu_chr_be_event(chr, CHR_EVENT_OPENED);
+ if (chr == NULL) {
+ if (local_err) {
+ error_propagate(errp, local_err);
+ } else {
+ error_setg(errp, "Failed to create chardev");
}
- QTAILQ_INSERT_TAIL(&chardevs, chr, next);
- return ret;
- } else {
- g_free(ret);
- return NULL;
+ goto out_error;
+ }
+
+ chr->label = g_strdup(id);
+ chr->avail_connections =
+ (backend->kind == CHARDEV_BACKEND_KIND_MUX) ? MAX_MUX : 1;
+ if (!chr->filename) {
+ chr->filename = g_strdup(ChardevBackendKind_lookup[backend->kind]);
}
+ if (!chr->explicit_be_open) {
+ qemu_chr_be_event(chr, CHR_EVENT_OPENED);
+ }
+ QTAILQ_INSERT_TAIL(&chardevs, chr, next);
+ return ret;
+
+out_error:
+ g_free(ret);
+ return NULL;
}
void qmp_chardev_remove(const char *id, Error **errp)
--
2.5.0
- [Qemu-devel] [PULL 12/49] target-i386/kvm: Hyper-V HV_X64_MSR_VP_RUNTIME support, (continued)
- [Qemu-devel] [PULL 12/49] target-i386/kvm: Hyper-V HV_X64_MSR_VP_RUNTIME support, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 14/49] kvm-all: Align to qemu_real_host_page_size in kvm_set_phys_mem, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 15/49] checkpatch: port fix from kernel "## is not a valid modifier", Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 16/49] MAINTAINERS: add two devices to the e500 section, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 18/49] MAINTAINERS: Add more pxa2xx files and boards, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 19/49] MAINTAINERS: Add maintainer for ARM PrimeCell and integrated devices, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 21/49] qemu-sockets: fix conversion of ipv4/ipv6 JSON to QemuOpts, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 20/49] MAINTAINERS: Add more devices to realview board, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 26/49] qemu-char: convert file backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 25/49] qemu-char: add create to register_char_driver, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 23/49] qemu-char: cleanup qmp_chardev_add,
Paolo Bonzini <=
- [Qemu-devel] [PULL 24/49] qemu-char: cleanup HAVE_CHARDEV_*, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 22/49] README: fill out some useful quickstart information, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 29/49] qemu-char: convert pipe backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 30/49] qemu-char: convert socket backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 28/49] qemu-char: convert parallel backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 32/49] qemu-char: convert pty backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 27/49] qemu-char: convert serial backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 31/49] qemu-char: convert UDP backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 35/49] qemu-char: convert msmouse backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 37/49] qemu-char: convert testdev backend to data-driven creation, Paolo Bonzini, 2015/10/16