From patchwork Fri Jul 13 20:44:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 170962 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 915C32C030A for ; Sat, 14 Jul 2012 06:53:19 +1000 (EST) Received: from localhost ([::1]:48412 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Spmj9-0004eX-L7 for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2012 16:44:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpmiX-0002xD-O1 for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:44:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SpmiW-0001s9-EZ for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:44:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpmiW-0001s0-6y for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:44:00 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6DKhxj3019720 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 13 Jul 2012 16:43:59 -0400 Received: from localhost ([10.3.113.3]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6DKhw42009727; Fri, 13 Jul 2012 16:43:59 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 13 Jul 2012 17:44:17 -0300 Message-Id: <1342212261-19903-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1342212261-19903-1-git-send-email-lcapitulino@redhat.com> References: <1342212261-19903-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, afaerber@suse.de, armbru@redhat.com Subject: [Qemu-devel] [PATCH 4/8] qemu-option: add alias support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Allow for specifying an alias for each option name, see next commits for examples. Signed-off-by: Luiz Capitulino --- qemu-option.c | 5 +++-- qemu-option.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index 65ba1cf..b2f9e21 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -623,7 +623,8 @@ static const QemuOptDesc *find_desc_by_name(const QemuOptDesc *desc, int i; for (i = 0; desc[i].name != NULL; i++) { - if (strcmp(desc[i].name, name) == 0) { + if (strcmp(desc[i].name, name) == 0 || + (desc[i].alias && strcmp(desc[i].alias, name) == 0)) { return &desc[i]; } } @@ -645,7 +646,7 @@ static void opt_set(QemuOpts *opts, const char *name, const char *value, } opt = g_malloc0(sizeof(*opt)); - opt->name = g_strdup(name); + opt->name = g_strdup(desc ? desc->name : name); opt->opts = opts; if (prepend) { QTAILQ_INSERT_HEAD(&opts->head, opt, next); 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;