[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 43/49] qemu-char: cleanup after completed conversion
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 43/49] qemu-char: cleanup after completed conversion to cd->create |
Date: |
Fri, 16 Oct 2015 10:50:05 +0200 |
All backends now return errors through Error*, so the "Failed to
create chardev" placeholder error can only be reached if the backend
is not available (and only from the chardev-add QMP command; instead,
the -chardev command line option fails earlier).
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-char.c | 80 ++++---------------------------------------------------------
1 file changed, 4 insertions(+), 76 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 370060d..a0caca3 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -4308,7 +4308,7 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
for (i = backends; i; i = i->next) {
cd = i->data;
- if (cd->kind == backend->kind && cd->create) {
+ if (cd->kind == backend->kind) {
chr = cd->create(id, backend, ret, &local_err);
if (local_err) {
error_propagate(errp, local_err);
@@ -4319,81 +4319,9 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
}
if (chr == NULL) {
- switch (backend->kind) {
- case CHARDEV_BACKEND_KIND_FILE:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_SERIAL:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_PARALLEL:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_PIPE:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_SOCKET:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_UDP:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_PTY:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_NULL:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_MUX:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_MSMOUSE:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_BRAILLE:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_TESTDEV:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_STDIO:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_CONSOLE:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_SPICEVMC:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_SPICEPORT:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_VC:
- abort();
- break;
- case CHARDEV_BACKEND_KIND_RINGBUF:
- case CHARDEV_BACKEND_KIND_MEMORY:
- abort();
- break;
- default:
- error_setg(errp, "unknown chardev backend (%d)", backend->kind);
- goto out_error;
- }
-
- /*
- * Character backend open hasn't been fully converted to the Error
- * API. Some opens fail without setting an error. Set a generic
- * error then.
- * TODO full conversion to Error API
- */
- if (chr == NULL) {
- if (local_err) {
- error_propagate(errp, local_err);
- } else {
- error_setg(errp, "Failed to create chardev");
- }
- goto out_error;
- }
+ assert(!i);
+ error_setg(errp, "chardev backend not available");
+ goto out_error;
}
chr->label = g_strdup(id);
--
2.5.0
- [Qemu-devel] [PULL 29/49] qemu-char: convert pipe backend to data-driven creation, (continued)
- [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
- [Qemu-devel] [PULL 33/49] qemu-char: convert null backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 34/49] qemu-char: convert mux backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 43/49] qemu-char: cleanup after completed conversion to cd->create,
Paolo Bonzini <=
- [Qemu-devel] [PULL 40/49] qemu-char: convert spice backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 41/49] qemu-char: convert vc backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 36/49] qemu-char: convert braille backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 38/49] qemu-char: convert stdio backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 39/49] qemu-char: convert console backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 42/49] qemu-char: convert ringbuf backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 44/49] doc/rcu: fix g_free_rcu() usage example, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 48/49] kvm: Move x86-specific functions into target-i386/kvm.c, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 45/49] kvm: Make KVM_CAP_SIGNAL_MSI globally available, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 46/49] hw/pci: Introduce pci_requester_id(), Paolo Bonzini, 2015/10/16