From nobody Tue Nov 18 01:24:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606908219; cv=none; d=zohomail.com; s=zohoarc; b=fg7pzVkdBgwaYcW/G9YaX2yIT5JzuWXkWm6iDbLcZAcynNXpqRAxCSwXFjqLlV2ViiUzvvfCqGt91OMF0jyClYxEozPvnV1/qdJaqQguMJm/Qv4SpG0v+uibzKQjs3FQofBzOjmKHJu5lzjopjv4iPxGfvmD5MPUFUKY/tEY+WU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606908219; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mjjxMa7niNak+4B8OwlH39bC3M6TfeZq2Z5AzWs83Pw=; b=A1lTpC9lQe+NPtEYqNUwp4IrWx/NIvymM3mqTY2VTPW5OiZcHcIk/vWybt04YICTPUUOy6KjwwowrLBP8Jytvp9vINBHlu+Dupszmg8hSvZihvKl9WtYq53jCgZrC9dGGTK6d6DmoD86LlB2/ViXj8eKHY/RYj5W5KoCZRnU+Z4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606908219877398.6093247858954; Wed, 2 Dec 2020 03:23:39 -0800 (PST) Received: from localhost ([::1]:45244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkP8E-0000fS-T8 for importer@patchew.org; Wed, 02 Dec 2020 05:13:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkO3j-0003gu-Dw for qemu-devel@nongnu.org; Wed, 02 Dec 2020 04:04:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23398) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkO3g-0004fP-VP for qemu-devel@nongnu.org; Wed, 02 Dec 2020 04:04:22 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-568-8NpAmqM3Ng-kavlZQjqFcg-1; Wed, 02 Dec 2020 04:04:18 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F34C08581AA; Wed, 2 Dec 2020 09:03:45 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84A3E6085A; Wed, 2 Dec 2020 09:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606899860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mjjxMa7niNak+4B8OwlH39bC3M6TfeZq2Z5AzWs83Pw=; b=M4Lv5VBGZkLnHf/sP/oEJe8jglSjlIKCKnIxR7nQIhpLhwFtah3uITWbB0t9UOa0TlNkE+ AtJMdQpvJ4rVvi2cWKYI5nQJuYff9ayltDEwcvC9iDTGr+1j9c1tKa6Yn1iq60pjm4QvU3 K/KiVlECbrPD5x52wGWuNAqIFGd9oik= X-MC-Unique: 8NpAmqM3Ng-kavlZQjqFcg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 14/28] qemu-config: add error propagation to qemu_config_parse Date: Wed, 2 Dec 2020 04:02:51 -0500 Message-Id: <20201202090305.4129317-15-pbonzini@redhat.com> In-Reply-To: <20201202090305.4129317-1-pbonzini@redhat.com> References: <20201202090305.4129317-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, imammedo@redhat.com, armbru@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This enables some simplification of vl.c via error_fatal. Signed-off-by: Paolo Bonzini --- block/blkdebug.c | 3 +-- include/qemu/config-file.h | 4 ++-- softmmu/vl.c | 30 ++++++++++++------------------ util/qemu-config.c | 20 ++++++++++---------- 4 files changed, 25 insertions(+), 32 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 5fe6172da9..7eaa8a28bf 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -279,9 +279,8 @@ static int read_config(BDRVBlkdebugState *s, const char= *filename, return -errno; } =20 - ret =3D qemu_config_parse(f, config_groups, filename); + ret =3D qemu_config_parse(f, config_groups, filename, errp); if (ret < 0) { - error_setg(errp, "Could not parse blkdebug config file"); goto fail; } } diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index 7d26fe3816..da6f4690b7 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -10,9 +10,9 @@ void qemu_add_opts(QemuOptsList *list); void qemu_add_drive_opts(QemuOptsList *list); int qemu_global_option(const char *str); =20 -int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname); +int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname, E= rror **errp); =20 -int qemu_read_config_file(const char *filename); +int qemu_read_config_file(const char *filename, Error **errp); =20 /* Parse QDict options as a replacement for a config file (allowing multip= le enumerated (0..(n-1)) configuration "sections") */ diff --git a/softmmu/vl.c b/softmmu/vl.c index 4039bf3a39..16a5cd1046 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2045,17 +2045,20 @@ static int global_init_func(void *opaque, QemuOpts = *opts, Error **errp) return 0; } =20 -static int qemu_read_default_config_file(void) +static void qemu_read_default_config_file(Error **errp) { int ret; + Error *local_err =3D NULL; g_autofree char *file =3D get_relocated_path(CONFIG_QEMU_CONFDIR "/qem= u.conf"); =20 - ret =3D qemu_read_config_file(file); - if (ret < 0 && ret !=3D -ENOENT) { - return ret; + ret =3D qemu_read_config_file(file, &local_err); + if (ret < 0) { + if (ret =3D=3D -ENOENT) { + error_free(local_err); + } else { + error_propagate(errp, local_err); + } } - - return 0; } =20 static int qemu_set_option(const char *str) @@ -2586,9 +2589,7 @@ void qemu_init(int argc, char **argv, char **envp) } =20 if (userconfig) { - if (qemu_read_default_config_file() < 0) { - exit(1); - } + qemu_read_default_config_file(&error_fatal); } =20 /* second pass of option parsing */ @@ -3284,15 +3285,8 @@ void qemu_init(int argc, char **argv, char **envp) qemu_plugin_opt_parse(optarg, &plugin_list); break; case QEMU_OPTION_readconfig: - { - int ret =3D qemu_read_config_file(optarg); - if (ret < 0) { - error_report("read config %s: %s", optarg, - strerror(-ret)); - exit(1); - } - break; - } + qemu_read_config_file(optarg, &error_fatal); + break; case QEMU_OPTION_spice: olist =3D qemu_find_opts_err("spice", NULL); if (!olist) { diff --git a/util/qemu-config.c b/util/qemu-config.c index cc5be3c779..85f20079de 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -314,7 +314,7 @@ void qemu_add_opts(QemuOptsList *list) } =20 /* Returns number of config groups on success, -errno on error */ -int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname) +int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname, E= rror **errp) { char line[1024], group[64], id[64], arg[64], value[1024]; Location loc; @@ -339,7 +339,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, c= onst char *fname) /* group with id */ list =3D find_list(lists, group, &local_err); if (local_err) { - error_report_err(local_err); + error_propagate(errp, local_err); goto out; } opts =3D qemu_opts_create(list, id, 1, NULL); @@ -350,7 +350,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, c= onst char *fname) /* group without id */ list =3D find_list(lists, group, &local_err); if (local_err) { - error_report_err(local_err); + error_propagate(errp, local_err); goto out; } opts =3D qemu_opts_create(list, NULL, 0, &error_abort); @@ -362,20 +362,19 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists,= const char *fname) sscanf(line, " %63s =3D \"\"", arg) =3D=3D 1) { /* arg =3D value */ if (opts =3D=3D NULL) { - error_report("no group defined"); + error_setg(errp, "no group defined"); goto out; } - if (!qemu_opt_set(opts, arg, value, &local_err)) { - error_report_err(local_err); + if (!qemu_opt_set(opts, arg, value, errp)) { goto out; } continue; } - error_report("parse error"); + error_setg(errp, "parse error"); goto out; } if (ferror(fp)) { - error_report("error reading file"); + error_setg(errp, "error reading file"); goto out; } res =3D count; @@ -384,16 +383,17 @@ out: return res; } =20 -int qemu_read_config_file(const char *filename) +int qemu_read_config_file(const char *filename, Error **errp) { FILE *f =3D fopen(filename, "r"); int ret; =20 if (f =3D=3D NULL) { + error_setg_errno(errp, errno, "Cannot read config file %s", filena= me); return -errno; } =20 - ret =3D qemu_config_parse(f, vm_config_groups, filename); + ret =3D qemu_config_parse(f, vm_config_groups, filename, errp); fclose(f); return ret; } --=20 2.26.2