From patchwork Wed Nov 1 14:25:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ross Lagerwall X-Patchwork-Id: 10036433 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B86E7603B5 for ; Wed, 1 Nov 2017 14:30:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B67A328BB9 for ; Wed, 1 Nov 2017 14:30:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB6D628BE0; Wed, 1 Nov 2017 14:30:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1C4AF28BD7 for ; Wed, 1 Nov 2017 14:30:57 +0000 (UTC) Received: from localhost ([::1]:56086 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9u2h-0005Wo-CR for patchwork-qemu-devel@patchwork.kernel.org; Wed, 01 Nov 2017 10:30:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9u1f-0005WP-9f for qemu-devel@nongnu.org; Wed, 01 Nov 2017 10:29:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e9u1b-00084L-Ck for qemu-devel@nongnu.org; Wed, 01 Nov 2017 10:29:51 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:12847) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1e9u1b-00081x-4L for qemu-devel@nongnu.org; Wed, 01 Nov 2017 10:29:47 -0400 X-IronPort-AV: E=Sophos;i="5.44,329,1505779200"; d="scan'208";a="457268872" From: Ross Lagerwall To: Date: Wed, 1 Nov 2017 14:25:25 +0000 Message-ID: <20171101142526.1006-4-ross.lagerwall@citrix.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171101142526.1006-1-ross.lagerwall@citrix.com> References: <20171101142526.1006-1-ross.lagerwall@citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Subject: [Qemu-devel] [PATCH v2 3/4] io: Don't call close multiple times in QIOChannelFile 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: Ross Lagerwall Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP If the file descriptor underlying QIOChannelFile is closed in the io_close() method, don't close it again in the finalize() method since the file descriptor number may have been reused in the meantime. Signed-off-by: Ross Lagerwall Reviewed-by: Marc-André Lureau Reviewed-by: Daniel P. Berrange --- New in v2. io/channel-file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/io/channel-file.c b/io/channel-file.c index 16bf7ed..1f2f710 100644 --- a/io/channel-file.c +++ b/io/channel-file.c @@ -178,6 +178,7 @@ static int qio_channel_file_close(QIOChannel *ioc, "Unable to close file"); return -1; } + fioc->fd = -1; return 0; }