All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [RESEND][PATCH][STABLE] Don't set default monitor when there is a mux'ed one
@ 2010-03-07 10:28 Jan Kiszka
  2010-03-08 16:44 ` [Qemu-devel] " Anthony Liguori
  0 siblings, 1 reply; 5+ messages in thread
From: Jan Kiszka @ 2010-03-07 10:28 UTC (permalink / raw)
  To: Anthony Liguori; +Cc: qemu-devel

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

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Qemu-devel] Re: [RESEND][PATCH][STABLE] Don't set default monitor when there is a mux'ed one
  2010-03-07 10:28 [Qemu-devel] [RESEND][PATCH][STABLE] Don't set default monitor when there is a mux'ed one Jan Kiszka
@ 2010-03-08 16:44 ` Anthony Liguori
  2010-03-13 11:05   ` Aurelien Jarno
  0 siblings, 1 reply; 5+ messages in thread
From: Anthony Liguori @ 2010-03-08 16:44 UTC (permalink / raw)
  To: Jan Kiszka; +Cc: Anthony Liguori, qemu-devel

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [Qemu-devel] Re: [RESEND][PATCH][STABLE] Don't set default monitor when there is a mux'ed one
  2010-03-08 16:44 ` [Qemu-devel] " Anthony Liguori
@ 2010-03-13 11:05   ` Aurelien Jarno
  2010-03-13 15:58     ` Jan Kiszka
  0 siblings, 1 reply; 5+ messages in thread
From: Aurelien Jarno @ 2010-03-13 11:05 UTC (permalink / raw)
  To: Anthony Liguori; +Cc: Jan Kiszka, Anthony Liguori, qemu-devel

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?

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Qemu-devel] Re: [RESEND][PATCH][STABLE] Don't set default monitor when there is a mux'ed one
  2010-03-13 11:05   ` Aurelien Jarno
@ 2010-03-13 15:58     ` Jan Kiszka
  2010-03-14 21:44       ` Aurelien Jarno
  0 siblings, 1 reply; 5+ messages in thread
From: Jan Kiszka @ 2010-03-13 15:58 UTC (permalink / raw)
  To: Aurelien Jarno; +Cc: Anthony Liguori, qemu-devel

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

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


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [Qemu-devel] Re: [RESEND][PATCH][STABLE] Don't set default monitor when there is a mux'ed one
  2010-03-13 15:58     ` Jan Kiszka
@ 2010-03-14 21:44       ` Aurelien Jarno
  0 siblings, 0 replies; 5+ messages in thread
From: Aurelien Jarno @ 2010-03-14 21:44 UTC (permalink / raw)
  To: Jan Kiszka; +Cc: Anthony Liguori, qemu-devel

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.

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-03-14 21:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-07 10:28 [Qemu-devel] [RESEND][PATCH][STABLE] Don't set default monitor when there is a mux'ed one Jan Kiszka
2010-03-08 16:44 ` [Qemu-devel] " Anthony Liguori
2010-03-13 11:05   ` Aurelien Jarno
2010-03-13 15:58     ` Jan Kiszka
2010-03-14 21:44       ` Aurelien Jarno

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.