From nobody Mon Feb 9 23:03:11 2026 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=1615028328; cv=none; d=zohomail.com; s=zohoarc; b=V3dOyBHGThOGLU0HneHXowb3EGlYIpI486rsqxgnJrCS7/zHz7yRR4YUS7800Kmy0T+d6R1/2uErfEdt24OqxFfqef6iAhWwkPPUqiUe2Bcr1tO4TNDX5LYM9aQpgiye6PKYoTvDvCFZP6HOAWAjgn4po6r1RRnHWGgQgbdtumM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615028328; 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=ENrDjQ3yvjkw1J/kmjEqPKOaLJXndkSJMGpd0qO5N8M=; b=FIKf9VjNbzXI1O/J/HzrZLujH3rHsuUokhNjE3vojvN0XO5WJmlbm0sJjZobcd1g/4orLZuetRDH0I5hbnCB5wVqjPLSkJPi/jGyqsR9Qg27Cig+hgx+NpgWWOMeJr7eu1LVwlnaNN7Ifx4/87bkdEYLqSSvrn9qCUYfwWzZ4Jc= 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 1615028328439402.83283581295916; Sat, 6 Mar 2021 02:58:48 -0800 (PST) Received: from localhost ([::1]:48538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIUdz-0003Gp-E4 for importer@patchew.org; Sat, 06 Mar 2021 05:58:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIUZu-0005yI-8B for qemu-devel@nongnu.org; Sat, 06 Mar 2021 05:54:35 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:42503) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIUZs-00089X-KT for qemu-devel@nongnu.org; Sat, 06 Mar 2021 05:54:34 -0500 Received: by mail-wm1-x333.google.com with SMTP id b2-20020a7bc2420000b029010be1081172so816004wmj.1 for ; Sat, 06 Mar 2021 02:54:32 -0800 (PST) Received: from avogadro.redhat.com ([93.56.170.5]) by smtp.gmail.com with ESMTPSA id i26sm9326472wmb.18.2021.03.06.02.54.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 02:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ENrDjQ3yvjkw1J/kmjEqPKOaLJXndkSJMGpd0qO5N8M=; b=heg9SL1JXErDRNTKCmrDzVWamMV8JZizsS3WMi87Uhwm+KbNbdwT3vxdCVTDk43h2h 8riaFqwOB+pZzAa8c1/YwEsngzbIkBYOF/2EykFbU+aolGAetv2cL7NP5Ux5RvOGKZ41 4BKyZ/bIxS6x9Qoy6WTiW89y8p3Lyxmjra9usrWNNY4e/7k5/wnkMp3OQ2cZ7TsUp5qB r5HG4fZ3iPKJKo4LG1180BylO8/dV8OWnmaWrXjU0X03JsI576yojAEEevA3BPm+W6mk PDFzM+zL+Yb0YWYLdZ8S9v1p74FIJRDWAm8GzFYyA8FDXTalTOMgv1xudpC10XHFatN6 6WvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ENrDjQ3yvjkw1J/kmjEqPKOaLJXndkSJMGpd0qO5N8M=; b=qWyltjAKHob1041ZrK4Ps3sbyeLR0Lf5m0DDXffoTH7edGa5CLLCl5Msy7FOEQS83n Jb+MK+jvyNvkvvO6FNGDvDF/dwmAn6eu0eKwZ2vxmsxOmLGIM/dA0CvGZzddqSTehANy s8QA9odH/LAy78jbfB5Ax8xXbB8TdF5hWoGLd/xbQZq9ppuNAXLwQmLd4Y6LjP0j5Rid UjrOexVX1cvQHmqezSJvhsAa2PhVaa4ASusPTrRoXc6xwGtxdCCBrqYbss3+zTM9NC9D 9yHrK6Vxgj8z6tu67s5p3cFdhCI/gb1gWrr/JMEC9MORTJ5WHc00UDSHp5VMBH3V/d57 mUzQ== X-Gm-Message-State: AOAM533cYOUG8CqqvbVDohON5NEwdiBUStg/3PutPL0TSzQcV5nBu8V/ XYatRGbw/DEUmgvbhS1D9ypfvyTqokU= X-Google-Smtp-Source: ABdhPJyxc5yIWpMA156y1Nr/YXDVO1LGkGlrnZfJ6Z60/ZkNlJnpSjXvf/ySJ6QOJOB+isClPFx0ww== X-Received: by 2002:a1c:988c:: with SMTP id a134mr12956887wme.120.1615028071320; Sat, 06 Mar 2021 02:54:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/23] qemu-config: add error propagation to qemu_config_parse Date: Sat, 6 Mar 2021 11:54:08 +0100 Message-Id: <20210306105419.110503-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210306105419.110503-1-pbonzini@redhat.com> References: <20210306105419.110503-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::333; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x333.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This enables some simplification of vl.c via error_fatal, and improves error messages. Before: $ ./qemu-system-x86_64 -readconfig . qemu-system-x86_64: error reading file qemu-system-x86_64: -readconfig .: read config .: Invalid argument $ /usr/libexec/qemu-kvm -readconfig foo qemu-kvm: -readconfig foo: read config foo: No such file or directory After: $ ./qemu-system-x86_64 -readconfig . qemu-system-x86_64: -readconfig .: Cannot read config file: Is a directory $ ./qemu-system-x86_64 -readconfig foo qemu-system-x86_64: -readconfig foo: Could not open 'foo': No such file o= r directory Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster Message-Id: <20210226170816.231173-1-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- block/blkdebug.c | 3 +-- include/qemu/config-file.h | 5 +++-- softmmu/vl.c | 29 +++++++++++------------------ util/qemu-config.c | 23 ++++++++++++----------- 4 files changed, 27 insertions(+), 33 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 29226107bd..8d3e53ae4d 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -11,9 +11,10 @@ void qemu_add_drive_opts(QemuOptsList *list); int qemu_global_option(const char *str); =20 void qemu_config_write(FILE *fp); -int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname); +int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname, + Error **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 7e8110bd6e..2f4958db2a 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2062,17 +2062,19 @@ 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) { + ERRP_GUARD(); int ret; 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, errp); + if (ret < 0) { + if (ret =3D=3D -ENOENT) { + error_free(*errp); + *errp =3D NULL; + } } - - return 0; } =20 static int qemu_set_option(const char *str) @@ -2633,9 +2635,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 */ @@ -3323,15 +3323,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 e2a700b284..670bd6ebca 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -350,7 +350,7 @@ void qemu_config_write(FILE *fp) } =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; @@ -375,7 +375,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); @@ -386,7 +386,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); @@ -398,21 +398,21 @@ 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"); - goto out; + loc_pop(&loc); + error_setg_errno(errp, errno, "Cannot read config file"); + return res; } res =3D count; out: @@ -420,16 +420,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_file_open(errp, errno, filename); 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.29.2