Skip to contentSkip to conversation

Don't set default monitor when there is a mux'ed one

PATCH RESEND Applied Jan Kiszka 4 participants 5 messages Mar 7, 2010 – Mar 14, 2010

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH RESEND 1/1 Don't set default monitor when there is a mux'ed one

This fixes eg. "-nographic -serial mon:stdio [-serial ...]".

---
 vl.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
vl.c +9 -0
index 10d8e34..bffb796 100644
@@ -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);
#1 lore raw
Quoted 4 lines · Jan Kiszka

This fixes eg. "-nographic -serial mon:stdio [-serial ...]".

Applied to stable.

Regards,

Anthony Liguori

Quoted 38 lines
---
  vl.c |    9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)
vl.c +9 -0
index 10d8e34..bffb796 100644
@@ -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);
#2 lore raw
Quoted 8 lines · Anthony Liguori
Quoted 4 lines · Jan Kiszka

This fixes eg. "-nographic -serial mon:stdio [-serial ...]".

Applied to stable.

The same problem exists in HEAD. Shouldn't it be applied here too?

Signature · 2 lines
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net
#3 lore raw
Quoted 11 lines · Aurelien Jarno
Quoted 7 lines · Anthony Liguori
Quoted 4 lines · Jan Kiszka

This fixes eg. "-nographic -serial mon:stdio [-serial ...]".

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

#4 lore raw
Quoted 7 lines · Jan Kiszka
Quoted 6 lines · Aurelien Jarno
Quoted 5 lines · Anthony Liguori
Quoted 4 lines · Jan Kiszka

This fixes eg. "-nographic -serial mon:stdio [-serial ...]".

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

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.

Signature · 2 lines
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net