From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SowO1-0001Cp-1i for qemu-devel@nongnu.org; Wed, 11 Jul 2012 08:51:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SowNv-0005El-UT for qemu-devel@nongnu.org; Wed, 11 Jul 2012 08:51:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SowNv-0005EL-Mo for qemu-devel@nongnu.org; Wed, 11 Jul 2012 08:51:15 -0400 Date: Wed, 11 Jul 2012 09:51:45 -0300 From: Luiz Capitulino Message-ID: <20120711095145.4b4d8006@doriath.home> In-Reply-To: References: <1341949831-13547-1-git-send-email-lcapitulino@redhat.com> <1341949831-13547-2-git-send-email-lcapitulino@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/5] qemu-option: add alias support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, qemu-devel@nongnu.org, afaerber@suse.de On Wed, 11 Jul 2012 09:00:59 +0200 Markus Armbruster wrote: > Luiz Capitulino writes: > > > It allows for specifying an alias for each option name, see next commits > > examples. > > > > Signed-off-by: Luiz Capitulino > > --- > > qemu-option.c | 9 ++++++++- > > qemu-option.h | 1 + > > 2 files changed, 9 insertions(+), 1 deletion(-) > > > > diff --git a/qemu-option.c b/qemu-option.c > > index bb3886c..59a1f6e 100644 > > --- a/qemu-option.c > > +++ b/qemu-option.c > > @@ -616,6 +616,7 @@ static void opt_set(QemuOpts *opts, const char *name, const char *value, > > bool prepend, Error **errp) > > { > > QemuOpt *opt; > > + const char *optname; > > const QemuOptDesc *desc = opts->list->desc; > > Error *local_err = NULL; > > int i; > > @@ -624,18 +625,24 @@ static void opt_set(QemuOpts *opts, const char *name, const char *value, > > if (strcmp(desc[i].name, name) == 0) { > > break; > > } > > + if (desc[i].alias && strcmp(desc[i].alias, name) == 0) { > > + break; > > + } > > } > > if (desc[i].name == NULL) { > > if (i == 0) { > > /* empty list -> allow any */; > > + optname = name; > > } else { > > error_set(errp, QERR_INVALID_PARAMETER, name); > > return; > > } > > + } else { > > + optname = desc[i].name; > > } > > > > opt = g_malloc0(sizeof(*opt)); > > - opt->name = g_strdup(name); > > + opt->name = g_strdup(optname); > > opt->opts = opts; > > if (prepend) { > > QTAILQ_INSERT_HEAD(&opts->head, opt, next); > > What about qemu_opt_set_bool() and qemu_opts_validate()? Don't they > need alias support as well? Oh, you're right, thanks for catching this. > By the way, I really dislike qemu_opt_set_bool() duplicating > qemu_opt_set(). Shame on commit f02b77c9. Yeah, I'll fix the duplication. > > > diff --git a/qemu-option.h b/qemu-option.h > > index 951dec3..7106d2f 100644 > > --- a/qemu-option.h > > +++ b/qemu-option.h > > @@ -94,6 +94,7 @@ enum QemuOptType { > > > > typedef struct QemuOptDesc { > > const char *name; > > + const char *alias; > > enum QemuOptType type; > > const char *help; > > } QemuOptDesc; >