[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/3] chardev: fix QemuOpts lifecycle
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 2/3] chardev: fix QemuOpts lifecycle |
Date: |
Fri, 14 Dec 2012 10:38:02 +0100 |
qemu_chr_new_from_opts handles QemuOpts release now, so callers don't
have to worry. It will either be saved in CharDriverState, then
released in qemu_chr_delete, or in the error case released instantly.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qemu-char.c | 15 ++++++++++-----
qemu-char.h | 1 +
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 5b91228..876714f 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2774,13 +2774,13 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
if (qemu_opts_id(opts) == NULL) {
error_setg(errp, "chardev: no id specified\n");
- return NULL;
+ goto err;
}
if (qemu_opt_get(opts, "backend") == NULL) {
error_setg(errp, "chardev: \"%s\" missing backend\n",
qemu_opts_id(opts));
- return NULL;
+ goto err;
}
for (i = 0; i < ARRAY_SIZE(backend_table); i++) {
if (strcmp(backend_table[i].name, qemu_opt_get(opts, "backend")) == 0)
@@ -2789,14 +2789,14 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
if (i == ARRAY_SIZE(backend_table)) {
error_setg(errp, "chardev: backend \"%s\" not found\n",
qemu_opt_get(opts, "backend"));
- return NULL;
+ goto err;
}
chr = backend_table[i].open(opts);
if (!chr) {
error_setg(errp, "chardev: opening backend \"%s\" failed\n",
qemu_opt_get(opts, "backend"));
- return NULL;
+ goto err;
}
if (!chr->filename)
@@ -2817,7 +2817,12 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
chr->avail_connections = 1;
}
chr->label = g_strdup(qemu_opts_id(opts));
+ chr->opts = opts;
return chr;
+
+err:
+ qemu_opts_del(opts);
+ return NULL;
}
CharDriverState *qemu_chr_new(const char *label, const char *filename, void
(*init)(struct CharDriverState *s))
@@ -2843,7 +2848,6 @@ CharDriverState *qemu_chr_new(const char *label, const
char *filename, void (*in
if (chr && qemu_opt_get_bool(opts, "mux", 0)) {
monitor_init(chr, MONITOR_USE_READLINE);
}
- qemu_opts_del(opts);
return chr;
}
@@ -2875,6 +2879,7 @@ void qemu_chr_delete(CharDriverState *chr)
chr->chr_close(chr);
g_free(chr->filename);
g_free(chr->label);
+ qemu_opts_del(chr->opts);
g_free(chr);
}
diff --git a/qemu-char.h b/qemu-char.h
index d7eed34..f984071 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -75,6 +75,7 @@ struct CharDriverState {
char *filename;
int opened;
int avail_connections;
+ QemuOpts *opts;
QTAILQ_ENTRY(CharDriverState) next;
};
--
1.7.1
- [Qemu-devel] [PATCH RESENT 0/3] chardev hotplug patch series, Gerd Hoffmann, 2012/12/14
- [Qemu-devel] [PATCH 2/3] chardev: fix QemuOpts lifecycle,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 1/3] chardev: add error reporting for qemu_chr_new_from_opts, Gerd Hoffmann, 2012/12/14
- [Qemu-devel] [PATCH 3/3] chardev: add hotplug support., Gerd Hoffmann, 2012/12/14
- Re: [Qemu-devel] [PATCH 3/3] chardev: add hotplug support., Paolo Bonzini, 2012/12/14
- Re: [Qemu-devel] [PATCH 3/3] chardev: add hotplug support., Eric Blake, 2012/12/14
- Re: [Qemu-devel] [PATCH 3/3] chardev: add hotplug support., Gerd Hoffmann, 2012/12/14
- Re: [Qemu-devel] [PATCH 3/3] chardev: add hotplug support., Paolo Bonzini, 2012/12/14
- Re: [Qemu-devel] [PATCH 3/3] chardev: add hotplug support., Gerd Hoffmann, 2012/12/14
- Re: [Qemu-devel] [PATCH 3/3] chardev: add hotplug support., Gerd Hoffmann, 2012/12/14
- Re: [Qemu-devel] [PATCH 3/3] chardev: add hotplug support., Paolo Bonzini, 2012/12/14