From nobody Tue Feb 10 10:19:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494329906700450.41893884405897; Tue, 9 May 2017 04:38:26 -0700 (PDT) Received: from localhost ([::1]:36573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d83TB-0008K8-4H for importer@patchew.org; Tue, 09 May 2017 07:38:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d83Pc-0005IQ-Jj for qemu-devel@nongnu.org; Tue, 09 May 2017 07:34:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d83PY-0002bA-JU for qemu-devel@nongnu.org; Tue, 09 May 2017 07:34:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45774) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d83PY-0002Zo-AF for qemu-devel@nongnu.org; Tue, 09 May 2017 07:34:36 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 48BFF3DE42 for ; Tue, 9 May 2017 11:34:35 +0000 (UTC) Received: from localhost (ovpn-112-26.ams2.redhat.com [10.36.112.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBB0B83DBC; Tue, 9 May 2017 11:34:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 48BFF3DE42 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=marcandre.lureau@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 48BFF3DE42 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 9 May 2017 15:33:24 +0400 Message-Id: <20170509113332.4987-6-marcandre.lureau@redhat.com> In-Reply-To: <20170509113332.4987-1-marcandre.lureau@redhat.com> References: <20170509113332.4987-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 09 May 2017 11:34:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 05/13] char-win: close file handle except with console X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Only the console handle shouldn't be closed, however, the "file" handle should. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- chardev/char-win.h | 5 ++--- chardev/char-console.c | 2 +- chardev/char-file.c | 2 +- chardev/char-win.c | 12 ++++-------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/chardev/char-win.h b/chardev/char-win.h index 888be2b3ca..9ed2ba998a 100644 --- a/chardev/char-win.h +++ b/chardev/char-win.h @@ -29,14 +29,13 @@ typedef struct { Chardev parent; =20 + bool dont_close; /* console do not close file */ HANDLE file, hrecv, hsend; OVERLAPPED orecv; BOOL fpipe; =20 /* Protected by the Chardev chr_write_lock. */ OVERLAPPED osend; - /* FIXME: file/console do not finalize */ - bool skip_free; } WinChardev; =20 #define NSENDBUF 2048 @@ -45,7 +44,7 @@ typedef struct { #define TYPE_CHARDEV_WIN "chardev-win" #define WIN_CHARDEV(obj) OBJECT_CHECK(WinChardev, (obj), TYPE_CHARDEV_WIN) =20 -void qemu_chr_open_win_file(Chardev *chr, HANDLE fd_out); +void win_chr_set_file(Chardev *chr, HANDLE file, bool dont_close); int win_chr_serial_init(Chardev *chr, const char *filename, Error **errp); int win_chr_pipe_poll(void *opaque); =20 diff --git a/chardev/char-console.c b/chardev/char-console.c index c824937fe6..8d972c1506 100644 --- a/chardev/char-console.c +++ b/chardev/char-console.c @@ -29,7 +29,7 @@ static void qemu_chr_open_win_con(Chardev *chr, bool *be_opened, Error **errp) { - qemu_chr_open_win_file(chr, GetStdHandle(STD_OUTPUT_HANDLE)); + win_chr_set_file(chr, GetStdHandle(STD_OUTPUT_HANDLE), true); } =20 static void char_console_class_init(ObjectClass *oc, void *data) diff --git a/chardev/char-file.c b/chardev/char-file.c index 8bae25350d..aed4ae1569 100644 --- a/chardev/char-file.c +++ b/chardev/char-file.c @@ -65,7 +65,7 @@ static void qmp_chardev_open_file(Chardev *chr, return; } =20 - qemu_chr_open_win_file(chr, out); + win_chr_set_file(chr, out, false); #else int flags, in =3D -1, out; =20 diff --git a/chardev/char-win.c b/chardev/char-win.c index a7e3296909..24cf364947 100644 --- a/chardev/char-win.c +++ b/chardev/char-win.c @@ -192,17 +192,13 @@ static void char_win_finalize(Object *obj) Chardev *chr =3D CHARDEV(obj); WinChardev *s =3D WIN_CHARDEV(chr); =20 - if (s->skip_free) { - return; - } - if (s->hsend) { CloseHandle(s->hsend); } if (s->hrecv) { CloseHandle(s->hrecv); } - if (s->file) { + if (!s->dont_close && s->file) { CloseHandle(s->file); } if (s->fpipe) { @@ -214,12 +210,12 @@ static void char_win_finalize(Object *obj) qemu_chr_be_event(chr, CHR_EVENT_CLOSED); } =20 -void qemu_chr_open_win_file(Chardev *chr, HANDLE fd_out) +void win_chr_set_file(Chardev *chr, HANDLE file, bool dont_close) { WinChardev *s =3D WIN_CHARDEV(chr); =20 - s->skip_free =3D true; - s->file =3D fd_out; + s->dont_close =3D dont_close; + s->file =3D file; } =20 static void char_win_class_init(ObjectClass *oc, void *data) --=20 2.13.0.rc1.16.gd80b50c3f