From patchwork Tue Apr 22 01:12:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 340987 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id EF5E41400E0 for ; Tue, 22 Apr 2014 13:10:57 +1000 (EST) Received: from localhost ([::1]:52252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcPGt-0003Dr-9Q for incoming@patchwork.ozlabs.org; Mon, 21 Apr 2014 21:13:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcPGV-0002vm-U4 for qemu-devel@nongnu.org; Mon, 21 Apr 2014 21:13:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcPGM-0004vD-QY for qemu-devel@nongnu.org; Mon, 21 Apr 2014 21:12:51 -0400 Received: from mail-pb0-x22a.google.com ([2607:f8b0:400e:c01::22a]:58884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcPGM-0004uh-Hv; Mon, 21 Apr 2014 21:12:42 -0400 Received: by mail-pb0-f42.google.com with SMTP id un15so346051pbc.29 for ; Mon, 21 Apr 2014 18:12:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=I6BCZQ0hotee458tW5kg3Pw1mYEbF9OiHb64/PIZbeE=; b=nakN7+5PQ1TqD3GfBs/0XKit9rq/IS8V2a5FxfjEekO/KuvV85v3FTduKJgB6HQLYb C+TUyxGBUCQ1MU29akrBjWOzwXTrwjALEg+wxNd44ksEEQ3asStm7BywTs0iXd6NJF53 mvlMElBwQP0Vy5gPG2zGa6VGtW1MdOTf2mm6Epwcd0Ef2AJHlp6Ju6i1c1zBcJiBbz0G D4QyolXFdxexlNRqsE6nGnBfHGVxydiBfpDjXicra9XG4zsL307nB035AJB+feFfxSAr ogq57RrA0/CTrqZDCLgmop9Onwnn9k5bK2Rxv3O9qy7oCKQMM/k4kCk3XfgxvLyJocnR YIqQ== X-Received: by 10.68.113.5 with SMTP id iu5mr41129887pbb.60.1398129161020; Mon, 21 Apr 2014 18:12:41 -0700 (PDT) Received: from [192.168.1.104] ([124.126.236.72]) by mx.google.com with ESMTPSA id oa3sm80890273pbb.15.2014.04.21.18.12.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Apr 2014 18:12:40 -0700 (PDT) Message-ID: <5355C202.9040603@gmail.com> Date: Tue, 22 Apr 2014 09:12:34 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Eric Blake , Markus Armbruster , Peter Maydell , Michael Tokarev , Anthony Liguori X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::22a Cc: QEMU Trivial , QEMU Developers Subject: [Qemu-devel] [PATCH trivial v2] vl: avoid closing stdout with 'writeconfig' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 'writeconfig' supports output to stdout (with '-'); when that happens, we must not close stdout, or further command line options that also use stdout will be impacted. (Although 'writeconfig' was copied from 'readconfig', the latter does not have the problem because it does not support reading from '-') Signed-off-by: Chen Gang Reviewed-by: Eric Blake --- vl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 9975e5a..215467f 100644 --- a/vl.c +++ b/vl.c @@ -3855,7 +3855,9 @@ int main(int argc, char **argv, char **envp) } } qemu_config_write(fp); - fclose(fp); + if (fp != stdout) { + fclose(fp); + } break; } case QEMU_OPTION_qtest: