From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NogB5-0002km-2X
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 11:51:35 -0500
Received: from [199.232.76.173] (port=35881 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NogAz-0002gn-QJ
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 11:51:29 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <anthony@codemonkey.ws>) id 1Nog4B-0007j9-UE
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 11:44:29 -0500
Received: from mail-ww0-f45.google.com ([74.125.82.45]:47730)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1Nog4B-0007it-Jd
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 11:44:27 -0500
Received: by wwb34 with SMTP id 34so3152602wwb.4
	for <qemu-devel@nongnu.org>; Mon, 08 Mar 2010 08:44:25 -0800 (PST)
Message-ID: <4B952962.1090101@codemonkey.ws>
Date: Mon, 08 Mar 2010 10:44:18 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <4B937FD8.50807@siemens.com>
In-Reply-To: <4B937FD8.50807@siemens.com>
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [RESEND][PATCH][STABLE] Don't set default monitor
 when there is a mux'ed one
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>, qemu-devel <qemu-devel@nongnu.org>

On 03/07/2010 04:28 AM, Jan Kiszka wrote:
> This fixes eg. "-nographic -serial mon:stdio [-serial ...]".
>
> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
>    

Applied to stable.

Regards,

Anthony Liguori

> ---
>   vl.c |    9 +++++++++
>   1 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 10d8e34..bffb796 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -5369,6 +5369,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) {
> @@ -5387,10 +5390,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);
>
>
>