From patchwork Wed Oct 4 17:31:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 729324 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a4e:0:b0:31d:da82:a3b4 with SMTP id v14csp481695wrs; Wed, 4 Oct 2023 10:42:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwDISnGyqcvVqBCxBWCkoEohbV7Fyw3uwARcXXQ5zNumFSvlkdUR1pUQzrblF0fp70EHa6 X-Received: by 2002:a0c:b3cf:0:b0:659:71ac:84df with SMTP id b15-20020a0cb3cf000000b0065971ac84dfmr2515558qvf.26.1696441356917; Wed, 04 Oct 2023 10:42:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696441356; cv=none; d=google.com; s=arc-20160816; b=pNKmRR5H3ZyVIzCuap4jNuKa2CbMzb89ZiD4QNcw0ZKeDpWQrgI1fyLtDQGCQTgAaU q22H5vBQuQCJrxT1XtNF1xJ5+HXLzYw4f/j7361P9V3XM9gEu1dfWZAOfh1FYthnmwPB j5rcNGNYmExfeX5UqRWDCPnEj/dNO4Kyrbq4jVjCBP4Ipw1HJn8iSTYWUCbP2zMUO4Oi zox6QvR9x0QU4k1cLyaH8uvRER+TR1IUOF19RlHlsl6PQBw5rK9I3vIVgAYtpCyovHpN TLt0zAlCU7MioewLOIcYxsVk5/hEckYh1jqD8uVjwFR6gVYJbqQO9+TL1X1QsAQC04nS 4kGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kOY6u6B9/Vt1ZpzeRPPPARZ8tvwMbrjh+qtuhF8OwAQ=; fh=9el7zTdEdJxsoyYMF+nW4FC9lfAbjw9A2prRGABmDOM=; b=aUzUVOJU4gjWF1Wi/tfieHLKnSYzFbMvfyI/jJtBut1Rvrs/6kzc0fviIZz1a5mAg5 lUOUR0aMezdiFMmFthxTDHrAxYwigUc0jZ21bCMZE1R7cDCuXWL3tHnf0j2hHkv+BMWC XyQnIGmxHfPKUFAtp2pa05c4NWEqvjsWi3Yu+hTAJTAvNOYTUQK2eCZsKsE+TFA8EGqN tad8BM9p4P4Ljjh3ngkMlThhg7T+/CzcOOt58KunoIcNfLDVPAl4WvYdlTDO02W7mbXn QI/QjH4D5f7pUmC6jkBGUBDEuT+OfNxSYEAcmUPoVQXFi4ol2PEflAKJtov4WjkpQval gEKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ec8Kag8K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n8-20020a0ce548000000b0065b227ad7e3si1648556qvm.257.2023.10.04.10.42.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2023 10:42:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ec8Kag8K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qo5kx-00054s-Cg; Wed, 04 Oct 2023 13:33:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qo5ku-0004v2-0T for qemu-devel@nongnu.org; Wed, 04 Oct 2023 13:33:52 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qo5kq-0001FN-88 for qemu-devel@nongnu.org; Wed, 04 Oct 2023 13:33:51 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-327b7e08456so110383f8f.2 for ; Wed, 04 Oct 2023 10:33:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696440825; x=1697045625; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kOY6u6B9/Vt1ZpzeRPPPARZ8tvwMbrjh+qtuhF8OwAQ=; b=Ec8Kag8KmIdAH0iLM8Os826bpXmebXegnIwNZ1B6VIOzgadUXxA/mDMhYFe7kuDeqR +aurfJKSiGZEGh0+9a25tgN3La4u2/6G6z95CHRukXvG0rodG64cF1M+vimypHuZAYPo xqelOifjPSLerv1WHBBWGjXW5KLgRcK2bsP08JeEkbXP0kIpgjKeZ6vF1I9F0c3GURWj ZkKTBdHPP1pryjZGkpkdo0V++KBBlex50rCzRgRPYvcYGv7iBFXZo/XINLUZiWj/eKRB nEpn/jTPhIrRuFUSKmN3U8Lu/8lSZinGwUSGxaFO0/QEr7B3BdtnxF5TFOL6MxhJPC1R ndng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696440825; x=1697045625; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kOY6u6B9/Vt1ZpzeRPPPARZ8tvwMbrjh+qtuhF8OwAQ=; b=CpGVZTfkcq30L4mB9ZbakCI0DVT9gQqldZnBsQTcxsYSmKfDjsN/g659XUMFKkmhem u+ixjzhwPtVgjl1uf+J0hqGzUJkjZUwiOmXPyn/xwFtpP1zjEBx9IdfC11vvKQh0Vmv1 Foey3UMecjNUScNrUcyvhH0R/ASKsOWjfvJ3oLLbb4OntBPgmhPCJBMQbGhwS4AlTrf3 Ktn3+uEUx1/NI/tLJAE0VY1ooN5eG+jE83M5ria6w98usLOqDHl5OGHYykfndz/L/rDy ppeV+0BDnq223syNykgb/UQVygDLu6O7g46vOVnmaZvPjp98FbO0AArXhIDebOYXWlLh c33A== X-Gm-Message-State: AOJu0YwH4kz1YvCTTShbSLHs7rvt2Qia90O9TN7m4VnczzO94IC+Iym+ uLh1tNAQfa8fRf6f40GK4tZGQqzwrkduE6fRVQ4= X-Received: by 2002:a5d:56d0:0:b0:31c:5c77:48ec with SMTP id m16-20020a5d56d0000000b0031c5c7748ecmr2553733wrw.62.1696440825381; Wed, 04 Oct 2023 10:33:45 -0700 (PDT) Received: from m1x-phil.lan (5ep85-h01-176-173-163-52.dslam.bbox.fr. [176.173.163.52]) by smtp.gmail.com with ESMTPSA id m7-20020adff387000000b0032710f5584fsm4469894wro.25.2023.10.04.10.33.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Oct 2023 10:33:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Markus Armbruster Cc: qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Marc?= =?utf-8?q?-Andr=C3=A9_Lureau?= , Kevin Wolf , Hanna Reitz , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Stefan Berger , integration@gluster.org Subject: [PATCH 15/21] qapi: Inline QERR_MISSING_PARAMETER definition (constant parameter) Date: Wed, 4 Oct 2023 19:31:50 +0200 Message-ID: <20231004173158.42591-16-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004173158.42591-1-philmd@linaro.org> References: <20231004173158.42591-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Address the comment added in commit 4629ed1e98 ("qerror: Finally unused, clean up"), from 2015: /* * These macros will go away, please don't use * in new code, and do not add new ones! */ Mechanical transformation using the following coccinelle semantic patches: @match@ expression errp; constant param; @@ error_setg(errp, QERR_MISSING_PARAMETER, param); @script:python strformat depends on match@ param << match.param; fixedfmt; // new var @@ if param[0] == '"': # Format skipping '"', fixedfmt = f'"Parameter \'{param[1:-1]}\' is missing"' else: # or use definition. fixedfmt = f'"Parameter " {param} " is missing"' coccinelle.fixedfmt = cocci.make_ident(fixedfmt) @replace@ expression match.errp; constant match.param; identifier strformat.fixedfmt; @@ - error_setg(errp, QERR_MISSING_PARAMETER, param); + error_setg(errp, fixedfmt); and: @match@ constant param; @@ error_report(QERR_MISSING_PARAMETER, param); @script:python strformat depends on match@ param << match.param; fixedfmt; // new var @@ fixedfmt = f'"Parameter \'{param[1:-1]}\' is missing"' coccinelle.fixedfmt = cocci.make_ident(fixedfmt) @replace@ constant match.param; identifier strformat.fixedfmt; @@ - error_report(QERR_MISSING_PARAMETER, param); + error_report(fixedfmt); Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Berger --- backends/dbus-vmstate.c | 2 +- block/gluster.c | 21 +++++++++++---------- block/monitor/block-hmp-cmds.c | 6 +++--- dump/dump.c | 4 ++-- hw/usb/redirect.c | 2 +- softmmu/qdev-monitor.c | 2 +- softmmu/tpm.c | 4 ++-- softmmu/vl.c | 4 ++-- ui/input-barrier.c | 2 +- ui/ui-qmp-cmds.c | 2 +- 10 files changed, 25 insertions(+), 24 deletions(-) diff --git a/backends/dbus-vmstate.c b/backends/dbus-vmstate.c index 57369ec0f2..e781ded17c 100644 --- a/backends/dbus-vmstate.c +++ b/backends/dbus-vmstate.c @@ -413,7 +413,7 @@ dbus_vmstate_complete(UserCreatable *uc, Error **errp) } if (!self->dbus_addr) { - error_setg(errp, QERR_MISSING_PARAMETER, "addr"); + error_setg(errp, "Parameter 'addr' is missing"); return; } diff --git a/block/gluster.c b/block/gluster.c index ad5fadbe79..8d97d698c3 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -530,20 +530,20 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, num_servers = qdict_array_entries(options, GLUSTER_OPT_SERVER_PATTERN); if (num_servers < 1) { - error_setg(&local_err, QERR_MISSING_PARAMETER, "server"); + error_setg(&local_err, "Parameter 'server' is missing"); goto out; } ptr = qemu_opt_get(opts, GLUSTER_OPT_VOLUME); if (!ptr) { - error_setg(&local_err, QERR_MISSING_PARAMETER, GLUSTER_OPT_VOLUME); + error_setg(&local_err, "Parameter " GLUSTER_OPT_VOLUME " is missing"); goto out; } gconf->volume = g_strdup(ptr); ptr = qemu_opt_get(opts, GLUSTER_OPT_PATH); if (!ptr) { - error_setg(&local_err, QERR_MISSING_PARAMETER, GLUSTER_OPT_PATH); + error_setg(&local_err, "Parameter " GLUSTER_OPT_PATH " is missing"); goto out; } gconf->path = g_strdup(ptr); @@ -562,7 +562,8 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, ptr = qemu_opt_get(opts, GLUSTER_OPT_TYPE); if (!ptr) { - error_setg(&local_err, QERR_MISSING_PARAMETER, GLUSTER_OPT_TYPE); + error_setg(&local_err, + "Parameter " GLUSTER_OPT_TYPE " is missing"); error_append_hint(&local_err, GERR_INDEX_HINT, i); goto out; @@ -592,16 +593,16 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, ptr = qemu_opt_get(opts, GLUSTER_OPT_HOST); if (!ptr) { - error_setg(&local_err, QERR_MISSING_PARAMETER, - GLUSTER_OPT_HOST); + error_setg(&local_err, + "Parameter " GLUSTER_OPT_HOST " is missing"); error_append_hint(&local_err, GERR_INDEX_HINT, i); goto out; } gsconf->u.inet.host = g_strdup(ptr); ptr = qemu_opt_get(opts, GLUSTER_OPT_PORT); if (!ptr) { - error_setg(&local_err, QERR_MISSING_PARAMETER, - GLUSTER_OPT_PORT); + error_setg(&local_err, + "Parameter " GLUSTER_OPT_PORT " is missing"); error_append_hint(&local_err, GERR_INDEX_HINT, i); goto out; } @@ -648,8 +649,8 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, goto out; } if (!ptr) { - error_setg(&local_err, QERR_MISSING_PARAMETER, - GLUSTER_OPT_PATH); + error_setg(&local_err, + "Parameter " GLUSTER_OPT_PATH " is missing"); error_append_hint(&local_err, GERR_INDEX_HINT, i); goto out; } diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index ca2599de44..90e593ed38 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -252,7 +252,7 @@ void hmp_drive_mirror(Monitor *mon, const QDict *qdict) }; if (!filename) { - error_setg(&err, QERR_MISSING_PARAMETER, "target"); + error_setg(&err, "Parameter 'target' is missing"); goto end; } qmp_drive_mirror(&mirror, &err); @@ -281,7 +281,7 @@ void hmp_drive_backup(Monitor *mon, const QDict *qdict) }; if (!filename) { - error_setg(&err, QERR_MISSING_PARAMETER, "target"); + error_setg(&err, "Parameter 'target' is missing"); goto end; } @@ -356,7 +356,7 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict) * In the future, if 'snapshot-file' is not specified, the snapshot * will be taken internally. Today it's actually required. */ - error_setg(&err, QERR_MISSING_PARAMETER, "snapshot-file"); + error_setg(&err, "Parameter 'snapshot-file' is missing"); goto end; } diff --git a/dump/dump.c b/dump/dump.c index e173f1f14c..642b952985 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -2096,11 +2096,11 @@ void qmp_dump_guest_memory(bool paging, const char *file, return; } if (has_begin && !has_length) { - error_setg(errp, QERR_MISSING_PARAMETER, "length"); + error_setg(errp, "Parameter 'length' is missing"); return; } if (!has_begin && has_length) { - error_setg(errp, QERR_MISSING_PARAMETER, "begin"); + error_setg(errp, "Parameter 'begin' is missing"); return; } if (has_detach) { diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index ac6fa34ad1..83bfc9dc19 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1426,7 +1426,7 @@ static void usbredir_realize(USBDevice *udev, Error **errp) int i; if (!qemu_chr_fe_backend_connected(&dev->cs)) { - error_setg(errp, QERR_MISSING_PARAMETER, "chardev"); + error_setg(errp, "Parameter 'chardev' is missing"); return; } diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index b17aec4357..b7b2bf18d4 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -622,7 +622,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts, driver = qdict_get_try_str(opts, "driver"); if (!driver) { - error_setg(errp, QERR_MISSING_PARAMETER, "driver"); + error_setg(errp, "Parameter 'driver' is missing"); return NULL; } diff --git a/softmmu/tpm.c b/softmmu/tpm.c index 8437c4efc3..3a7d4b5c67 100644 --- a/softmmu/tpm.c +++ b/softmmu/tpm.c @@ -106,13 +106,13 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp) id = qemu_opts_id(opts); if (id == NULL) { - error_report(QERR_MISSING_PARAMETER, "id"); + error_report("Parameter 'id' is missing"); return 1; } value = qemu_opt_get(opts, "type"); if (!value) { - error_report(QERR_MISSING_PARAMETER, "type"); + error_report("Parameter 'type' is missing"); tpm_display_backend_drivers(); return 1; } diff --git a/softmmu/vl.c b/softmmu/vl.c index 98e071e63b..840ac84069 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1801,7 +1801,7 @@ static void object_option_parse(const char *optarg) type = qemu_opt_get(opts, "qom-type"); if (!type) { - error_setg(&error_fatal, QERR_MISSING_PARAMETER, "qom-type"); + error_setg(&error_fatal, "Parameter 'qom-type' is missing"); } if (user_creatable_print_help(type, opts)) { exit(0); @@ -2266,7 +2266,7 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp) bool qtest_with_kvm; if (!acc) { - error_setg(errp, QERR_MISSING_PARAMETER, "accel"); + error_setg(errp, "Parameter 'accel' is missing"); goto bad; } diff --git a/ui/input-barrier.c b/ui/input-barrier.c index 2d57ca7079..ecbba4adc2 100644 --- a/ui/input-barrier.c +++ b/ui/input-barrier.c @@ -493,7 +493,7 @@ static void input_barrier_complete(UserCreatable *uc, Error **errp) Error *local_err = NULL; if (!ib->name) { - error_setg(errp, QERR_MISSING_PARAMETER, "name"); + error_setg(errp, "Parameter 'name' is missing"); return; } diff --git a/ui/ui-qmp-cmds.c b/ui/ui-qmp-cmds.c index a95fd35948..0e350fc333 100644 --- a/ui/ui-qmp-cmds.c +++ b/ui/ui-qmp-cmds.c @@ -195,7 +195,7 @@ void qmp_client_migrate_info(const char *protocol, const char *hostname, } if (!has_port && !has_tls_port) { - error_setg(errp, QERR_MISSING_PARAMETER, "port/tls-port"); + error_setg(errp, "Parameter 'port/tls-port' is missing"); return; }