[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/41] char-socket: convert to finalize
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 07/41] char-socket: convert to finalize |
Date: |
Tue, 31 Jan 2017 20:20:48 +0400 |
Notice that finalize() will be run after a failure to open(), so cleanup
code must be adjusted.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
qemu-char.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 1c4fcf3a6e..a00bbb0a1c 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3446,9 +3446,10 @@ int qemu_chr_fe_wait_connected(CharBackend *be, Error
**errp)
return qemu_chr_wait_connected(be->chr, errp);
}
-static void tcp_chr_free(Chardev *chr)
+static void char_socket_finalize(Object *obj)
{
- SocketChardev *s = SOCKET_CHARDEV(chr);
+ Chardev *chr = CHARDEV(obj);
+ SocketChardev *s = SOCKET_CHARDEV(obj);
tcp_chr_free_connection(chr);
@@ -4886,7 +4887,7 @@ static void qmp_chardev_open_socket(Chardev *chr,
s->listen_ioc = sioc;
if (is_waitconnect &&
qemu_chr_wait_connected(chr, errp) < 0) {
- goto error;
+ return;
}
if (!s->ioc) {
s->listen_tag = qio_channel_add_watch(
@@ -4904,9 +4905,6 @@ error:
if (sioc) {
object_unref(OBJECT(sioc));
}
- if (s->tls_creds) {
- object_unref(OBJECT(s->tls_creds));
- }
}
static const CharDriver socket_driver = {
@@ -4928,13 +4926,13 @@ static void char_socket_class_init(ObjectClass *oc,
void *data)
cc->chr_add_client = tcp_chr_add_client;
cc->chr_add_watch = tcp_chr_add_watch;
cc->chr_update_read_handler = tcp_chr_update_read_handler;
- cc->chr_free = tcp_chr_free;
}
static const TypeInfo char_socket_type_info = {
.name = TYPE_CHARDEV_SOCKET,
.parent = TYPE_CHARDEV,
.instance_size = sizeof(SocketChardev),
+ .instance_finalize = char_socket_finalize,
.class_init = char_socket_class_init,
};
--
2.11.0.295.gd7dffce1c.dirty
- [Qemu-devel] [PULL 00/41] Chr split patches, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 01/41] MAINTAINERS: add myself to qemu-char.c, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 02/41] spice-qemu-char: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 03/41] baum: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 04/41] msmouse: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 05/41] mux: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 06/41] char-udp: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 07/41] char-socket: convert to finalize,
Marc-André Lureau <=
- [Qemu-devel] [PULL 08/41] char-pty: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 09/41] char-ringbuf: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 10/41] char-parallel: convert parallel to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 11/41] char-stdio: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 12/41] char-win-stdio: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 13/41] char-win: do not override chr_free, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 14/41] char-win: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 15/41] char-fd: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 16/41] char: remove chr_free, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 18/41] char: rename remaining CharDriver to Chardev, Marc-André Lureau, 2017/01/31