From patchwork Tue Apr 17 19:36:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 153300 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 5F1EEB7016 for ; Wed, 18 Apr 2012 05:38:54 +1000 (EST) Received: from localhost ([::1]:40206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKEEm-0001mm-A3 for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 15:38:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKEDB-00075Q-Em for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:37:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKED9-0000A7-Hd for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:37:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKED9-00009Z-9W for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:37:11 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3HJaZ7k019824 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Apr 2012 15:36:35 -0400 Received: from localhost (ovpn-113-173.phx2.redhat.com [10.3.113.173]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q3HJaYqn029099; Tue, 17 Apr 2012 15:36:35 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 16:36:16 -0300 Message-Id: <1334691381-7666-14-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1334691381-7666-1-git-send-email-lcapitulino@redhat.com> References: <1334691381-7666-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 13/18] qemu-config: introduce qemu_find_opts_err() 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 This is like qemu_find_opts(), except that it takes an Error argument. This new function allows for a incremental conversion of code using qemu_find_opts(). Signed-off-by: Luiz Capitulino --- qemu-config.c | 5 +++++ qemu-config.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/qemu-config.c b/qemu-config.c index bdb381d..bb3bff4 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -661,6 +661,11 @@ QemuOptsList *qemu_find_opts(const char *group) return ret; } +QemuOptsList *qemu_find_opts_err(const char *group, Error **errp) +{ + return find_list(vm_config_groups, group, errp); +} + void qemu_add_opts(QemuOptsList *list) { int entries, i; diff --git a/qemu-config.h b/qemu-config.h index 20d707f..a093e3f 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -1,11 +1,14 @@ #ifndef QEMU_CONFIG_H #define QEMU_CONFIG_H +#include "error.h" + extern QemuOptsList qemu_fsdev_opts; extern QemuOptsList qemu_virtfs_opts; extern QemuOptsList qemu_spice_opts; QemuOptsList *qemu_find_opts(const char *group); +QemuOptsList *qemu_find_opts_err(const char *group, Error **errp); void qemu_add_opts(QemuOptsList *list); int qemu_set_option(const char *str); int qemu_global_option(const char *str);