diff options
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/baum.c | 5 | ||||
| -rw-r--r-- | backends/msmouse.c | 7 | ||||
| -rw-r--r-- | backends/rng-egd.c | 29 | ||||
| -rw-r--r-- | backends/testdev.c | 5 |
4 files changed, 22 insertions, 24 deletions
diff --git a/backends/baum.c b/backends/baum.c index c537141..919844e 100644 --- a/backends/baum.c +++ b/backends/baum.c @@ -551,7 +551,7 @@ static void baum_chr_read(void *opaque) } } -static void baum_close(struct CharDriverState *chr) +static void baum_free(struct CharDriverState *chr) { BaumDriverState *baum = chr->opaque; @@ -566,6 +566,7 @@ static void baum_close(struct CharDriverState *chr) static CharDriverState *chr_baum_init(const char *id, ChardevBackend *backend, ChardevReturn *ret, + bool *be_opened, Error **errp) { ChardevCommon *common = backend->u.braille.data; @@ -589,7 +590,7 @@ static CharDriverState *chr_baum_init(const char *id, chr->opaque = baum; chr->chr_write = baum_write; chr->chr_accept_input = baum_accept_input; - chr->chr_close = baum_close; + chr->chr_free = baum_free; handle = g_malloc0(brlapi_getHandleSize()); baum->brlapi = handle; diff --git a/backends/msmouse.c b/backends/msmouse.c index 85d08f7..733ca80 100644 --- a/backends/msmouse.c +++ b/backends/msmouse.c @@ -133,7 +133,7 @@ static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf, int return len; } -static void msmouse_chr_close (struct CharDriverState *chr) +static void msmouse_chr_free(struct CharDriverState *chr) { MouseState *mouse = chr->opaque; @@ -151,6 +151,7 @@ static QemuInputHandler msmouse_handler = { static CharDriverState *qemu_chr_open_msmouse(const char *id, ChardevBackend *backend, ChardevReturn *ret, + bool *be_opened, Error **errp) { ChardevCommon *common = backend->u.msmouse.data; @@ -162,9 +163,9 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id, return NULL; } chr->chr_write = msmouse_chr_write; - chr->chr_close = msmouse_chr_close; + chr->chr_free = msmouse_chr_free; chr->chr_accept_input = msmouse_chr_accept_input; - chr->explicit_be_open = true; + *be_opened = false; mouse = g_new0(MouseState, 1); mouse->hs = qemu_input_handler_register((DeviceState *)mouse, diff --git a/backends/rng-egd.c b/backends/rng-egd.c index ba17c07..69c04b1 100644 --- a/backends/rng-egd.c +++ b/backends/rng-egd.c @@ -15,7 +15,6 @@ #include "sysemu/char.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "hw/qdev.h" /* just for DEFINE_PROP_CHR */ #define TYPE_RNG_EGD "rng-egd" #define RNG_EGD(obj) OBJECT_CHECK(RngEgd, (obj), TYPE_RNG_EGD) @@ -24,7 +23,7 @@ typedef struct RngEgd { RngBackend parent; - CharDriverState *chr; + CharBackend chr; char *chr_name; } RngEgd; @@ -43,7 +42,7 @@ static void rng_egd_request_entropy(RngBackend *b, RngRequest *req) /* XXX this blocks entire thread. Rewrite to use * qemu_chr_fe_write and background I/O callbacks */ - qemu_chr_fe_write_all(s->chr, header, sizeof(header)); + qemu_chr_fe_write_all(&s->chr, header, sizeof(header)); size -= len; } @@ -87,6 +86,7 @@ static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size) static void rng_egd_opened(RngBackend *b, Error **errp) { RngEgd *s = RNG_EGD(b); + CharDriverState *chr; if (s->chr_name == NULL) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, @@ -94,21 +94,19 @@ static void rng_egd_opened(RngBackend *b, Error **errp) return; } - s->chr = qemu_chr_find(s->chr_name); - if (s->chr == NULL) { + chr = qemu_chr_find(s->chr_name); + if (chr == NULL) { error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found", s->chr_name); return; } - - if (qemu_chr_fe_claim(s->chr) != 0) { - error_setg(errp, QERR_DEVICE_IN_USE, s->chr_name); + if (!qemu_chr_fe_init(&s->chr, chr, errp)) { return; } /* FIXME we should resubmit pending requests when the CDS reconnects. */ - qemu_chr_add_handlers(s->chr, rng_egd_chr_can_read, rng_egd_chr_read, - NULL, s); + qemu_chr_fe_set_handlers(&s->chr, rng_egd_chr_can_read, + rng_egd_chr_read, NULL, s, NULL, true); } static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp) @@ -127,9 +125,10 @@ static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp) static char *rng_egd_get_chardev(Object *obj, Error **errp) { RngEgd *s = RNG_EGD(obj); + CharDriverState *chr = qemu_chr_fe_get_driver(&s->chr); - if (s->chr && s->chr->label) { - return g_strdup(s->chr->label); + if (chr && chr->label) { + return g_strdup(chr->label); } return NULL; @@ -146,11 +145,7 @@ static void rng_egd_finalize(Object *obj) { RngEgd *s = RNG_EGD(obj); - if (s->chr) { - qemu_chr_add_handlers(s->chr, NULL, NULL, NULL, NULL); - qemu_chr_fe_release(s->chr); - } - + qemu_chr_fe_deinit(&s->chr); g_free(s->chr_name); } diff --git a/backends/testdev.c b/backends/testdev.c index 3ab1c90..60156e3 100644 --- a/backends/testdev.c +++ b/backends/testdev.c @@ -102,7 +102,7 @@ static int testdev_write(CharDriverState *chr, const uint8_t *buf, int len) return orig_len; } -static void testdev_close(struct CharDriverState *chr) +static void testdev_free(struct CharDriverState *chr) { TestdevCharState *testdev = chr->opaque; @@ -112,6 +112,7 @@ static void testdev_close(struct CharDriverState *chr) static CharDriverState *chr_testdev_init(const char *id, ChardevBackend *backend, ChardevReturn *ret, + bool *be_opened, Error **errp) { TestdevCharState *testdev; @@ -122,7 +123,7 @@ static CharDriverState *chr_testdev_init(const char *id, chr->opaque = testdev; chr->chr_write = testdev_write; - chr->chr_close = testdev_close; + chr->chr_free = testdev_free; return chr; } |