{"id":819310,"url":"http://patchwork.ozlabs.org/api/patches/819310/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170927204148.2311-2-ehabkost@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170927204148.2311-2-ehabkost@redhat.com>","list_archive_url":null,"date":"2017-09-27T20:41:47","name":"[v3,1/2] config: qemu_config_parse() return number of config groups","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0f29cc59839817c19e9343357b28062700851420","submitter":{"id":195,"url":"http://patchwork.ozlabs.org/api/people/195/?format=json","name":"Eduardo Habkost","email":"ehabkost@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170927204148.2311-2-ehabkost@redhat.com/mbox/","series":[{"id":5444,"url":"http://patchwork.ozlabs.org/api/series/5444/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=5444","date":"2017-09-27T20:41:46","name":"vl: Print warning if a non-empty default config file is found","version":3,"mbox":"http://patchwork.ozlabs.org/series/5444/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/819310/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/819310/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=ehabkost@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y2VD314cpz9t6B\n\tfor ;\n\tThu, 28 Sep 2017 06:44:01 +1000 (AEST)","from localhost ([::1]:56276 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dxJBX-0001yp-DK\n\tfor incoming@patchwork.ozlabs.org; Wed, 27 Sep 2017 16:43:59 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:59966)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dxJ9X-0000m0-7V\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 16:41:56 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dxJ9V-0004CJ-9C\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 16:41:55 -0400","from mx1.redhat.com ([209.132.183.28]:58590)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dxJ9V-0004Bn-08\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 16:41:53 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id F2D7B13D9E9\n\tfor ; Wed, 27 Sep 2017 20:41:51 +0000 (UTC)","from localhost (ovpn-116-18.gru2.redhat.com [10.97.116.18])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 85F0E66516;\n\tWed, 27 Sep 2017 20:41:51 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com F2D7B13D9E9","From":"Eduardo Habkost ","To":"qemu-devel@nongnu.org","Date":"Wed, 27 Sep 2017 17:41:47 -0300","Message-Id":"<20170927204148.2311-2-ehabkost@redhat.com>","In-Reply-To":"<20170927204148.2311-1-ehabkost@redhat.com>","References":"<20170927204148.2311-1-ehabkost@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tWed, 27 Sep 2017 20:41:52 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v3 1/2] config: qemu_config_parse() return\n\tnumber of config groups","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Paolo Bonzini ,\n\tMarkus Armbruster ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Change qemu_config_parse() to return the number of config groups\nin success and -EINVAL on error. This will allow callers of\nqemu_config_parse() to check if something was really loaded from\nthe config file.\n\nAll existing callers of qemu_config_parse() and\nqemu_read_config_file() only check if the return value was\nnegative, so the change shouldn't affect them.\n\nSigned-off-by: Eduardo Habkost \n---\nChanges v2 -> v3:\n* None (rebase only)\n\nChanges v1 -> v2:\n* Remove unnecessary translation of qemu_config_parse()\n erros to -EINVAL at block/blkdebug.c:read_config()\n * Suggsted-by: Markus Armbruster \n---\n block/blkdebug.c | 1 -\n util/qemu-config.c | 15 +++++++--------\n 2 files changed, 7 insertions(+), 9 deletions(-)","diff":"diff --git a/block/blkdebug.c b/block/blkdebug.c\nindex 46e53f2f09..dfdf9b91aa 100644\n--- a/block/blkdebug.c\n+++ b/block/blkdebug.c\n@@ -244,7 +244,6 @@ static int read_config(BDRVBlkdebugState *s, const char *filename,\n ret = qemu_config_parse(f, config_groups, filename);\n if (ret < 0) {\n error_setg(errp, \"Could not parse blkdebug config file\");\n- ret = -EINVAL;\n goto fail;\n }\n }\ndiff --git a/util/qemu-config.c b/util/qemu-config.c\nindex 405dd1a1d7..99b0e46fa3 100644\n--- a/util/qemu-config.c\n+++ b/util/qemu-config.c\n@@ -385,6 +385,7 @@ void qemu_config_write(FILE *fp)\n }\n }\n \n+/* Returns number of config groups on success, -errno on error */\n int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname)\n {\n char line[1024], group[64], id[64], arg[64], value[1024];\n@@ -392,7 +393,8 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname)\n QemuOptsList *list = NULL;\n Error *local_err = NULL;\n QemuOpts *opts = NULL;\n- int res = -1, lno = 0;\n+ int res = -EINVAL, lno = 0;\n+ int count = 0;\n \n loc_push_none(&loc);\n while (fgets(line, sizeof(line), fp) != NULL) {\n@@ -413,6 +415,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname)\n goto out;\n }\n opts = qemu_opts_create(list, id, 1, NULL);\n+ count++;\n continue;\n }\n if (sscanf(line, \"[%63[^]]]\", group) == 1) {\n@@ -423,6 +426,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname)\n goto out;\n }\n opts = qemu_opts_create(list, NULL, 0, &error_abort);\n+ count++;\n continue;\n }\n value[0] = '\\0';\n@@ -447,7 +451,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname)\n error_report(\"error reading file\");\n goto out;\n }\n- res = 0;\n+ res = count;\n out:\n loc_pop(&loc);\n return res;\n@@ -464,12 +468,7 @@ int qemu_read_config_file(const char *filename)\n \n ret = qemu_config_parse(f, vm_config_groups, filename);\n fclose(f);\n-\n- if (ret == 0) {\n- return 0;\n- } else {\n- return -EINVAL;\n- }\n+ return ret;\n }\n \n static void config_parse_qdict_section(QDict *options, QemuOptsList *opts,\n","prefixes":["v3","1/2"]}