diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2015-09-29 15:31:26 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-10-19 10:05:50 +0200 |
commit | e47666b8d1f0a7043d53671587058b3ce539b09d (patch) | |
tree | 9b6301168c30d99a849a1071e291ac8eaf5f5a6f /backends | |
parent | 96d885b93b47243d2fc6ee826abaa8c0017282c9 (diff) | |
download | qemu-e47666b8d1f0a7043d53671587058b3ce539b09d.zip qemu-e47666b8d1f0a7043d53671587058b3ce539b09d.tar.gz qemu-e47666b8d1f0a7043d53671587058b3ce539b09d.tar.bz2 |
qemu-char: convert braille backend to data-driven creation
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'backends')
-rw-r--r-- | backends/baum.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/backends/baum.c b/backends/baum.c index e86a019..723c658 100644 --- a/backends/baum.c +++ b/backends/baum.c @@ -561,7 +561,10 @@ static void baum_close(struct CharDriverState *chr) g_free(baum); } -CharDriverState *chr_baum_init(void) +static CharDriverState *chr_baum_init(const char *id, + ChardevBackend *backend, + ChardevReturn *ret, + Error **errp) { BaumDriverState *baum; CharDriverState *chr; @@ -586,14 +589,16 @@ CharDriverState *chr_baum_init(void) baum->brlapi_fd = brlapi__openConnection(handle, NULL, NULL); if (baum->brlapi_fd == -1) { - brlapi_perror("baum_init: brlapi_openConnection"); + error_setg(errp, "brlapi__openConnection: %s", + brlapi_strerror(brlapi_error_location())); goto fail_handle; } baum->cellCount_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, baum_cellCount_timer_cb, baum); if (brlapi__getDisplaySize(handle, &baum->x, &baum->y) == -1) { - brlapi_perror("baum_init: brlapi_getDisplaySize"); + error_setg(errp, "brlapi__getDisplaySize: %s", + brlapi_strerror(brlapi_error_location())); goto fail; } @@ -609,7 +614,8 @@ CharDriverState *chr_baum_init(void) tty = BRLAPI_TTY_DEFAULT; if (brlapi__enterTtyMode(handle, tty, NULL) == -1) { - brlapi_perror("baum_init: brlapi_enterTtyMode"); + error_setg(errp, "brlapi__enterTtyMode: %s", + brlapi_strerror(brlapi_error_location())); goto fail; } @@ -630,7 +636,7 @@ fail_handle: static void register_types(void) { register_char_driver("braille", CHARDEV_BACKEND_KIND_BRAILLE, NULL, - NULL); + chr_baum_init); } type_init(register_types); |