From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXLBt-00032I-Jm for qemu-devel@nongnu.org; Mon, 07 Apr 2014 21:51:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WXLBo-0006qj-6f for qemu-devel@nongnu.org; Mon, 07 Apr 2014 21:51:09 -0400 Received: from mail-yh0-f46.google.com ([209.85.213.46]:52040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXLBo-0006pq-2A for qemu-devel@nongnu.org; Mon, 07 Apr 2014 21:51:04 -0400 Received: by mail-yh0-f46.google.com with SMTP id b6so262257yha.19 for ; Mon, 07 Apr 2014 18:51:03 -0700 (PDT) Date: Mon, 7 Apr 2014 22:51:13 -0300 From: Leandro Dorileo Message-ID: <20140408015113.GD11200@dorilex-lnv.MultilaserAP> References: <1396518889-21681-1-git-send-email-cyliu@suse.com> <1396518889-21681-5-git-send-email-cyliu@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1396518889-21681-5-git-send-email-cyliu@suse.com> Subject: Re: [Qemu-devel] [PATCH v24 04/31] QemuOpts: change opt->name|str from (const char *) to (char *) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Chunyan Liu Cc: qemu-devel@nongnu.org, stefanha@redhat.com On Thu, Apr 03, 2014 at 05:54:22PM +0800, Chunyan Liu wrote: > qemu_opt_del() already assumes that all QemuOpt instances contain > malloc'd name and value; but it had to cast away const because > opts_start_struct() was doing its own thing and using static storage > instead. By using the correct type and malloced strings everywhere, the > usage of this struct becomes clearer. > > Signed-off-by: Chunyan Liu Reviewed-by: Leandro Dorileo > --- > Changes: > * Add explaination to this change. > * Remove extra space before char *name, char *str; > > include/qemu/option_int.h | 4 ++-- > qapi/opts-visitor.c | 10 +++++++--- > util/qemu-option.c | 4 ++-- > 3 files changed, 11 insertions(+), 7 deletions(-) > > diff --git a/include/qemu/option_int.h b/include/qemu/option_int.h > index 8212fa4..6432c1a 100644 > --- a/include/qemu/option_int.h > +++ b/include/qemu/option_int.h > @@ -30,8 +30,8 @@ > #include "qemu/error-report.h" > > struct QemuOpt { > - const char *name; > - const char *str; > + char *name; > + char *str; > > const QemuOptDesc *desc; > union { > diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c > index 5d830a2..7a64f4e 100644 > --- a/qapi/opts-visitor.c > +++ b/qapi/opts-visitor.c > @@ -143,8 +143,8 @@ opts_start_struct(Visitor *v, void **obj, const char *kind, > if (ov->opts_root->id != NULL) { > ov->fake_id_opt = g_malloc0(sizeof *ov->fake_id_opt); > > - ov->fake_id_opt->name = "id"; > - ov->fake_id_opt->str = ov->opts_root->id; > + ov->fake_id_opt->name = g_strdup("id"); > + ov->fake_id_opt->str = g_strdup(ov->opts_root->id); > opts_visitor_insert(ov->unprocessed_opts, ov->fake_id_opt); > } > } > @@ -177,7 +177,11 @@ opts_end_struct(Visitor *v, Error **errp) > } > g_hash_table_destroy(ov->unprocessed_opts); > ov->unprocessed_opts = NULL; > - g_free(ov->fake_id_opt); > + if (ov->fake_id_opt) { > + g_free(ov->fake_id_opt->name); > + g_free(ov->fake_id_opt->str); > + g_free(ov->fake_id_opt); > + } > ov->fake_id_opt = NULL; > } > > diff --git a/util/qemu-option.c b/util/qemu-option.c > index d5e80da..eab5102 100644 > --- a/util/qemu-option.c > +++ b/util/qemu-option.c > @@ -664,8 +664,8 @@ static void qemu_opt_parse(QemuOpt *opt, Error **errp) > static void qemu_opt_del(QemuOpt *opt) > { > QTAILQ_REMOVE(&opt->opts->head, opt, next); > - g_free((/* !const */ char*)opt->name); > - g_free((/* !const */ char*)opt->str); > + g_free(opt->name); > + g_free(opt->str); > g_free(opt); > } > > -- > 1.7.12.4 >