From nobody Fri Nov 14 20:42:50 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761739732; cv=none; d=zohomail.com; s=zohoarc; b=kKYSLKvPVCgeUZVS/4fAbBxJorzXu5B6Nnj/VvtNNK+xN3fPbdmb/LFnRV2qs7xtokvFxD+Y73ykDWXFTFFbX7yAR3BcFZFeE7K9vnWXBKrOMZICM59ldEsb7b1ks6G1y1xfpgVyNim9w+U7qD5U5KqjwIP23EJbt8pu5SLrc14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761739732; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DJ9Mv3zheL8yiMMy+qv9PakzcarQeBzCNL8821e9Hug=; b=JCudlz0JiV3JHhia7+Z/bW2kuqhueqescuLX5pWQxC7m1p2yq3wcjfO0XpczRjRtQwaPpFtr0ifzAgXOlKNAnNu/7Dvx36kUuboS5VF393azzrlmS56HpiwOtsiRM7KHP+9jh0DScQgEmZVEhYDM56ngxPtmdhHekoNOSuyom6g= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761739732421278.02999154166673; Wed, 29 Oct 2025 05:08:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vE4xU-0003Da-Ph; Wed, 29 Oct 2025 08:07:21 -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 1vE4xG-00036X-If for qemu-devel@nongnu.org; Wed, 29 Oct 2025 08:07:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vE4x3-0004xb-AE for qemu-devel@nongnu.org; Wed, 29 Oct 2025 08:07:00 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-79B5HBJONfGDXQKdZqEr8w-1; Wed, 29 Oct 2025 08:06:47 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 69AEB180136E; Wed, 29 Oct 2025 12:06:46 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.44.33.204]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E60B0180057C; Wed, 29 Oct 2025 12:06:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761739610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DJ9Mv3zheL8yiMMy+qv9PakzcarQeBzCNL8821e9Hug=; b=MaT/P9+PJ5YwWn0e+7x1f5HFYzsDPF4AF4X1nd5jUmDoO7VL+c6Qpsv12LOzteLfqcu1oC lXYzUQq7avkSP8278CIVceuTqw4UK2f3c672NK76SAlfLaUbDvxL3cx9KYOkFLpdUVmriY 4ktTJR6ifRvp0sjPxoblbwAL1fXJ+CU= X-MC-Unique: 79B5HBJONfGDXQKdZqEr8w-1 X-Mimecast-MFC-AGG-ID: 79B5HBJONfGDXQKdZqEr8w_1761739606 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 04/18] block/monitor: Use hmp_handle_error to report error Date: Wed, 29 Oct 2025 13:06:20 +0100 Message-ID: <20251029120634.288467-5-kwolf@redhat.com> In-Reply-To: <20251029120634.288467-1-kwolf@redhat.com> References: <20251029120634.288467-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.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 @redhat.com) X-ZM-MESSAGEID: 1761739746366158500 Content-Type: text/plain; charset="utf-8" From: Bin Guo 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 Message-ID: <20250916054850.40963-1-guobin@linux.alibaba.com> Reviewed-by: Kevin Wolf [kwolf: Fixed up iotests reference output] Signed-off-by: Kevin Wolf --- block/monitor/block-hmp-cmds.c | 45 +++++++++++++++++----------------- tests/qemu-iotests/267.out | 8 +++--- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index 282d1c386e..3640d1f3dc 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" - " is not supported"); + 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 diff --git a/tests/qemu-iotests/267.out b/tests/qemu-iotests/267.out index f6f5d8715a..37b7ebd280 100644 --- a/tests/qemu-iotests/267.out +++ b/tests/qemu-iotests/267.out @@ -8,7 +8,7 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) savevm snap0 Error: no block device can store vmstate for snapshot (qemu) info snapshots -no block device can store vmstate for snapshot +Error: no block device can store vmstate for snapshot (qemu) loadvm snap0 Error: no block device can store vmstate for snapshot (qemu) quit @@ -22,7 +22,7 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) savevm snap0 Error: Device 'none0' is writable but does not support snapshots (qemu) info snapshots -no block device can store vmstate for snapshot +Error: no block device can store vmstate for snapshot (qemu) loadvm snap0 Error: Device 'none0' is writable but does not support snapshots (qemu) quit @@ -58,7 +58,7 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) savevm snap0 Error: Device 'virtio0' is writable but does not support snapshots (qemu) info snapshots -no block device can store vmstate for snapshot +Error: no block device can store vmstate for snapshot (qemu) loadvm snap0 Error: Device 'virtio0' is writable but does not support snapshots (qemu) quit @@ -83,7 +83,7 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) savevm snap0 Error: Device 'file' is writable but does not support snapshots (qemu) info snapshots -no block device can store vmstate for snapshot +Error: no block device can store vmstate for snapshot (qemu) loadvm snap0 Error: Device 'file' is writable but does not support snapshots (qemu) quit --=20 2.51.0