From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhkJZ-0003wI-QW for qemu-devel@nongnu.org; Wed, 07 Sep 2016 17:23:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhkJX-00052v-EL for qemu-devel@nongnu.org; Wed, 07 Sep 2016 17:23:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhkJX-00052q-5N for qemu-devel@nongnu.org; Wed, 07 Sep 2016 17:23:23 -0400 From: Stefan Hajnoczi Date: Wed, 7 Sep 2016 17:23:10 -0400 Message-Id: <1473283392-31292-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1473283392-31292-1-git-send-email-stefanha@redhat.com> References: <1473283392-31292-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] iscsi: extract find_iscsi_opts() helper function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jferlan@redhat.com, Paolo Bonzini , pl@kamp.de, ronniesahlberg@gmail.com, Daniel Berrange , Stefan Hajnoczi Extract a function that looks up the -iscsi object to avoid duplicating this code. Signed-off-by: Stefan Hajnoczi --- block/iscsi.c | 82 ++++++++++++++++++++++++++--------------------------------- 1 file changed, 36 insertions(+), 46 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 95ce9e1..a214e3f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1198,29 +1198,42 @@ retry: return 0; } +/* Look up the -iscsi command-line option */ +static QemuOpts *find_iscsi_opts(const char *id) +{ + QemuOptsList *list; + QemuOpts *opts; + + list = qemu_find_opts("iscsi"); + if (!list) { + return NULL; + } + + opts = qemu_opts_find(list, id); + if (opts == NULL) { + opts = QTAILQ_FIRST(&list->head); + if (!opts) { + return NULL; + } + } + + return opts; +} + static void parse_chap(struct iscsi_context *iscsi, const char *target, Error **errp) { - QemuOptsList *list; QemuOpts *opts; const char *user = NULL; const char *password = NULL; const char *secretid; char *secret = NULL; - list = qemu_find_opts("iscsi"); - if (!list) { + opts = find_iscsi_opts(target); + if (!opts) { return; } - opts = qemu_opts_find(list, target); - if (opts == NULL) { - opts = QTAILQ_FIRST(&list->head); - if (!opts) { - return; - } - } - user = qemu_opt_get(opts, "user"); if (!user) { return; @@ -1254,23 +1267,14 @@ static void parse_chap(struct iscsi_context *iscsi, const char *target, static void parse_header_digest(struct iscsi_context *iscsi, const char *target, Error **errp) { - QemuOptsList *list; QemuOpts *opts; const char *digest = NULL; - list = qemu_find_opts("iscsi"); - if (!list) { + opts = find_iscsi_opts(target); + if (!opts) { return; } - opts = qemu_opts_find(list, target); - if (opts == NULL) { - opts = QTAILQ_FIRST(&list->head); - if (!opts) { - return; - } - } - digest = qemu_opt_get(opts, "header-digest"); if (!digest) { return; @@ -1291,23 +1295,16 @@ static void parse_header_digest(struct iscsi_context *iscsi, const char *target, static char *parse_initiator_name(const char *target) { - QemuOptsList *list; QemuOpts *opts; const char *name; char *iscsi_name; UuidInfo *uuid_info; - list = qemu_find_opts("iscsi"); - if (list) { - opts = qemu_opts_find(list, target); - if (!opts) { - opts = QTAILQ_FIRST(&list->head); - } - if (opts) { - name = qemu_opt_get(opts, "initiator-name"); - if (name) { - return g_strdup(name); - } + opts = find_iscsi_opts(target); + if (opts) { + name = qemu_opt_get(opts, "initiator-name"); + if (name) { + return g_strdup(name); } } @@ -1325,21 +1322,14 @@ static char *parse_initiator_name(const char *target) static int parse_timeout(const char *target) { - QemuOptsList *list; QemuOpts *opts; const char *timeout; - list = qemu_find_opts("iscsi"); - if (list) { - opts = qemu_opts_find(list, target); - if (!opts) { - opts = QTAILQ_FIRST(&list->head); - } - if (opts) { - timeout = qemu_opt_get(opts, "timeout"); - if (timeout) { - return atoi(timeout); - } + opts = find_iscsi_opts(target); + if (opts) { + timeout = qemu_opt_get(opts, "timeout"); + if (timeout) { + return atoi(timeout); } } -- 2.7.4