From 82878dac6fcd16cb4fa47266bcd3dd03df436dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Sat, 22 Oct 2016 13:09:43 +0300 Subject: char: remove explicit_be_open from CharDriverState MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's only used in qmp_chardev_add(), so use a create() argument instead. Also switched to typedef functions for CharDriverParse/CharDriverCreate. Signed-off-by: Marc-André Lureau Message-Id: <20161022100951.19562-7-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- backends/baum.c | 1 + backends/msmouse.c | 3 ++- backends/testdev.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'backends') diff --git a/backends/baum.c b/backends/baum.c index a516434..919844e 100644 --- a/backends/baum.c +++ b/backends/baum.c @@ -566,6 +566,7 @@ static void baum_free(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; diff --git a/backends/msmouse.c b/backends/msmouse.c index 448369f..733ca80 100644 --- a/backends/msmouse.c +++ b/backends/msmouse.c @@ -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; @@ -164,7 +165,7 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id, chr->chr_write = msmouse_chr_write; 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/testdev.c b/backends/testdev.c index 1ba8bf2..60156e3 100644 --- a/backends/testdev.c +++ b/backends/testdev.c @@ -112,6 +112,7 @@ static void testdev_free(struct CharDriverState *chr) static CharDriverState *chr_testdev_init(const char *id, ChardevBackend *backend, ChardevReturn *ret, + bool *be_opened, Error **errp) { TestdevCharState *testdev; -- cgit v1.1