commit 140e065d72a2301b0b5f769be664e10ebe223888
author Jan Kiszka <jan.kiszka@siemens.com> Tue Apr 06 16:55:52 2010 +0200
committer Luiz Capitulino <lcapitulino@redhat.com> Mon Apr 26 16:36:31 2010 -0300
tree bf6c8e782851c263600fc347a5aaf4948631fa53
parent 0e8d2b5575938b8876a3c4bb66ee13c5d306fb6d

monitor: Cleanup ID assignment for compat switch

Canonicalize the ID assignment when creating monitor devices via the
legacy switch and use less easily colliding names.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

vl.c

diff --git a/vl.c b/vl.c
index 9ef6f2c..20d24be 100644
--- a/vl.c
+++ b/vl.c
@@ -2348,11 +2348,9 @@
     if (strstart(optarg, "chardev:", &p)) {
         snprintf(label, sizeof(label), "%s", p);
     } else {
-        if (monitor_device_index) {
-            snprintf(label, sizeof(label), "monitor%d",
-                     monitor_device_index);
-        } else {
-            snprintf(label, sizeof(label), "monitor");
+        snprintf(label, sizeof(label), "compat_monitor%d",
+                 monitor_device_index);
+        if (monitor_device_index == 0) {
             def = 1;
         }
         opts = qemu_chr_parse_compat(label, optarg);