[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/40] char-win: convert to finalize
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 13/40] char-win: convert to finalize |
Date: |
Wed, 11 Jan 2017 18:29:29 +0100 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
qemu-char.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 1954dec9b8..4cbcc29bd5 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2150,8 +2150,9 @@ typedef struct {
static int win_chr_poll(void *opaque);
static int win_chr_pipe_poll(void *opaque);
-static void win_chr_free(Chardev *chr)
+static void char_win_finalize(Object *obj)
{
+ Chardev *chr = CHARDEV(obj);
WinChardev *s = WIN_CHARDEV(chr);
if (s->skip_free) {
@@ -2160,15 +2161,12 @@ static void win_chr_free(Chardev *chr)
if (s->hsend) {
CloseHandle(s->hsend);
- s->hsend = NULL;
}
if (s->hrecv) {
CloseHandle(s->hrecv);
- s->hrecv = NULL;
}
if (s->hcom) {
CloseHandle(s->hcom);
- s->hcom = NULL;
}
if (s->fpipe)
qemu_del_polling_cb(win_chr_pipe_poll, chr);
@@ -2241,7 +2239,6 @@ static int win_chr_init(Chardev *chr, const char
*filename, Error **errp)
return 0;
fail:
- win_chr_free(chr);
return -1;
}
@@ -2416,7 +2413,6 @@ static int win_chr_pipe_init(Chardev *chr, const char
*filename,
return 0;
fail:
- win_chr_free(chr);
return -1;
}
@@ -2447,13 +2443,13 @@ static void char_win_class_init(ObjectClass *oc, void
*data)
ChardevClass *cc = CHARDEV_CLASS(oc);
cc->chr_write = win_chr_write;
- cc->chr_free = win_chr_free;
}
static const TypeInfo char_win_type_info = {
.name = TYPE_CHARDEV_WIN,
.parent = TYPE_CHARDEV,
.instance_size = sizeof(WinChardev),
+ .instance_finalize = char_win_finalize,
.class_init = char_win_class_init,
.abstract = true,
};
--
2.11.0
- [Qemu-devel] [PATCH 02/40] baum: convert to finalize, (continued)
- [Qemu-devel] [PATCH 02/40] baum: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 03/40] msmouse: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 04/40] mux: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 05/40] char-udp: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 07/40] char-pty: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 06/40] char-socket: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 08/40] char-ringbuf: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 10/40] char-stdio: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 09/40] char-parallel: convert parallel to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 13/40] char-win: convert to finalize,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 11/40] char-win-stdio: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 14/40] char-fd: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 12/40] char-win: do not override chr_free, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 15/40] char: remove chr_free, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 16/40] char: get rid of CharDriver, Marc-André Lureau, 2017/01/11