From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYbCI-0000Dz-7x for qemu-devel@nongnu.org; Tue, 31 Jan 2017 11:22:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cYbCH-0000tO-AI for qemu-devel@nongnu.org; Tue, 31 Jan 2017 11:22:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57538) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cYbCH-0000st-4w for qemu-devel@nongnu.org; Tue, 31 Jan 2017 11:22:21 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 31 Jan 2017 20:20:54 +0400 Message-Id: <20170131162122.29408-14-marcandre.lureau@redhat.com> In-Reply-To: <20170131162122.29408-1-marcandre.lureau@redhat.com> References: <20170131162122.29408-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 13/41] char-win: do not override chr_free List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= For some unclear reason to me, char-file does not have chr_free on win32. Since we want to switch to instance finalizer instead of class chr_free, we should be able to run the base WinChardev class finalizer in any case. Use a boolean to skip free to ease the transition to instance finalizer. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake --- qemu-char.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index d92642735e..83636d76c0 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2122,6 +2122,8 @@ typedef struct { =20 /* Protected by the Chardev chr_write_lock. */ OVERLAPPED osend; + /* FIXME: file/console do not finalize */ + bool skip_free; } WinChardev; =20 #define TYPE_CHARDEV_WIN "chardev-win" @@ -2152,6 +2154,10 @@ static void win_chr_free(Chardev *chr) { WinChardev *s =3D WIN_CHARDEV(chr); =20 + if (s->skip_free) { + return; + } + if (s->hsend) { CloseHandle(s->hsend); s->hsend =3D NULL; @@ -2432,6 +2438,7 @@ static void qemu_chr_open_win_file(Chardev *chr, HA= NDLE fd_out) { WinChardev *s =3D WIN_CHARDEV(chr); =20 + s->skip_free =3D true; s->hcom =3D fd_out; } =20 @@ -2468,7 +2475,6 @@ static void char_console_class_init(ObjectClass *oc= , void *data) ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 cc->open =3D qemu_chr_open_win_con; - cc->chr_free =3D NULL; } =20 static const TypeInfo char_console_type_info =3D { @@ -4731,10 +4737,6 @@ static void char_file_class_init(ObjectClass *oc, = void *data) ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 cc->open =3D qmp_chardev_open_file; -#ifdef _WIN32 - /* FIXME: no chr_free */ - cc->chr_free =3D NULL; -#endif } =20 static const TypeInfo char_file_type_info =3D { --=20 2.11.0.295.gd7dffce1c.dirty