From patchwork Thu Jun 5 09:20:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Liu X-Patchwork-Id: 356268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 82E2D14007F for ; Thu, 5 Jun 2014 19:35:10 +1000 (EST) Received: from localhost ([::1]:39523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsU4i-00074U-An for incoming@patchwork.ozlabs.org; Thu, 05 Jun 2014 05:35:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsTsD-0003tb-Le for qemu-devel@nongnu.org; Thu, 05 Jun 2014 05:22:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsTs6-0008IQ-0P for qemu-devel@nongnu.org; Thu, 05 Jun 2014 05:22:13 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:46873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsTs5-0008I3-P8 for qemu-devel@nongnu.org; Thu, 05 Jun 2014 05:22:05 -0400 Received: from linux-cyliu.lab.bej.apac.novell.com (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by victor.provo.novell.com with ESMTP (NOT encrypted); Thu, 05 Jun 2014 03:21:50 -0600 From: Chunyan Liu To: qemu-devel@nongnu.org Date: Thu, 5 Jun 2014 17:20:58 +0800 Message-Id: <1401960072-2363-20-git-send-email-cyliu@suse.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1401960072-2363-1-git-send-email-cyliu@suse.com> References: <1401960072-2363-1-git-send-email-cyliu@suse.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 137.65.250.26 Cc: stefanha@redhat.com Subject: [Qemu-devel] [PATCH v28 19/33] QemuOpts: export qemu_opt_find 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 Export qemu_opt_find for qcow2 driver using it. After replacing QEMUOptionParameter with QemuOpts, qcow2 driver will use qemu_opt_find to judge if an option is explicitly set, to replace the usage of .assigned in QEMUOptionParameter. Signed-off-by: Chunyan Liu --- Changes: * same as v27. * changes to v26: Following Eric's comment, split v26 qcow2.c patch into two: export qemu_opt_find first and then qcow2.c patch include/qemu/option.h | 1 + util/qemu-option.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/qemu/option.h b/include/qemu/option.h index 44d9961..3455267 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -130,6 +130,7 @@ char *qemu_opt_get_del(QemuOpts *opts, const char *name); * Returns: true if @opts includes 'help' or equivalent. */ bool qemu_opt_has_help_opt(QemuOpts *opts); +QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name); bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval); uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval); uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t defval); diff --git a/util/qemu-option.c b/util/qemu-option.c index 40e1ff3..0d9d3ec 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -568,7 +568,7 @@ void qemu_opts_print_help(QemuOptsList *list) } /* ------------------------------------------------------------------ */ -static QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name) +QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name) { QemuOpt *opt;