From patchwork Thu Jan 14 14:49:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 42895 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F1C51B7CE6 for ; Fri, 15 Jan 2010 01:59:23 +1100 (EST) Received: from localhost ([127.0.0.1]:41419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVRAE-0006do-FC for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2010 09:59:10 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVR1M-0002Ot-C0 for qemu-devel@nongnu.org; Thu, 14 Jan 2010 09:50:00 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVR1H-0002MR-Et for qemu-devel@nongnu.org; Thu, 14 Jan 2010 09:49:59 -0500 Received: from [199.232.76.173] (port=47585 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVR1H-0002MD-3U for qemu-devel@nongnu.org; Thu, 14 Jan 2010 09:49:55 -0500 Received: from thoth.sbs.de ([192.35.17.2]:20505) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NVR1F-0003Pm-HF for qemu-devel@nongnu.org; Thu, 14 Jan 2010 09:49:54 -0500 Received: from mail2.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id o0EEnjHF031532; Thu, 14 Jan 2010 15:49:46 +0100 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o0EEngAT014252; Thu, 14 Jan 2010 15:49:45 +0100 Message-ID: <4B4F2F06.2040301@siemens.com> Date: Thu, 14 Jan 2010 15:49:42 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Anthony Liguori X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: Gerd Hoffmann , qemu-devel Subject: [Qemu-devel] [PATCH][STABLE] Don't set default monitor when there is a mux'ed one X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This fixes eg. "-nographic -serial mon:stdio [-serial ...]". Signed-off-by: Jan Kiszka Acked-by: Gerd Hoffmann --- vl.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/vl.c b/vl.c index 06cb40d..fa3e8ee 100644 --- a/vl.c +++ b/vl.c @@ -5171,6 +5171,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_serial: add_device_config(DEV_SERIAL, optarg); default_serial = 0; + if (strncmp(optarg, "mon:", 4) == 0) { + default_monitor = 0; + } break; case QEMU_OPTION_watchdog: if (watchdog) { @@ -5189,10 +5192,16 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_virtiocon: add_device_config(DEV_VIRTCON, optarg); default_virtcon = 0; + if (strncmp(optarg, "mon:", 4) == 0) { + default_monitor = 0; + } break; case QEMU_OPTION_parallel: add_device_config(DEV_PARALLEL, optarg); default_parallel = 0; + if (strncmp(optarg, "mon:", 4) == 0) { + default_monitor = 0; + } break; case QEMU_OPTION_debugcon: add_device_config(DEV_DEBUGCON, optarg);