[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/3] qemu_chr_new_from_opts: do not overwrite existi
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PATCH 1/3] qemu_chr_new_from_opts: do not overwrite existing chr->filename |
Date: |
Mon, 27 May 2013 19:13:40 +0100 |
Set the new filename only if it hasn't been already set (for example by
qemu_chr_open_pty).
This fixes a regression that prevents Xen HVM domains from booting.
It was introduced by:
commit 2b220025993e76d4116781ca91a4fabc5ad9c722
Author: Lei Li <address@hidden>
Date: Tue May 21 18:27:59 2013 +0800
Signed-off-by: Stefano Stabellini <address@hidden>
---
qemu-char.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 4f8382e..06ffd93 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3276,7 +3276,6 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
ChardevReturn *ret = NULL;
const char *id = qemu_opts_id(opts);
const char *bid = NULL;
- char *filename = g_strdup(qemu_opt_get(opts, "backend"));
if (qemu_opt_get_bool(opts, "mux", 0)) {
bid = g_strdup_printf("%s-base", id);
@@ -3309,7 +3308,9 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
}
chr = qemu_chr_find(id);
- chr->filename = filename;
+ if (!chr->filename) {
+ chr->filename = g_strdup(qemu_opt_get(opts, "backend"));
+ }
qapi_out:
qapi_free_ChardevBackend(backend);
--
1.7.2.5