[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/3] monitor: Cleanup ID assignment for compat switc
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 1/3] monitor: Cleanup ID assignment for compat switch |
Date: |
Tue, 6 Apr 2010 16:55:52 +0200 |
Canonicalize the ID assignment when creating monitor devices via the
legacy switch and use less easily colliding names.
Signed-off-by: Jan Kiszka <address@hidden>
---
vl.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/vl.c b/vl.c
index 6768cf1..bda5f1e 100644
--- a/vl.c
+++ b/vl.c
@@ -2418,11 +2418,9 @@ static void monitor_parse(const char *optarg, const char
*mode)
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);
--
1.6.0.2