From nobody Mon Sep 22 02:19:07 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1758002109; cv=none; d=zohomail.com; s=zohoarc; b=S2CBabYY23FS/UU3NC/Edx2VElaSBZZwYpwDZSqJe0P9DACxD4Q5z0svYw/5LJA4+niGbf1PvCtHnmQcuMU7Guk4Ba+pwSA5sTxV74OES9yCBU5V4mrS89nitjjKkKW+G8R8IBVOXMliCHO8R3oWRodywEeJAfZU1GltusbONVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758002109; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PiwFxUnyG8dWIbP8fQG2LupwKBRzKhZ4u6pzMFSkzBo=; b=QmiTfnYsLAkn8RxmJNiEUPa5gIoffu3d1ya3mRdhwhGw09nh73kAM205cVGF4ullP1vS6yxsqQ/tMwibbovWQxbR8MTViN2Bx23irbB1oB6Eu3oMIS0fsvn09pDOq0nrfsieVs5CrXgdTomF1qZjdbra3wHKXt9Csd4qzGaShyM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758002109155938.6930742281182; Mon, 15 Sep 2025 22:55:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyOeO-0002ON-3s; Tue, 16 Sep 2025 01:54:48 -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 1uyOeG-0002LX-9J; Tue, 16 Sep 2025 01:54:40 -0400 Received: from [115.124.30.112] (helo=out30-112.freemail.mail.aliyun.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uyOeA-0004D0-RK; Tue, 16 Sep 2025 01:54:39 -0400 Received: from localhost(mailfrom:guobin@linux.alibaba.com fp:SMTPD_---0Wo76ENp_1758001731 cluster:ay36) by smtp.aliyun-inc.com; Tue, 16 Sep 2025 13:48:57 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1758002055; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=PiwFxUnyG8dWIbP8fQG2LupwKBRzKhZ4u6pzMFSkzBo=; b=UXc14f5To8M9YFK1FeVenqez2Cj30cTDCWU8Jj+mDZVm/mM3pFl9qMR4Zcj1LAzQFF0d9jzg7UxaBig2+z+cevN71EvGIdlQ1Jl3aI49cseZyRLXUb6BCOuOJiGgcoYYE1VTyDWGNlHlbNLZjygRPe2L0FsOS83jvYFKEtL13Mc= From: Bin Guo To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, qemu-block@nongnu.org, qemu-trivial@nongnu.org Subject: [PATCH] block/monitor: Use hmp_handle_error to report error Date: Tue, 16 Sep 2025 13:48:50 +0800 Message-Id: <20250916054850.40963-1-guobin@linux.alibaba.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 115.124.30.112 (deferred) 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=115.124.30.112; envelope-from=guobin@linux.alibaba.com; helo=out30-112.freemail.mail.aliyun.com X-Spam_score_int: -166 X-Spam_score: -16.7 X-Spam_bar: ---------------- X-Spam_report: (-16.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1758002111766116600 Content-Type: text/plain; charset="utf-8" According to writing-monitor-commands.rst, best practice is to use the 'hmp_handle_error' function, which ensures that the message gets an 'Error: ' prefix. Signed-off-by: Bin Guo --- block/monitor/block-hmp-cmds.c | 43 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index 282d1c386e..2f79a7360d 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -62,7 +62,7 @@ static void hmp_drive_add_node(Monitor *mon, const char *= optstr) { QemuOpts *opts; QDict *qdict; - Error *local_err =3D NULL; + Error *err =3D NULL; =20 opts =3D qemu_opts_parse_noisily(&qemu_drive_opts, optstr, false); if (!opts) { @@ -73,19 +73,19 @@ static void hmp_drive_add_node(Monitor *mon, const char= *optstr) =20 if (!qdict_get_try_str(qdict, "node-name")) { qobject_unref(qdict); - error_report("'node-name' needs to be specified"); + error_setg(&err, "'node-name' needs to be specified"); goto out; } =20 - BlockDriverState *bs =3D bds_tree_init(qdict, &local_err); + BlockDriverState *bs =3D bds_tree_init(qdict, &err); if (!bs) { - error_report_err(local_err); goto out; } =20 bdrv_set_monitor_owned(bs); out: qemu_opts_del(opts); + hmp_handle_error(mon, err); } =20 void hmp_drive_add(Monitor *mon, const QDict *qdict) @@ -109,7 +109,6 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict) mc =3D MACHINE_GET_CLASS(current_machine); dinfo =3D drive_new(opts, mc->block_default_type, &err); if (err) { - error_report_err(err); qemu_opts_del(opts); goto err; } @@ -123,7 +122,7 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict) monitor_printf(mon, "OK\n"); break; default: - monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->typ= e); + error_setg(&err, "Can't hot-add drive to type %d", dinfo->type); goto err; } return; @@ -134,6 +133,7 @@ err: monitor_remove_blk(blk); blk_unref(blk); } + hmp_handle_error(mon, err); } =20 void hmp_drive_del(Monitor *mon, const QDict *qdict) @@ -141,36 +141,32 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict) const char *id =3D qdict_get_str(qdict, "id"); BlockBackend *blk; BlockDriverState *bs; - Error *local_err =3D NULL; + Error *err =3D NULL; =20 GLOBAL_STATE_CODE(); bdrv_graph_rdlock_main_loop(); =20 bs =3D bdrv_find_node(id); if (bs) { - qmp_blockdev_del(id, &local_err); - if (local_err) { - error_report_err(local_err); - } + qmp_blockdev_del(id, &err); goto unlock; } =20 blk =3D blk_by_name(id); if (!blk) { - error_report("Device '%s' not found", id); + error_setg(&err, "Device '%s' not found", id); goto unlock; } =20 if (!blk_legacy_dinfo(blk)) { - error_report("Deleting device added with blockdev-add" + error_setg(&err, "Deleting device added with blockdev-add" " is not supported"); goto unlock; } =20 bs =3D blk_bs(blk); if (bs) { - if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_DRIVE_DEL, &local_err)) { - error_report_err(local_err); + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_DRIVE_DEL, &err)) { goto unlock; } =20 @@ -196,6 +192,7 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict) =20 unlock: bdrv_graph_rdunlock_main_loop(); + hmp_handle_error(mon, err); } =20 void hmp_commit(Monitor *mon, const QDict *qdict) @@ -203,6 +200,7 @@ void hmp_commit(Monitor *mon, const QDict *qdict) const char *device =3D qdict_get_str(qdict, "device"); BlockBackend *blk; int ret; + Error *err =3D NULL; =20 GLOBAL_STATE_CODE(); GRAPH_RDLOCK_GUARD_MAINLOOP(); @@ -214,22 +212,25 @@ void hmp_commit(Monitor *mon, const QDict *qdict) =20 blk =3D blk_by_name(device); if (!blk) { - error_report("Device '%s' not found", device); - return; + error_setg(&err, "Device '%s' not found", device); + goto end; } =20 bs =3D bdrv_skip_implicit_filters(blk_bs(blk)); =20 if (!blk_is_available(blk)) { - error_report("Device '%s' has no medium", device); - return; + error_setg(&err, "Device '%s' has no medium", device); + goto end; } =20 ret =3D bdrv_commit(bs); } if (ret < 0) { - error_report("'commit' error for '%s': %s", device, strerror(-ret)= ); + error_setg(&err, "'commit' error for '%s': %s", device, strerror(-= ret)); } + +end: + hmp_handle_error(mon, err); } =20 void hmp_drive_mirror(Monitor *mon, const QDict *qdict) @@ -890,7 +891,7 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdic= t) =20 bs =3D bdrv_all_find_vmstate_bs(NULL, false, NULL, &err); if (!bs) { - error_report_err(err); + hmp_handle_error(mon, err); return; } =20 --=20 2.39.5