Patchwork [RESEND,STABLE] Don't set default monitor when there is a mux'ed one

login
register
mail settings
Submitter Jan Kiszka
Date March 7, 2010, 10:28 a.m.
Message ID <4B937FD8.50807@siemens.com>
Download mbox | patch
Permalink /patch/47071/
State New
Headers show

Comments

Jan Kiszka - March 7, 2010, 10:28 a.m.
This fixes eg. "-nographic -serial mon:stdio [-serial ...]".

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 vl.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
Anthony Liguori - March 8, 2010, 4:44 p.m.
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);
>
>
>
Aurelien Jarno - March 13, 2010, 11:05 a.m.
On Mon, Mar 08, 2010 at 10:44:18AM -0600, Anthony Liguori wrote:
> 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.
>

The same problem exists in HEAD. Shouldn't it be applied here too?
Jan Kiszka - March 13, 2010, 3:58 p.m.
Aurelien Jarno wrote:
> On Mon, Mar 08, 2010 at 10:44:18AM -0600, Anthony Liguori wrote:
>> 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.
>>
> 
> The same problem exists in HEAD. Shouldn't it be applied here too?
> 

Of course IMHO (for both of the patches).

I assumed "[STABLE]" means "_also_ to be considered for stable".

Jan
Aurelien Jarno - March 14, 2010, 9:44 p.m.
On Sat, Mar 13, 2010 at 04:58:36PM +0100, Jan Kiszka wrote:
> Aurelien Jarno wrote:
> > On Mon, Mar 08, 2010 at 10:44:18AM -0600, Anthony Liguori wrote:
> >> 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.
> >>
> > 
> > The same problem exists in HEAD. Shouldn't it be applied here too?
> > 
> 
> Of course IMHO (for both of the patches).
> 

I have just applied both of them to HEAD.

Patch

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