[Qemu-devel] Re: [RESEND][PATCH][STABLE] Don't set default monitor when there is a mux'ed one

[Anthony Liguori <anthony@codemonkey.ws>]

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);
>
>
>