From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <4B4F2F06.2040301@siemens.com> Date: Thu, 14 Jan 2010 15:49:42 +0100 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH][STABLE] Don't set default monitor when there is a mux'ed one List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Gerd Hoffmann , qemu-devel This fixes eg. "-nographic -serial mon:stdio [-serial ...]". Signed-off-by: Jan Kiszka --- 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);