From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cm2gO-0002kQ-RZ for qemu-devel@nongnu.org; Thu, 09 Mar 2017 13:21:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cm2gL-0004oM-Lq for qemu-devel@nongnu.org; Thu, 09 Mar 2017 13:21:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40572) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cm2gL-0004oB-D5 for qemu-devel@nongnu.org; Thu, 09 Mar 2017 13:20:57 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 94179C05AA4F for ; Thu, 9 Mar 2017 18:20:57 +0000 (UTC) From: Eduardo Habkost Date: Thu, 9 Mar 2017 15:20:48 -0300 Message-Id: <20170309182049.30040-2-ehabkost@redhat.com> In-Reply-To: <20170309182049.30040-1-ehabkost@redhat.com> References: <20170309182049.30040-1-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH for-2.9? v2 1/2] config: qemu_config_parse() return number of config groups List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Paolo Bonzini Change qemu_config_parse() to return the number of config groups in success and -EINVAL on error. This will allow callers of qemu_config_parse() to check if something was really loaded from the config file. All existing callers of qemu_config_parse() and qemu_read_config_file() only check if the return value was negative, so the change shouldn't affect them. Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Remove unnecessary translation of qemu_config_parse() erros to -EINVAL at block/blkdebug.c:read_config() * Suggsted-by: Markus Armbruster --- block/blkdebug.c | 1 - util/qemu-config.c | 15 +++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 67e8024e36..77d747f313 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -252,7 +252,6 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, ret = qemu_config_parse(f, config_groups, filename); if (ret < 0) { error_setg(errp, "Could not parse blkdebug config file"); - ret = -EINVAL; goto fail; } } diff --git a/util/qemu-config.c b/util/qemu-config.c index 5527100a01..560c201bd3 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -379,6 +379,7 @@ void qemu_config_write(FILE *fp) } } +/* Returns number of config groups on success, -errno on error */ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname) { char line[1024], group[64], id[64], arg[64], value[1024]; @@ -386,7 +387,8 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname) QemuOptsList *list = NULL; Error *local_err = NULL; QemuOpts *opts = NULL; - int res = -1, lno = 0; + int res = -EINVAL, lno = 0; + int count = 0; loc_push_none(&loc); while (fgets(line, sizeof(line), fp) != NULL) { @@ -407,6 +409,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname) goto out; } opts = qemu_opts_create(list, id, 1, NULL); + count++; continue; } if (sscanf(line, "[%63[^]]]", group) == 1) { @@ -417,6 +420,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname) goto out; } opts = qemu_opts_create(list, NULL, 0, &error_abort); + count++; continue; } value[0] = '\0'; @@ -441,7 +445,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname) error_report("error reading file"); goto out; } - res = 0; + res = count; out: loc_pop(&loc); return res; @@ -458,12 +462,7 @@ int qemu_read_config_file(const char *filename) ret = qemu_config_parse(f, vm_config_groups, filename); fclose(f); - - if (ret == 0) { - return 0; - } else { - return -EINVAL; - } + return ret; } static void config_parse_qdict_section(QDict *options, QemuOptsList *opts, -- 2.11.0.259.g40922b1