From nobody Wed Jun 24 21:40:36 2026 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=1782208664; cv=none; d=zohomail.com; s=zohoarc; b=NB49GZ2zUjyNsKqF0m6RSsskaHxXCiYRfS0WKYFh0aB95aw/r8K1zTVHBhiYFgfJIjWFHDalYKf0PHSmRncKQ507pLNKDw2nky12F2MVFYwaXyLI4mCsxIGOLzq2i/6NJYeupFTSwP/70O98rVD/PkdfTiFNwqSsL2D8Fs0fNMQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208664; h=Content-Type: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=cUYJ3UEKe4C8jUuI5kgIj+58uJc+8k5jFkGzZUDjTsg=; b=FEJNfA2O4YkIdGpOzQpTXJGGvz2DFf1Jq00VWZnfspI7MQcuqAghu8VgavNflYgS+QJjEjF5GV3M2uh8VWmqFRLdf7fdFbDtBvY73FL3MNO047FAP6aS01oICN6lbB0Q0EjmRos9/EWqma+9k5bxypkjMzrw/N+qyt0v52FEWEM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208664465505.0830346390478; Tue, 23 Jun 2026 02:57:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxrV-0003Pf-Lp; Tue, 23 Jun 2026 05:56:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxrT-0003P9-3s for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:07 -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 1wbxrQ-0003RB-W7 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:06 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-563-OaiHdUjLNNKjAYRb4Qozeg-1; Tue, 23 Jun 2026 05:56:02 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 663E41955BCE; Tue, 23 Jun 2026 09:56:01 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 74FF41624; Tue, 23 Jun 2026 09:55:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208564; 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=cUYJ3UEKe4C8jUuI5kgIj+58uJc+8k5jFkGzZUDjTsg=; b=O4+cmoY+oJMEzSAr6c7n2ExhdQ0yytjJBRWRzYioVvcKvzn9mB7yLaznEx1EKU7wJdZYAp 5ArddHMikfNdvfIGNOiDgUfJwa7rvXYlxVhfBBoiFQjrx1zW19jqBrDvv/xh8Wx+PUNmb4 8lm8j2XokBjl3xIpd2FdbORB2ufvmoA= X-MC-Unique: OaiHdUjLNNKjAYRb4Qozeg-1 X-Mimecast-MFC-AGG-ID: OaiHdUjLNNKjAYRb4Qozeg_1782208561 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 01/35] qom: replace 'can_be_deleted' with 'prepare_delete' Date: Tue, 23 Jun 2026 10:55:17 +0100 Message-ID: <20260623095551.2106712-2-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208666635158500 While most objects can perform all their cleanup in the finalizer method, there can be interactions with other resources / subsystems / threads which require that some cleanup be performed on an user creatable object before unparenting it and entering finalization. The current 'can_be_deleted' method runs in the deletion path and is intended to be used to block deletion. While it could be used to perform cleanup tasks, its name suggests it should be free of side-effects. Generalize this by renaming it to 'prepare_delete', explicitly allowing for cleanup to be provided. Existing users of 'can_be_deleted' are re-written, which provides them with more detailed/tailored error messages. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- backends/cryptodev.c | 10 +++++++--- backends/hostmem.c | 5 +++-- backends/iommufd.c | 10 +++++++--- block/throttle-groups.c | 10 +++++++--- event-loop-base.c | 8 ++++---- include/qom/object_interfaces.h | 26 +++++++++++++++++--------- include/system/event-loop-base.h | 2 +- net/can/can_core.c | 5 +++-- qom/object_interfaces.c | 14 ++++++-------- tests/qemu-iotests/245 | 4 ++-- util/main-loop.c | 5 +++-- 11 files changed, 60 insertions(+), 39 deletions(-) diff --git a/backends/cryptodev.c b/backends/cryptodev.c index 79f8882d3b..90110dc633 100644 --- a/backends/cryptodev.c +++ b/backends/cryptodev.c @@ -454,9 +454,13 @@ bool cryptodev_backend_is_ready(CryptoDevBackend *back= end) } =20 static bool -cryptodev_backend_can_be_deleted(UserCreatable *uc) +cryptodev_backend_prepare_delete(UserCreatable *uc, Error **errp) { - return !cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc)); + if (cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc))) { + error_setg(errp, "Cryptodev backend is still in use"); + return false; + } + return true; } =20 static void cryptodev_backend_instance_init(Object *obj) @@ -613,7 +617,7 @@ cryptodev_backend_class_init(ObjectClass *oc, const voi= d *data) UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); =20 ucc->complete =3D cryptodev_backend_complete; - ucc->can_be_deleted =3D cryptodev_backend_can_be_deleted; + ucc->prepare_delete =3D cryptodev_backend_prepare_delete; =20 QTAILQ_INIT(&crypto_clients); object_class_property_add(oc, "queues", "uint32", diff --git a/backends/hostmem.c b/backends/hostmem.c index cd2085fb3c..eb915c64bc 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -434,9 +434,10 @@ host_memory_backend_memory_complete(UserCreatable *uc,= Error **errp) } =20 static bool -host_memory_backend_can_be_deleted(UserCreatable *uc) +host_memory_backend_prepare_delete(UserCreatable *uc, Error **errp) { if (host_memory_backend_is_mapped(MEMORY_BACKEND(uc))) { + error_setg(errp, "Host memory backend is still mapped"); return false; } else { return true; @@ -508,7 +509,7 @@ host_memory_backend_class_init(ObjectClass *oc, const v= oid *data) UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); =20 ucc->complete =3D host_memory_backend_memory_complete; - ucc->can_be_deleted =3D host_memory_backend_can_be_deleted; + ucc->prepare_delete =3D host_memory_backend_prepare_delete; =20 object_class_property_add_bool(oc, "merge", host_memory_backend_get_merge, diff --git a/backends/iommufd.c b/backends/iommufd.c index 09624cd652..7af49f6de3 100644 --- a/backends/iommufd.c +++ b/backends/iommufd.c @@ -63,11 +63,15 @@ static void iommufd_backend_set_fd(Object *obj, const c= har *str, Error **errp) trace_iommu_backend_set_fd(be->fd); } =20 -static bool iommufd_backend_can_be_deleted(UserCreatable *uc) +static bool iommufd_backend_prepare_delete(UserCreatable *uc, Error **errp) { IOMMUFDBackend *be =3D IOMMUFD_BACKEND(uc); =20 - return !be->users; + if (be->users) { + error_setg(errp, "IOMMUFD backend still has %d users", be->users); + return false; + } + return true; } =20 static void iommufd_backend_complete(UserCreatable *uc, Error **errp) @@ -92,7 +96,7 @@ static void iommufd_backend_class_init(ObjectClass *oc, c= onst void *data) { UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); =20 - ucc->can_be_deleted =3D iommufd_backend_can_be_deleted; + ucc->prepare_delete =3D iommufd_backend_prepare_delete; ucc->complete =3D iommufd_backend_complete; =20 object_class_property_add_str(oc, "fd", NULL, iommufd_backend_set_fd); diff --git a/block/throttle-groups.c b/block/throttle-groups.c index 4b1b1944c2..7836fc4c76 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -960,9 +960,13 @@ static void throttle_group_get_limits(Object *obj, Vis= itor *v, visit_type_ThrottleLimits(v, name, &argp, errp); } =20 -static bool throttle_group_can_be_deleted(UserCreatable *uc) +static bool throttle_group_prepare_delete(UserCreatable *uc, Error **errp) { - return OBJECT(uc)->ref =3D=3D 1; + if (OBJECT(uc)->ref > 1) { + error_setg(errp, "Throttle group still has multiple references"); + return false; + } + return true; } =20 static void throttle_group_obj_class_init(ObjectClass *klass, @@ -972,7 +976,7 @@ static void throttle_group_obj_class_init(ObjectClass *= klass, UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(klass); =20 ucc->complete =3D throttle_group_obj_complete; - ucc->can_be_deleted =3D throttle_group_can_be_deleted; + ucc->prepare_delete =3D throttle_group_prepare_delete; =20 /* individual properties */ for (i =3D 0; i < sizeof(properties) / sizeof(ThrottleParamInfo); i++)= { diff --git a/event-loop-base.c b/event-loop-base.c index 8ca143bea4..ee5987ddbf 100644 --- a/event-loop-base.c +++ b/event-loop-base.c @@ -85,13 +85,13 @@ static void event_loop_base_complete(UserCreatable *uc,= Error **errp) } } =20 -static bool event_loop_base_can_be_deleted(UserCreatable *uc) +static bool event_loop_base_prepare_delete(UserCreatable *uc, Error **errp) { EventLoopBaseClass *bc =3D EVENT_LOOP_BASE_GET_CLASS(uc); EventLoopBase *backend =3D EVENT_LOOP_BASE(uc); =20 - if (bc->can_be_deleted) { - return bc->can_be_deleted(backend); + if (bc->prepare_delete) { + return bc->prepare_delete(backend, errp); } =20 return true; @@ -102,7 +102,7 @@ static void event_loop_base_class_init(ObjectClass *kla= ss, { UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(klass); ucc->complete =3D event_loop_base_complete; - ucc->can_be_deleted =3D event_loop_base_can_be_deleted; + ucc->prepare_delete =3D event_loop_base_prepare_delete; =20 object_class_property_add(klass, "aio-max-batch", "int", event_loop_base_get_param, diff --git a/include/qom/object_interfaces.h b/include/qom/object_interface= s.h index e2b8615617..afd0fb93b2 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -20,8 +20,10 @@ typedef struct UserCreatable UserCreatable; * UserCreatableClass: * @parent_class: the base class * @complete: callback to be called after @obj's properties are set. - * @can_be_deleted: callback to be called before an object is removed - * to check if @obj can be removed safely. + * @prepare_delete: to be called before an attempt to delete @obj + * to validate whether the object can be deleted and trigger any + * cleanup of any resources which have to be dealt with before the + * object is unparented and enters finalization. * * Interface is designed to work with -object/object-add/object_add * commands. @@ -36,7 +38,9 @@ typedef struct UserCreatable UserCreatable; * For objects created without using -object/object-add/object_add, * @user_creatable_complete() wrapper should be called manually if * object's type implements USER_CREATABLE interface and needs - * complete() callback to be called. + * complete() callback to be called. Similarly @user_creatable_prepare_del= ete() + * should be called manually prior to an attempt to the delete the + * object. */ struct UserCreatableClass { /* */ @@ -44,7 +48,7 @@ struct UserCreatableClass { =20 /* */ void (*complete)(UserCreatable *uc, Error **errp); - bool (*can_be_deleted)(UserCreatable *uc); + bool (*prepare_delete)(UserCreatable *uc, Error **errp); }; =20 /** @@ -61,13 +65,17 @@ struct UserCreatableClass { bool user_creatable_complete(UserCreatable *uc, Error **errp); =20 /** - * user_creatable_can_be_deleted: - * @uc: the object whose can_be_deleted() method is called if implemented + * user_creatable_prepare_delete: + * @uc: the user-creatable object whose prepare_delete() method is called + * @errp: if an error occurs, a pointer to an area to store the error + * + * Wrapper to call prepare_delete() class method if defined, otherwise + * does nothing. * - * Wrapper to call can_be_deleted() method if one of types it's inherited - * from implements USER_CREATABLE interface. + * Returns: %true on success or if prepare_delete() is not defined, + * %false on failure. */ -bool user_creatable_can_be_deleted(UserCreatable *uc); +bool user_creatable_prepare_delete(UserCreatable *uc, Error **errp); =20 /** * user_creatable_add_qapi: diff --git a/include/system/event-loop-base.h b/include/system/event-loop-b= ase.h index 130629e7f3..1e1e427ac7 100644 --- a/include/system/event-loop-base.h +++ b/include/system/event-loop-base.h @@ -24,7 +24,7 @@ struct EventLoopBaseClass { =20 void (*init)(EventLoopBase *base, Error **errp); void (*update_params)(EventLoopBase *base, Error **errp); - bool (*can_be_deleted)(EventLoopBase *base); + bool (*prepare_delete)(EventLoopBase *base, Error **errp); }; =20 struct EventLoopBase { diff --git a/net/can/can_core.c b/net/can/can_core.c index 77fe2b8ba4..8df9375167 100644 --- a/net/can/can_core.c +++ b/net/can/can_core.c @@ -143,8 +143,9 @@ int can_bus_client_set_filters(CanBusClientState *clien= t, } =20 =20 -static bool can_bus_can_be_deleted(UserCreatable *uc) +static bool can_bus_prepare_delete(UserCreatable *uc, Error **errp) { + error_setg(errp, "Deleting can bus devices is not supported"); return false; } =20 @@ -153,7 +154,7 @@ static void can_bus_class_init(ObjectClass *klass, { UserCreatableClass *uc_klass =3D USER_CREATABLE_CLASS(klass); =20 - uc_klass->can_be_deleted =3D can_bus_can_be_deleted; + uc_klass->prepare_delete =3D can_bus_prepare_delete; } =20 static const TypeInfo can_bus_info =3D { diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 7080f85f95..6faa0b2fd9 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -32,16 +32,15 @@ bool user_creatable_complete(UserCreatable *uc, Error *= *errp) return !*errp; } =20 -bool user_creatable_can_be_deleted(UserCreatable *uc) +bool user_creatable_prepare_delete(UserCreatable *uc, Error **errp) { - UserCreatableClass *ucc =3D USER_CREATABLE_GET_CLASS(uc); + ERRP_GUARD(); =20 - if (ucc->can_be_deleted) { - return ucc->can_be_deleted(uc); - } else { - return true; + if (ucc->prepare_delete) { + ucc->prepare_delete(uc, errp); } + return !*errp; } =20 void user_creatable_add_qapi(ObjectOptions *options, Error **errp) @@ -253,8 +252,7 @@ bool user_creatable_del(const char *id, Error **errp) return false; } =20 - if (!user_creatable_can_be_deleted(USER_CREATABLE(obj))) { - error_setg(errp, "object '%s' is in use, can not be deleted", id); + if (!user_creatable_prepare_delete(USER_CREATABLE(obj), errp)) { return false; } =20 diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245 index f96610f510..e161bcfda9 100755 --- a/tests/qemu-iotests/245 +++ b/tests/qemu-iotests/245 @@ -801,7 +801,7 @@ class TestBlockdevReopen(iotests.QMPTestCase): # Now group1 is in use, it cannot be deleted result =3D self.vm.qmp('object-del', id =3D 'group1') self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', "object 'group1' is in use, = can not be deleted") + self.assert_qmp(result, 'error/desc', "Throttle group still has mu= ltiple references") =20 # Default options, this switches the group back to group0 self.reopen(opts) @@ -809,7 +809,7 @@ class TestBlockdevReopen(iotests.QMPTestCase): # So now we cannot delete group0 result =3D self.vm.qmp('object-del', id =3D 'group0') self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', "object 'group0' is in use, = can not be deleted") + self.assert_qmp(result, 'error/desc', "Throttle group still has mu= ltiple references") =20 # But group1 is free this time, and it can be deleted self.vm.cmd('object-del', id =3D 'group1') diff --git a/util/main-loop.c b/util/main-loop.c index ad8645c30a..67ee06c311 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -218,8 +218,9 @@ static void main_loop_init(EventLoopBase *base, Error *= *errp) mloop =3D m; } =20 -static bool main_loop_can_be_deleted(EventLoopBase *base) +static bool main_loop_prepare_delete(EventLoopBase *base, Error **errp) { + error_setg(errp, "Deleting main loop is not supported"); return false; } =20 @@ -229,7 +230,7 @@ static void main_loop_class_init(ObjectClass *oc, const= void *class_data) =20 bc->init =3D main_loop_init; bc->update_params =3D main_loop_update_params; - bc->can_be_deleted =3D main_loop_can_be_deleted; + bc->prepare_delete =3D main_loop_prepare_delete; } =20 static const TypeInfo main_loop_info =3D { --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208598; cv=none; d=zohomail.com; s=zohoarc; b=TGWYvQm7JANsp4JXgHNonkyobgZHwUW3gxuYZAcXVmor2a1+GXTd1CJl3p3Z0iKdG/WZPI356+z6azcCsNkZmL9iN5cSY+ZgAi7zvIYazN8+g/6as94co/Bm2KkH8xBOH+Sa8UdGIqzRrprbSGzxcyOoLdF2z9k8QvWdBL8tq8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208598; h=Content-Type: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=2jbJGdDn1mV7YLShN6kcwXeS8ouup3eLUogwItGVtLQ=; b=XbJMHDG59NKU+z5IZgoXLkYAVy2pj5mcyR6bFGolUN0RDX9pqx9LyOMDHq79C/k8BsMrZeDphIJEY9rmcmLkV899qhq4l0IQu7PFWi647EpCyzadcn0IWlXMV6aoPpdoBDv5dsChO4ALwEOarwYA0CSGie/OASr0xFKx65O1ei0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208598463913.2528550721597; Tue, 23 Jun 2026 02:56:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxra-0003Qc-U8; Tue, 23 Jun 2026 05:56:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxrZ-0003Q6-HQ for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:13 -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 1wbxrX-0003SJ-KB for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:13 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-383-9vHTHaaxMmOlVeaZJTqmrA-1; Tue, 23 Jun 2026 05:56:07 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 85CC51955F16; Tue, 23 Jun 2026 09:56:05 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F269B175F; Tue, 23 Jun 2026 09:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208570; 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=2jbJGdDn1mV7YLShN6kcwXeS8ouup3eLUogwItGVtLQ=; b=DCSAIAGVxVRgLj3+38lgKXrk2iQAUjMWxT1Qfm+J2fqeub7tIn+P0IzYbakXyfIANLdv4R C/TSEPYJnt9WoDZYh/yiOHRQPJ+x3Qyc6WsuMetlfwkKLxlG9XzvNl2LvelZohLcmdlEPK +Ne4RohIx4VC38BHq784+oOA9WW+1OY= X-MC-Unique: 9vHTHaaxMmOlVeaZJTqmrA-1 X-Mimecast-MFC-AGG-ID: 9vHTHaaxMmOlVeaZJTqmrA_1782208565 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 02/35] monitor: replace 'common' with 'parent_obj' in MonitorHMP Date: Tue, 23 Jun 2026 10:55:18 +0100 Message-ID: <20260623095551.2106712-3-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208601809158500 The field name 'parent_obj' is standard practice for QOM structs so align the HMP monitor. Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/hmp-cmds.c | 2 +- monitor/hmp.c | 43 ++++++++++++++++++++------------------ monitor/monitor-internal.h | 2 +- monitor/monitor.c | 6 +++--- monitor/qmp-cmds.c | 10 ++++----- ui/ui-hmp-cmds.c | 2 +- 6 files changed, 34 insertions(+), 31 deletions(-) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 443b8c785d..e139caeba9 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -287,7 +287,7 @@ void hmp_info_sync_profile(Monitor *mon, const QDict *q= dict) =20 void hmp_info_history(Monitor *mon, const QDict *qdict) { - MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, common); + MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, parent_obj); int i; const char *str; =20 diff --git a/monitor/hmp.c b/monitor/hmp.c index cc4390486e..3dde52ddbe 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -48,9 +48,9 @@ static void monitor_command_cb(void *opaque, const char *= cmdline, { MonitorHMP *mon =3D opaque; =20 - monitor_suspend(&mon->common); + monitor_suspend(&mon->parent_obj); handle_hmp_command(mon, cmdline); - monitor_resume(&mon->common); + monitor_resume(&mon->parent_obj); } =20 void monitor_read_command(MonitorHMP *mon, int show_prompt) @@ -73,7 +73,7 @@ int monitor_read_password(MonitorHMP *mon, ReadLineFunc *= readline_func, /* prompt is printed on return from the command handler */ return 0; } else { - monitor_printf(&mon->common, + monitor_printf(&mon->parent_obj, "terminal does not support password prompting\n"); return -ENOTTY; } @@ -695,7 +695,7 @@ static const HMPCommand *monitor_parse_command(MonitorH= MP *hmp_mon, const char **cmdp, HMPCommand *table) { - Monitor *mon =3D &hmp_mon->common; + Monitor *mon =3D &hmp_mon->parent_obj; const char *p; const HMPCommand *cmd; char cmdname[256]; @@ -1188,35 +1188,37 @@ void handle_hmp_command(MonitorHMP *mon, const char= *cmdline) =20 if (!cmd->cmd && !cmd->cmd_info_hrt) { /* FIXME: is it useful to try autoload modules here ??? */ - monitor_printf(&mon->common, "Command \"%.*s\" is not available.\n= ", + monitor_printf(&mon->parent_obj, "Command \"%.*s\" is not availabl= e.\n", (int)(cmdline - cmd_start), cmd_start); return; } =20 - qdict =3D monitor_parse_arguments(&mon->common, &cmdline, cmd); + qdict =3D monitor_parse_arguments(&mon->parent_obj, &cmdline, cmd); if (!qdict) { while (cmdline > cmd_start && qemu_isspace(cmdline[-1])) { cmdline--; } - monitor_printf(&mon->common, "Try \"help %.*s\" for more informati= on\n", + monitor_printf(&mon->parent_obj, + "Try \"help %.*s\" for more information\n", (int)(cmdline - cmd_start), cmd_start); return; } =20 if (!cmd->coroutine) { /* old_mon is non-NULL when called from qmp_human_monitor_command(= ) */ - Monitor *old_mon =3D monitor_set_cur(qemu_coroutine_self(), &mon->= common); - handle_hmp_command_exec(&mon->common, cmd, qdict); + Monitor *old_mon =3D monitor_set_cur(qemu_coroutine_self(), + &mon->parent_obj); + handle_hmp_command_exec(&mon->parent_obj, cmd, qdict); monitor_set_cur(qemu_coroutine_self(), old_mon); } else { HandleHmpCommandCo data =3D { - .mon =3D &mon->common, + .mon =3D &mon->parent_obj, .cmd =3D cmd, .qdict =3D qdict, .done =3D false, }; Coroutine *co =3D qemu_coroutine_create(handle_hmp_command_co, &da= ta); - monitor_set_cur(co, &mon->common); + monitor_set_cur(co, &mon->parent_obj); aio_co_enter(qemu_get_aio_context(), co); AIO_WAIT_WHILE_UNLOCKED(NULL, !data.done); } @@ -1434,7 +1436,7 @@ cleanup: =20 static void monitor_read(void *opaque, const uint8_t *buf, int size) { - MonitorHMP *mon =3D container_of(opaque, MonitorHMP, common); + MonitorHMP *mon =3D container_of(opaque, MonitorHMP, parent_obj); int i; =20 if (mon->rs) { @@ -1443,7 +1445,7 @@ static void monitor_read(void *opaque, const uint8_t = *buf, int size) } } else { if (size =3D=3D 0 || buf[size - 1] !=3D 0) { - monitor_printf(&mon->common, "corrupted command\n"); + monitor_printf(&mon->parent_obj, "corrupted command\n"); } else { handle_hmp_command(mon, (char *)buf); } @@ -1512,26 +1514,26 @@ static void G_GNUC_PRINTF(2, 3) monitor_readline_pr= intf(void *opaque, MonitorHMP *mon =3D opaque; va_list ap; va_start(ap, fmt); - monitor_vprintf(&mon->common, fmt, ap); + monitor_vprintf(&mon->parent_obj, fmt, ap); va_end(ap); } =20 static void monitor_readline_flush(void *opaque) { MonitorHMP *mon =3D opaque; - monitor_flush(&mon->common); + monitor_flush(&mon->parent_obj); } =20 void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp) { MonitorHMP *mon =3D g_new0(MonitorHMP, 1); =20 - if (!qemu_chr_fe_init(&mon->common.chr, chr, errp)) { + if (!qemu_chr_fe_init(&mon->parent_obj.chr, chr, errp)) { g_free(mon); return; } =20 - monitor_data_init(&mon->common, false, false, false); + monitor_data_init(&mon->parent_obj, false, false, false); =20 mon->use_readline =3D use_readline; if (mon->use_readline) { @@ -1542,9 +1544,10 @@ void monitor_init_hmp(Chardev *chr, bool use_readlin= e, Error **errp) monitor_read_command(mon, 0); } =20 - qemu_chr_fe_set_handlers(&mon->common.chr, monitor_can_read, monitor_r= ead, - monitor_event, NULL, &mon->common, NULL, true= ); - monitor_list_append(&mon->common); + qemu_chr_fe_set_handlers(&mon->parent_obj.chr, + monitor_can_read, monitor_read, monitor_event, + NULL, &mon->parent_obj, NULL, true); + monitor_list_append(&mon->parent_obj); } =20 /** diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index a5c4aba306..eb301ea796 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -128,7 +128,7 @@ struct Monitor { }; =20 struct MonitorHMP { - Monitor common; + Monitor parent_obj; bool use_readline; /* * State used only in the thread "owning" the monitor. diff --git a/monitor/monitor.c b/monitor/monitor.c index 00b93ed612..2a1b511ff4 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -132,7 +132,7 @@ static inline bool monitor_is_hmp_non_interactive(const= Monitor *mon) return false; } =20 - return !monitor_uses_readline(container_of(mon, MonitorHMP, common)); + return !monitor_uses_readline(container_of(mon, MonitorHMP, parent_obj= )); } =20 static gboolean monitor_unblocked(void *do_not_use, GIOCondition cond, @@ -542,7 +542,7 @@ static void monitor_accept_input(void *opaque) =20 qemu_mutex_lock(&mon->mon_lock); if (!monitor_is_qmp(mon) && mon->reset_seen) { - MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, common); + MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, parent_obj); assert(hmp_mon->rs); readline_restart(hmp_mon->rs); qemu_mutex_unlock(&mon->mon_lock); @@ -627,7 +627,7 @@ void monitor_data_destroy(Monitor *mon) if (monitor_is_qmp(mon)) { monitor_data_destroy_qmp(container_of(mon, MonitorQMP, common)); } else { - readline_free(container_of(mon, MonitorHMP, common)->rs); + readline_free(container_of(mon, MonitorHMP, parent_obj)->rs); } g_string_free(mon->outbuf, true); qemu_mutex_destroy(&mon->mon_lock); diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 0c409c27dc..aa9ee8a391 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -168,10 +168,10 @@ char *qmp_human_monitor_command(const char *command_l= ine, bool has_cpu_index, char *output =3D NULL; MonitorHMP hmp =3D {}; =20 - monitor_data_init(&hmp.common, false, true, false); + monitor_data_init(&hmp.parent_obj, false, true, false); =20 if (has_cpu_index) { - int ret =3D monitor_set_cpu(&hmp.common, cpu_index); + int ret =3D monitor_set_cpu(&hmp.parent_obj, cpu_index); if (ret < 0) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number"); @@ -181,12 +181,12 @@ char *qmp_human_monitor_command(const char *command_l= ine, bool has_cpu_index, =20 handle_hmp_command(&hmp, command_line); =20 - WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) { - output =3D g_strdup(hmp.common.outbuf->str); + WITH_QEMU_LOCK_GUARD(&hmp.parent_obj.mon_lock) { + output =3D g_strdup(hmp.parent_obj.outbuf->str); } =20 out: - monitor_data_destroy(&hmp.common); + monitor_data_destroy(&hmp.parent_obj); return output; } =20 diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c index ee3e731d07..06f4030ce4 100644 --- a/ui/ui-hmp-cmds.c +++ b/ui/ui-hmp-cmds.c @@ -343,7 +343,7 @@ void hmp_change_vnc(Monitor *mon, const char *device, c= onst char *target, return; } if (!arg) { - MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, common); + MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, parent_obj); monitor_read_password(hmp_mon, hmp_change_read_arg, NULL); } else { qmp_change_vnc_password(arg, errp); --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208616; cv=none; d=zohomail.com; s=zohoarc; b=Du7z6tr54cyiDppwlwbbBFiH9o/vp79+1EV8T3OaH0YP0zWXixElqvJRoZOeIPWiFy7n6aZ/3Ddb8XsFLm4r1GkGGp55JN0B0W9vGRIJ/TAJxVP/g+jZJyI3ozu5yTDjnqnYaay4EbkNJy31Qcb8M7tPgd3g14O5FEwFhgDwBOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208616; h=Content-Type: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=EhsdLEhHl4gNq4P6IZk1pQRCCUKKg0y40G31gzpC4uY=; b=a3vOcm7NaX3rb07XSRHlT+ECJZ+WjCIx4KU0qbMQv1DP4vrmzemmxpI2nWEBgw+VTZEhtOkmL5K1iDA9UHq9SicPAE+J0kvB4zwxWbpDQk8xOFfHbnYghzT+c2kjqS17c58RVY7cofXhTTeQzymOx4JE5w2m1eS2H8H2R0luBgs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208616290890.4457455202178; Tue, 23 Jun 2026 02:56:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxrc-0003Qs-2f; Tue, 23 Jun 2026 05:56:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxra-0003QI-Lb for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:14 -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 1wbxrY-0003SR-UA for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:14 -0400 Received: from mx-prod-mc-06.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-609-esipJEUqPnqgJDoXUOlQ-g-1; Tue, 23 Jun 2026 05:56:10 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 50E911800597; Tue, 23 Jun 2026 09:56:09 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0262BD6E; Tue, 23 Jun 2026 09:56:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208572; 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=EhsdLEhHl4gNq4P6IZk1pQRCCUKKg0y40G31gzpC4uY=; b=XC91ce/anL4FidxdsToWq4iULsgPs5ZbS5FVeCBOPBQNybOI8JlTYoXw8NEhuEYuONtRpD mWR9nZgtaXRtTczCbWBuTGqSzPXtmrnUDMWTpBjmj/F+JasbTdNdj32vKYeEGjMVVCrQX1 RSzKWMGNHyAbyNb0Rh87XP0CNlrrM50= X-MC-Unique: esipJEUqPnqgJDoXUOlQ-g-1 X-Mimecast-MFC-AGG-ID: esipJEUqPnqgJDoXUOlQ-g_1782208569 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 03/35] monitor: replace 'common' with 'parent_obj' in MonitorQMP Date: Tue, 23 Jun 2026 10:55:19 +0100 Message-ID: <20260623095551.2106712-4-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1782208618428158500 The field name 'parent_obj' is standard practice for QOM structs so align the QMP monitor. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/monitor-internal.h | 2 +- monitor/monitor.c | 4 ++-- monitor/qmp-cmds-control.c | 4 ++-- monitor/qmp.c | 40 +++++++++++++++++++------------------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index eb301ea796..4da2b2a677 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -141,7 +141,7 @@ struct MonitorHMP { }; =20 typedef struct { - Monitor common; + Monitor parent_obj; JSONMessageParser parser; bool pretty; /* diff --git a/monitor/monitor.c b/monitor/monitor.c index 2a1b511ff4..0b7b464ebe 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -308,7 +308,7 @@ static void monitor_qapi_event_emit(QAPIEvent event, QD= ict *qdict) continue; } =20 - qmp_mon =3D container_of(mon, MonitorQMP, common); + qmp_mon =3D container_of(mon, MonitorQMP, parent_obj); { QEMU_LOCK_GUARD(&mon->mon_lock); if (qmp_mon->commands =3D=3D &qmp_cap_negotiation_commands) { @@ -625,7 +625,7 @@ void monitor_data_destroy(Monitor *mon) g_free(mon->mon_cpu_path); qemu_chr_fe_deinit(&mon->chr, false); if (monitor_is_qmp(mon)) { - monitor_data_destroy_qmp(container_of(mon, MonitorQMP, common)); + monitor_data_destroy_qmp(container_of(mon, MonitorQMP, parent_obj)= ); } else { readline_free(container_of(mon, MonitorHMP, parent_obj)->rs); } diff --git a/monitor/qmp-cmds-control.c b/monitor/qmp-cmds-control.c index 150ca9f5cb..af6a2a118b 100644 --- a/monitor/qmp-cmds-control.c +++ b/monitor/qmp-cmds-control.c @@ -76,7 +76,7 @@ void qmp_qmp_capabilities(bool has_enable, QMPCapabilityL= ist *enable, MonitorQMP *mon; =20 assert(monitor_is_qmp(cur_mon)); - mon =3D container_of(cur_mon, MonitorQMP, common); + mon =3D container_of(cur_mon, MonitorQMP, parent_obj); =20 if (mon->commands =3D=3D &qmp_commands) { error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, @@ -126,7 +126,7 @@ CommandInfoList *qmp_query_commands(Error **errp) MonitorQMP *mon; =20 assert(monitor_is_qmp(cur_mon)); - mon =3D container_of(cur_mon, MonitorQMP, common); + mon =3D container_of(cur_mon, MonitorQMP, parent_obj); =20 qmp_for_each_command(mon->commands, query_commands_cb, &list); =20 diff --git a/monitor/qmp.c b/monitor/qmp.c index 687019811f..27934206db 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -80,7 +80,7 @@ static void monitor_qmp_caps_reset(MonitorQMP *mon) { memset(mon->capab_offered, 0, sizeof(mon->capab_offered)); memset(mon->capab, 0, sizeof(mon->capab)); - mon->capab_offered[QMP_CAPABILITY_OOB] =3D mon->common.use_io_thread; + mon->capab_offered[QMP_CAPABILITY_OOB] =3D mon->parent_obj.use_io_thre= ad; } =20 static void qmp_request_free(QMPRequest *req) @@ -124,7 +124,7 @@ static void monitor_qmp_cleanup_queue_and_resume(Monito= rQMP *mon) * when we get here while the monitor is suspended. An * unfortunately timed CHR_EVENT_CLOSED can do the trick. */ - monitor_resume(&mon->common); + monitor_resume(&mon->parent_obj); } =20 } @@ -139,7 +139,7 @@ void qmp_send_response(MonitorQMP *mon, const QDict *rs= p) trace_monitor_qmp_respond(mon, json->str); =20 g_string_append_c(json, '\n'); - monitor_puts(&mon->common, json->str); + monitor_puts(&mon->parent_obj, json->str); =20 g_string_free(json, true); } @@ -166,7 +166,7 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObje= ct *req) QDict *error; =20 rsp =3D qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon), - &mon->common); + &mon->parent_obj); =20 if (mon->commands =3D=3D &qmp_cap_negotiation_commands) { error =3D qdict_get_qdict(rsp, "error"); @@ -207,7 +207,7 @@ static QMPRequest *monitor_qmp_requests_pop_any_with_lo= ck(void) continue; } =20 - qmp_mon =3D container_of(mon, MonitorQMP, common); + qmp_mon =3D container_of(mon, MonitorQMP, parent_obj); qemu_mutex_lock(&qmp_mon->qmp_queue_lock); req_obj =3D g_queue_pop_head(qmp_mon->qmp_requests); if (req_obj) { @@ -302,7 +302,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) oob_enabled =3D qmp_oob_enabled(mon); if (oob_enabled && mon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX - 1)= { - monitor_resume(&mon->common); + monitor_resume(&mon->parent_obj); } =20 /* @@ -343,7 +343,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) } =20 if (!oob_enabled) { - monitor_resume(&mon->common); + monitor_resume(&mon->parent_obj); } =20 qmp_request_free(req_obj); @@ -408,7 +408,7 @@ static void handle_qmp_command(void *opaque, QObject *r= eq, Error *err) */ if (!qmp_oob_enabled(mon) || mon->qmp_requests->length =3D=3D QMP_REQ_QUEUE_LEN_MAX - 1) { - monitor_suspend(&mon->common); + monitor_suspend(&mon->parent_obj); } =20 /* @@ -462,7 +462,7 @@ static void monitor_qmp_event(void *opaque, QEMUChrEven= t event) =20 switch (event) { case CHR_EVENT_OPENED: - WITH_QEMU_LOCK_GUARD(&mon->common.mon_lock) { + WITH_QEMU_LOCK_GUARD(&mon->parent_obj.mon_lock) { mon->commands =3D &qmp_cap_negotiation_commands; monitor_qmp_caps_reset(mon); } @@ -504,27 +504,27 @@ static void monitor_qmp_setup_handlers_bh(void *opaqu= e) MonitorQMP *mon =3D opaque; GMainContext *context; =20 - assert(mon->common.use_io_thread); + assert(mon->parent_obj.use_io_thread); context =3D iothread_get_g_main_context(mon_iothread); assert(context); - qemu_chr_fe_set_handlers(&mon->common.chr, monitor_can_read, + qemu_chr_fe_set_handlers(&mon->parent_obj.chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, - NULL, &mon->common, context, true); - monitor_list_append(&mon->common); + NULL, &mon->parent_obj, context, true); + monitor_list_append(&mon->parent_obj); } =20 void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp) { MonitorQMP *mon =3D g_new0(MonitorQMP, 1); =20 - if (!qemu_chr_fe_init(&mon->common.chr, chr, errp)) { + if (!qemu_chr_fe_init(&mon->parent_obj.chr, chr, errp)) { g_free(mon); return; } - qemu_chr_fe_set_echo(&mon->common.chr, true); + qemu_chr_fe_set_echo(&mon->parent_obj.chr, true); =20 /* Note: we run QMP monitor in I/O thread when @chr supports that */ - monitor_data_init(&mon->common, true, false, + monitor_data_init(&mon->parent_obj, true, false, qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT= )); =20 mon->pretty =3D pretty; @@ -533,7 +533,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error = **errp) mon->qmp_requests =3D g_queue_new(); =20 json_message_parser_init(&mon->parser, handle_qmp_command, mon, NULL); - if (mon->common.use_io_thread) { + if (mon->parent_obj.use_io_thread) { /* * Make sure the old iowatch is gone. It's possible when * e.g. the chardev is in client mode, with wait=3Don. @@ -553,9 +553,9 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error = **errp) monitor_qmp_setup_handlers_bh, mon); /* The bottom half will add @mon to @mon_list */ } else { - qemu_chr_fe_set_handlers(&mon->common.chr, monitor_can_read, + qemu_chr_fe_set_handlers(&mon->parent_obj.chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, - NULL, &mon->common, NULL, true); - monitor_list_append(&mon->common); + NULL, &mon->parent_obj, NULL, true); + monitor_list_append(&mon->parent_obj); } } --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208607; cv=none; d=zohomail.com; s=zohoarc; b=GNd3xHvpLK+d6eRksy0+mw/+4BOvKdatZYebnIkIa2DuI/vR1X6d9/KDIkEPmgm8vQ0uKKIdp23qNrt7lFtTUlnTE70ZsaOGU8ckcMwa7j59NYadcoctRoFnt0KFW1thAgzKBi7riSa3GXSKhUUk20NdS9yzWiJBA+OW2Z3Flvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208607; h=Content-Type: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=4YMrlQLU78aew76wjufIZ51YcN2K9/YKVlWPxPgpBC4=; b=UlpqBfEozfFogfUd/tp3xRt6j1xTCah/ZbEwrf63lf7PmJLi//z+F7vwKWo0lfqzwT1f15sLXgbWPueFu3z0Lc+lztkOuMt4UXKEHZDfEcoTynCreubTOsvQzUXJBD0RiPeU0S62lVlSSpV3/gH4c7AgnBzobr2PZALb13xha+w= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208607529744.6004228005556; Tue, 23 Jun 2026 02:56:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxri-0003RW-BC; Tue, 23 Jun 2026 05:56:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxrg-0003R7-Qx for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxrf-0003Sy-4F for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:20 -0400 Received: from mx-prod-mc-06.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-372-WzbbUqLrNLGQqEvJJuM7Pw-1; Tue, 23 Jun 2026 05:56:14 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 585A71800598; Tue, 23 Jun 2026 09:56:13 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0E62FD6E; Tue, 23 Jun 2026 09:56:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208578; 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=4YMrlQLU78aew76wjufIZ51YcN2K9/YKVlWPxPgpBC4=; b=Yl/vR/h7cKX9Jn9LSmls4cnFWSeAZPCUfa0fHQmvpJki9J4NAK84H6nRDknCvmMpW8lfM6 gXdOhW8kxoh/P4OIl3UccmM1Yd77W62yveafUVr4gk19awutwQmuWLaUTKRpvNU0ReIUVD KC8kx7JNdRFK/8jdbC11Vjrx7GiD96M= X-MC-Unique: WzbbUqLrNLGQqEvJJuM7Pw-1 X-Mimecast-MFC-AGG-ID: WzbbUqLrNLGQqEvJJuM7Pw_1782208573 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 04/35] monitor: rename monitor_init* to monitor_new* Date: Tue, 23 Jun 2026 10:55:20 +0100 Message-ID: <20260623095551.2106712-5-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1782208610685158500 The current "monitor_init" functions will clash with the methods of the same name that are required by QOM. To ease the transition to QOM, rename them out of the way. Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- chardev/char.c | 2 +- gdbstub/system.c | 2 +- include/monitor/monitor.h | 8 ++++---- monitor/hmp.c | 2 +- monitor/monitor.c | 10 +++++----- monitor/qmp.c | 2 +- storage-daemon/qemu-storage-daemon.c | 2 +- stubs/monitor-internal.c | 2 +- system/vl.c | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/chardev/char.c b/chardev/char.c index ca8b37ed8d..813c04d953 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -805,7 +805,7 @@ static Chardev *qemu_chr_new_from_name(const char *labe= l, const char *filename, =20 if (qemu_opt_get_bool(opts, "mux", 0)) { assert(permit_mux_mon); - monitor_init_hmp(chr, true, &err); + monitor_new_hmp(chr, true, &err); if (err) { error_report_err(err); object_unparent(OBJECT(chr)); diff --git a/gdbstub/system.c b/gdbstub/system.c index 2063b63b2f..18f6a62b2e 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -389,7 +389,7 @@ bool gdbserver_start(const char *device, Error **errp) /* Initialize a monitor terminal for gdb */ mon_chr =3D qemu_chardev_new(NULL, TYPE_CHARDEV_GDB, NULL, NULL, &error_abort); - monitor_init_hmp(mon_chr, false, &error_abort); + monitor_new_hmp(mon_chr, false, &error_abort); } else { qemu_chr_fe_deinit(&gdbserver_system_state.chr, true); mon_chr =3D gdbserver_system_state.mon_chr; diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 55649a8664..b9642b58ba 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -19,10 +19,10 @@ bool monitor_cur_is_qmp(void); =20 void monitor_init_globals(void); void monitor_init_globals_core(void); -void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp); -void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp); -int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp); -int monitor_init_opts(QemuOpts *opts, Error **errp); +void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp); +void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp); +int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp); +int monitor_new_opts(QemuOpts *opts, Error **errp); void monitor_cleanup(void); =20 int monitor_suspend(Monitor *mon); diff --git a/monitor/hmp.c b/monitor/hmp.c index 3dde52ddbe..4e4468424a 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1524,7 +1524,7 @@ static void monitor_readline_flush(void *opaque) monitor_flush(&mon->parent_obj); } =20 -void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp) +void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp) { MonitorHMP *mon =3D g_new0(MonitorHMP, 1); =20 diff --git a/monitor/monitor.c b/monitor/monitor.c index 0b7b464ebe..a87597e606 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -715,7 +715,7 @@ void monitor_init_globals(void) aio_co_schedule(iohandler_get_aio_context(), qmp_dispatcher_co); } =20 -int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp) +int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp) { ERRP_GUARD(); Chardev *chr; @@ -732,7 +732,7 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp, = Error **errp) =20 switch (opts->mode) { case MONITOR_MODE_CONTROL: - monitor_init_qmp(chr, opts->pretty, errp); + monitor_new_qmp(chr, opts->pretty, errp); break; case MONITOR_MODE_READLINE: if (!allow_hmp) { @@ -743,7 +743,7 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp, = Error **errp) error_setg(errp, "'pretty' is not compatible with HMP monitors= "); return -1; } - monitor_init_hmp(chr, true, errp); + monitor_new_hmp(chr, true, errp); break; default: g_assert_not_reached(); @@ -752,7 +752,7 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp, = Error **errp) return *errp ? -1 : 0; } =20 -int monitor_init_opts(QemuOpts *opts, Error **errp) +int monitor_new_opts(QemuOpts *opts, Error **errp) { Visitor *v; MonitorOptions *options; @@ -765,7 +765,7 @@ int monitor_init_opts(QemuOpts *opts, Error **errp) return -1; } =20 - ret =3D monitor_init(options, true, errp); + ret =3D monitor_new(options, true, errp); qapi_free_MonitorOptions(options); return ret; } diff --git a/monitor/qmp.c b/monitor/qmp.c index 27934206db..cb28a95efd 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -513,7 +513,7 @@ static void monitor_qmp_setup_handlers_bh(void *opaque) monitor_list_append(&mon->parent_obj); } =20 -void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp) +void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp) { MonitorQMP *mon =3D g_new0(MonitorQMP, 1); =20 diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-sto= rage-daemon.c index eb72561358..50dbfbd97a 100644 --- a/storage-daemon/qemu-storage-daemon.c +++ b/storage-daemon/qemu-storage-daemon.c @@ -330,7 +330,7 @@ static void process_options(int argc, char *argv[], boo= l pre_init_pass) visit_free(v); =20 /* TODO Catch duplicate monitor IDs */ - monitor_init(monitor, false, &error_fatal); + monitor_new(monitor, false, &error_fatal); qapi_free_MonitorOptions(monitor); break; } diff --git a/stubs/monitor-internal.c b/stubs/monitor-internal.c index 4fece49d53..23d58da184 100644 --- a/stubs/monitor-internal.c +++ b/stubs/monitor-internal.c @@ -8,6 +8,6 @@ int monitor_get_fd(Monitor *mon, const char *name, Error **= errp) return -1; } =20 -void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp) +void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp) { } diff --git a/system/vl.c b/system/vl.c index 1c0da7df29..fb36140aac 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1247,7 +1247,7 @@ static int fsdev_init_func(void *opaque, QemuOpts *op= ts, Error **errp) =20 static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp) { - return monitor_init_opts(opts, errp); + return monitor_new_opts(opts, errp); } =20 static void monitor_parse(const char *str, const char *mode, bool pretty) --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208631; cv=none; d=zohomail.com; s=zohoarc; b=M5VagTHcvfPhvxwqCgzXSA8C0whWLKhj3K9l5z36oIJavJH0LJ565u9UygJLAlJEe3N2FNHuQ0kJLf0TKF9u0GzXFjo8F4KgEUK8zMxXtIfFjESfjxjUu9w9HwauInb+luIzW8SrzWHXjyO/z86VVqp3EV5s+tBB088f/vhThqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208631; h=Content-Type: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=TBZtvUt5gdwzwBHAAKksp1IVUr8l9rfs2Zmve1SRhjU=; b=lEj/Xa+Z3YoDEmPZxyDc+NHC24Rj2PaNUQYLX1r4/e9fvzlfj5cg2QcbzOSvIwEoCSoiExcNO7hcGS8qdTmdMNPsSMCCj9bSYyPWg3j12tNcRnCww8H/Zp43DP9d4QJGyY+Eisgls8NkMKz3pZA/yyG2qJXBd6MxmnUlsfea74g= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178220863117069.96425429082865; Tue, 23 Jun 2026 02:57:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxrn-0003Rp-9o; Tue, 23 Jun 2026 05:56:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxrl-0003Rb-EF for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:25 -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 1wbxrj-0003TG-De for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:25 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-225-2GFrVcd5OXCNcVtVzh8URw-1; Tue, 23 Jun 2026 05:56:18 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C782419540C1; Tue, 23 Jun 2026 09:56:16 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C915B175F; Tue, 23 Jun 2026 09:56:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208582; 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=TBZtvUt5gdwzwBHAAKksp1IVUr8l9rfs2Zmve1SRhjU=; b=SfMjNkwbddBxrn1b7H9h2s1HxRABdRZnJ1/lgxuDQ21QTDOYFihIJFBs92HUXbLFp7KRH+ aTHH/Z914vT/OzDUXc0nDsGwKy4l5+Ly7/5k9Pfr1sOTGC/hSICt7c1eyHZrSFFTIEXI4q 6EI+8BRHQdXaPUhpWxBwGF+JCVHmUKk= X-MC-Unique: 2GFrVcd5OXCNcVtVzh8URw-1 X-Mimecast-MFC-AGG-ID: 2GFrVcd5OXCNcVtVzh8URw_1782208577 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 05/35] monitor: minimal conversion of monitors to QOM Date: Tue, 23 Jun 2026 10:55:21 +0100 Message-ID: <20260623095551.2106712-6-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208632521158500 This introduces a Monitor QOM object, with MonitorHMP and MonitorQMP subclasses. This is the bare minimum conversion of just the type declarations and replacing g_new/g_free with object_new/object_unref. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- include/monitor/monitor.h | 11 ++++++++++- monitor/hmp.c | 29 +++++++++++++++++++++++++++-- monitor/monitor-internal.h | 18 ++++++++++++++++-- monitor/monitor.c | 18 ++++++++++++++++-- monitor/qmp-cmds.c | 15 ++++++++------- monitor/qmp.c | 29 +++++++++++++++++++++++++++-- 6 files changed, 104 insertions(+), 16 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index b9642b58ba..2e9f9e12e9 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -5,8 +5,17 @@ #include "qapi/qapi-types-misc.h" #include "qemu/readline.h" #include "exec/hwaddr.h" +#include "qom/object.h" + +#define TYPE_MONITOR "monitor" +OBJECT_DECLARE_TYPE(Monitor, MonitorClass, MONITOR); + +#define TYPE_MONITOR_HMP "monitor-hmp" +OBJECT_DECLARE_TYPE(MonitorHMP, MonitorHMPClass, MONITOR_HMP); + +#define TYPE_MONITOR_QMP "monitor-qmp" +OBJECT_DECLARE_TYPE(MonitorQMP, MonitorQMPClass, MONITOR_QMP); =20 -typedef struct MonitorHMP MonitorHMP; typedef struct MonitorOptions MonitorOptions; =20 #define QMP_REQ_QUEUE_LEN_MAX 8 diff --git a/monitor/hmp.c b/monitor/hmp.c index 4e4468424a..81047d2513 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -43,6 +43,20 @@ #include "system/block-backend.h" #include "trace.h" =20 +OBJECT_DEFINE_TYPE(MonitorHMP, monitor_hmp, MONITOR_HMP, MONITOR); + +static void monitor_hmp_finalize(Object *obj) +{ +} + +static void monitor_hmp_class_init(ObjectClass *cls, const void *data) +{ +} + +static void monitor_hmp_init(Object *obj) +{ +} + static void monitor_command_cb(void *opaque, const char *cmdline, void *readline_opaque) { @@ -1526,10 +1540,21 @@ static void monitor_readline_flush(void *opaque) =20 void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp) { - MonitorHMP *mon =3D g_new0(MonitorHMP, 1); + MonitorHMP *mon; + static int counter; + g_autofree char *id =3D g_strdup_printf("hmpcompat%d", counter++); + Object *obj =3D object_new_with_props(TYPE_MONITOR_HMP, + object_get_objects_root(), + id, + errp, + NULL); + if (!obj) { + return; + } + mon =3D MONITOR_HMP(obj); =20 if (!qemu_chr_fe_init(&mon->parent_obj.chr, chr, errp)) { - g_free(mon); + object_unparent(OBJECT(mon)); return; } =20 diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 4da2b2a677..05c1f2f5e0 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -101,7 +101,13 @@ typedef struct HMPCommand { bool coroutine; } HMPCommand; =20 + +struct MonitorClass { + ObjectClass parent_class; +}; + struct Monitor { + Object parent; CharFrontend chr; int suspend_cnt; /* Needs to be accessed atomically */ bool is_qmp; @@ -127,6 +133,10 @@ struct Monitor { int reset_seen; }; =20 +struct MonitorHMPClass { + MonitorClass parent_class; +}; + struct MonitorHMP { Monitor parent_obj; bool use_readline; @@ -140,7 +150,11 @@ struct MonitorHMP { ReadLineState *rs; }; =20 -typedef struct { +struct MonitorQMPClass { + MonitorClass parent_class; +}; + +struct MonitorQMP { Monitor parent_obj; JSONMessageParser parser; bool pretty; @@ -160,7 +174,7 @@ typedef struct { QemuMutex qmp_queue_lock; /* Input queue that holds all the parsed QMP requests */ GQueue *qmp_requests; -} MonitorQMP; +}; =20 /** * Is @mon a QMP monitor? diff --git a/monitor/monitor.c b/monitor/monitor.c index a87597e606..a497c25c54 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -73,6 +73,20 @@ static GHashTable *coroutine_mon; /* Maps Coroutine* to = Monitor* */ MonitorList mon_list; static bool monitor_destroyed; =20 +OBJECT_DEFINE_TYPE(Monitor, monitor, MONITOR, OBJECT); + +static void monitor_finalize(Object *obj) +{ +} + +static void monitor_class_init(ObjectClass *cls, const void *data) +{ +} + +static void monitor_init(Object *obj) +{ +} + Monitor *monitor_cur(void) { Monitor *mon; @@ -598,7 +612,7 @@ void monitor_list_append(Monitor *mon) =20 if (mon) { monitor_data_destroy(mon); - g_free(mon); + object_unparent(OBJECT(mon)); } } =20 @@ -680,7 +694,7 @@ void monitor_cleanup(void) monitor_flush(mon); monitor_data_destroy(mon); qemu_mutex_lock(&monitor_lock); - g_free(mon); + object_unparent(OBJECT(mon)); } qemu_mutex_unlock(&monitor_lock); =20 diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index aa9ee8a391..bfde769ef0 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -166,12 +166,12 @@ char *qmp_human_monitor_command(const char *command_l= ine, bool has_cpu_index, int64_t cpu_index, Error **errp) { char *output =3D NULL; - MonitorHMP hmp =3D {}; + MonitorHMP *hmp =3D MONITOR_HMP(object_new(TYPE_MONITOR_HMP)); =20 - monitor_data_init(&hmp.parent_obj, false, true, false); + monitor_data_init(&hmp->parent_obj, false, true, false); =20 if (has_cpu_index) { - int ret =3D monitor_set_cpu(&hmp.parent_obj, cpu_index); + int ret =3D monitor_set_cpu(&hmp->parent_obj, cpu_index); if (ret < 0) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number"); @@ -179,14 +179,15 @@ char *qmp_human_monitor_command(const char *command_l= ine, bool has_cpu_index, } } =20 - handle_hmp_command(&hmp, command_line); + handle_hmp_command(hmp, command_line); =20 - WITH_QEMU_LOCK_GUARD(&hmp.parent_obj.mon_lock) { - output =3D g_strdup(hmp.parent_obj.outbuf->str); + WITH_QEMU_LOCK_GUARD(&hmp->parent_obj.mon_lock) { + output =3D g_strdup(hmp->parent_obj.outbuf->str); } =20 out: - monitor_data_destroy(&hmp.parent_obj); + monitor_data_destroy(&hmp->parent_obj); + object_unref(hmp); return output; } =20 diff --git a/monitor/qmp.c b/monitor/qmp.c index cb28a95efd..5231ed506a 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -71,6 +71,20 @@ typedef struct QMPRequest QMPRequest; =20 QmpCommandList qmp_commands, qmp_cap_negotiation_commands; =20 +OBJECT_DEFINE_TYPE(MonitorQMP, monitor_qmp, MONITOR_QMP, MONITOR); + +static void monitor_qmp_finalize(Object *obj) +{ +} + +static void monitor_qmp_class_init(ObjectClass *cls, const void *data) +{ +} + +static void monitor_qmp_init(Object *obj) +{ +} + static bool qmp_oob_enabled(MonitorQMP *mon) { return mon->capab[QMP_CAPABILITY_OOB]; @@ -515,10 +529,21 @@ static void monitor_qmp_setup_handlers_bh(void *opaqu= e) =20 void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp) { - MonitorQMP *mon =3D g_new0(MonitorQMP, 1); + MonitorQMP *mon; + static int counter; + g_autofree char *id =3D g_strdup_printf("qmpcompat%d", counter++); + Object *obj =3D object_new_with_props(TYPE_MONITOR_QMP, + object_get_objects_root(), + id, + errp, + NULL); + if (!obj) { + return; + } + mon =3D MONITOR_QMP(obj); =20 if (!qemu_chr_fe_init(&mon->parent_obj.chr, chr, errp)) { - g_free(mon); + object_unparent(OBJECT(mon)); return; } qemu_chr_fe_set_echo(&mon->parent_obj.chr, true); --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208640; cv=none; d=zohomail.com; s=zohoarc; b=VDz1SfZy03GFjyN0K67z1WeG5cr6LNQauB7Ba7TgQoaQApU1QS3FFizSivW2i5xO0ci8Fe1IbuYWzit8vnGoOkFsHVJzjYKxvsYsLwWncAZKM0KlZ0sD3c+LoA64P+DSzrHKcmKW5mEiIMv6+CnlAmEPRx+YhmeHUuRJnPzEVe0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208640; h=Content-Type: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=tjqfSRxYOxQy1sZSfGITju3lmGN+9Vm+9l61SqZBrSk=; b=LrBcc/ikYQ7ovVxIRxyJBqUc0ggB5RNFABRs1tKv8EWwTKs9c/Vn6msXsYh8WgdhlThWzeAZQutLrpBlNS70dnns+5uMALKQLNEc/GKq2BLFWMJtEKAPV9FvTSckPiKXPMZ8Zy1EHHRvrECrtRqFd4XcskeXKdhs4hd3tHq2foY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178220864009173.91204681738793; Tue, 23 Jun 2026 02:57:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxrt-0003Sf-U1; Tue, 23 Jun 2026 05:56:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxrs-0003SX-0u for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:32 -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 1wbxrl-0003TM-7I for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:31 -0400 Received: from mx-prod-mc-06.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-629-1bSWwjr5OsC-2AzZZGHYMQ-1; Tue, 23 Jun 2026 05:56:21 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6A0F91800599; Tue, 23 Jun 2026 09:56:20 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 51E21D6E; Tue, 23 Jun 2026 09:56:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208584; 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=tjqfSRxYOxQy1sZSfGITju3lmGN+9Vm+9l61SqZBrSk=; b=QkEYMYIyp0n3zIxY4io7Urdnxy1NlXHXM2tBoImpqHmjrcTBzoLjTxsakQWLtm8HsRboG6 3D5etzbsDmk5Z2wXi1wNRYgWi7VtpG3DvWMvoflC4P7o6BRJ0hIPMfJ8zy2QdTdQpNtH7L ZL+KVWzmS/b117Pg9Sm0m2qsiPURV40= X-MC-Unique: 1bSWwjr5OsC-2AzZZGHYMQ-1 X-Mimecast-MFC-AGG-ID: 1bSWwjr5OsC-2AzZZGHYMQ_1782208580 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 06/35] monitor: add 'chardev' property to Monitor base class Date: Tue, 23 Jun 2026 10:55:22 +0100 Message-ID: <20260623095551.2106712-7-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1782208640412158500 This is associates both QMP and HMP monitors with a character device backend. Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- chardev/char.c | 3 ++- gdbstub/system.c | 4 ++-- include/monitor/monitor.h | 4 ++-- monitor/hmp.c | 10 ++++++-- monitor/monitor-internal.h | 2 ++ monitor/monitor.c | 47 ++++++++++++++++++++++++++++++-------- monitor/qmp.c | 18 ++++++++++----- stubs/monitor-internal.c | 2 +- 8 files changed, 67 insertions(+), 23 deletions(-) diff --git a/chardev/char.c b/chardev/char.c index 813c04d953..981fbb1aaa 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -804,8 +804,9 @@ static Chardev *qemu_chr_new_from_name(const char *labe= l, const char *filename, } =20 if (qemu_opt_get_bool(opts, "mux", 0)) { + const char *chardev_id =3D qemu_opts_id(opts); assert(permit_mux_mon); - monitor_new_hmp(chr, true, &err); + monitor_new_hmp(chardev_id, true, &err); if (err) { error_report_err(err); object_unparent(OBJECT(chr)); diff --git a/gdbstub/system.c b/gdbstub/system.c index 18f6a62b2e..80175e7fa2 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -387,9 +387,9 @@ bool gdbserver_start(const char *device, Error **errp) qemu_add_vm_change_state_handler(gdb_vm_state_change, NULL); =20 /* Initialize a monitor terminal for gdb */ - mon_chr =3D qemu_chardev_new(NULL, TYPE_CHARDEV_GDB, + mon_chr =3D qemu_chardev_new("gdbchrdev0", TYPE_CHARDEV_GDB, NULL, NULL, &error_abort); - monitor_new_hmp(mon_chr, false, &error_abort); + monitor_new_hmp("gdbchrdev0", false, &error_abort); } else { qemu_chr_fe_deinit(&gdbserver_system_state.chr, true); mon_chr =3D gdbserver_system_state.mon_chr; diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 2e9f9e12e9..a135b3a590 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -28,8 +28,8 @@ bool monitor_cur_is_qmp(void); =20 void monitor_init_globals(void); void monitor_init_globals_core(void); -void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp); -void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp); +void monitor_new_qmp(const char *chardev_id, bool pretty, Error **errp); +void monitor_new_hmp(const char *chardev_id, bool use_readline, Error **er= rp); int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp); int monitor_new_opts(QemuOpts *opts, Error **errp); void monitor_cleanup(void); diff --git a/monitor/hmp.c b/monitor/hmp.c index 81047d2513..4ab81b5904 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include #include "hw/core/qdev.h" #include "hw/core/sysemu-cpu-ops.h" @@ -1538,8 +1539,9 @@ static void monitor_readline_flush(void *opaque) monitor_flush(&mon->parent_obj); } =20 -void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp) +void monitor_new_hmp(const char *chardev_id, bool use_readline, Error **er= rp) { + ERRP_GUARD(); MonitorHMP *mon; static int counter; g_autofree char *id =3D g_strdup_printf("hmpcompat%d", counter++); @@ -1547,13 +1549,17 @@ void monitor_new_hmp(Chardev *chr, bool use_readlin= e, Error **errp) object_get_objects_root(), id, errp, + "chardev", chardev_id, NULL); + if (!obj) { return; } + mon =3D MONITOR_HMP(obj); =20 - if (!qemu_chr_fe_init(&mon->parent_obj.chr, chr, errp)) { + monitor_complete(MONITOR(mon), errp); + if (*errp) { object_unparent(OBJECT(mon)); return; } diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 05c1f2f5e0..145d52fd71 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -108,6 +108,7 @@ struct MonitorClass { =20 struct Monitor { Object parent; + char *chardev_id; CharFrontend chr; int suspend_cnt; /* Needs to be accessed atomically */ bool is_qmp; @@ -192,6 +193,7 @@ extern QmpCommandList qmp_commands, qmp_cap_negotiation= _commands; extern QemuMutex monitor_lock; extern MonitorList mon_list; =20 +void monitor_complete(Monitor *mon, Error **errp); void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush, bool use_io_thread); void monitor_data_destroy(Monitor *mon); diff --git a/monitor/monitor.c b/monitor/monitor.c index a497c25c54..747ca27fd5 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -77,10 +77,31 @@ OBJECT_DEFINE_TYPE(Monitor, monitor, MONITOR, OBJECT); =20 static void monitor_finalize(Object *obj) { + Monitor *mon =3D MONITOR(obj); + + g_free(mon->chardev_id); +} + +static char *monitor_get_chardev_id(Object *obj, Error **errp) +{ + Monitor *mon =3D MONITOR(obj); + + return g_strdup(mon->chardev_id); +} + +static void monitor_set_chardev_id(Object *obj, const char *str, Error **e= rrp) +{ + Monitor *mon =3D MONITOR(obj); + + g_free(mon->chardev_id); + mon->chardev_id =3D g_strdup(str); } =20 static void monitor_class_init(ObjectClass *cls, const void *data) { + object_class_property_add_str(cls, "chardev", + monitor_get_chardev_id, + monitor_set_chardev_id); } =20 static void monitor_init(Object *obj) @@ -729,16 +750,24 @@ void monitor_init_globals(void) aio_co_schedule(iohandler_get_aio_context(), qmp_dispatcher_co); } =20 -int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp) +void monitor_complete(Monitor *mon, Error **errp) { - ERRP_GUARD(); - Chardev *chr; + if (mon->chardev_id) { + Chardev *chr =3D qemu_chr_find(mon->chardev_id); + if (chr =3D=3D NULL) { + error_setg(errp, "chardev \"%s\" not found", mon->chardev_id); + return; + } =20 - chr =3D qemu_chr_find(opts->chardev); - if (chr =3D=3D NULL) { - error_setg(errp, "chardev \"%s\" not found", opts->chardev); - return -1; + if (!qemu_chr_fe_init(&mon->chr, chr, errp)) { + return; + } } +} + +int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp) +{ + ERRP_GUARD(); =20 if (!opts->has_mode) { opts->mode =3D allow_hmp ? MONITOR_MODE_READLINE : MONITOR_MODE_CO= NTROL; @@ -746,7 +775,7 @@ int monitor_new(MonitorOptions *opts, bool allow_hmp, E= rror **errp) =20 switch (opts->mode) { case MONITOR_MODE_CONTROL: - monitor_new_qmp(chr, opts->pretty, errp); + monitor_new_qmp(opts->chardev, opts->pretty, errp); break; case MONITOR_MODE_READLINE: if (!allow_hmp) { @@ -757,7 +786,7 @@ int monitor_new(MonitorOptions *opts, bool allow_hmp, E= rror **errp) error_setg(errp, "'pretty' is not compatible with HMP monitors= "); return -1; } - monitor_new_hmp(chr, true, errp); + monitor_new_hmp(opts->chardev, true, errp); break; default: g_assert_not_reached(); diff --git a/monitor/qmp.c b/monitor/qmp.c index 5231ed506a..0abf2677f9 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -527,8 +527,9 @@ static void monitor_qmp_setup_handlers_bh(void *opaque) monitor_list_append(&mon->parent_obj); } =20 -void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp) +void monitor_new_qmp(const char *chardev_id, bool pretty, Error **errp) { + ERRP_GUARD(); MonitorQMP *mon; static int counter; g_autofree char *id =3D g_strdup_printf("qmpcompat%d", counter++); @@ -536,21 +537,26 @@ void monitor_new_qmp(Chardev *chr, bool pretty, Error= **errp) object_get_objects_root(), id, errp, + "chardev", chardev_id, NULL); + if (!obj) { return; } - mon =3D MONITOR_QMP(obj); =20 - if (!qemu_chr_fe_init(&mon->parent_obj.chr, chr, errp)) { + mon =3D MONITOR_QMP(obj); + monitor_complete(MONITOR(mon), errp); + if (*errp) { object_unparent(OBJECT(mon)); return; } + qemu_chr_fe_set_echo(&mon->parent_obj.chr, true); =20 /* Note: we run QMP monitor in I/O thread when @chr supports that */ monitor_data_init(&mon->parent_obj, true, false, - qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT= )); + qemu_chr_has_feature(mon->parent_obj.chr.chr, + QEMU_CHAR_FEATURE_GCONTEXT)); =20 mon->pretty =3D pretty; =20 @@ -563,12 +569,12 @@ void monitor_new_qmp(Chardev *chr, bool pretty, Error= **errp) * Make sure the old iowatch is gone. It's possible when * e.g. the chardev is in client mode, with wait=3Don. */ - remove_fd_in_watch(chr); + remove_fd_in_watch(mon->parent_obj.chr.chr); /* * Clean up listener IO sources early to prevent racy fd * handling between the main thread and the I/O thread. */ - remove_listener_fd_in_watch(chr); + remove_listener_fd_in_watch(mon->parent_obj.chr.chr); /* * We can't call qemu_chr_fe_set_handlers() directly here * since chardev might be running in the monitor I/O diff --git a/stubs/monitor-internal.c b/stubs/monitor-internal.c index 23d58da184..51db7588b9 100644 --- a/stubs/monitor-internal.c +++ b/stubs/monitor-internal.c @@ -8,6 +8,6 @@ int monitor_get_fd(Monitor *mon, const char *name, Error **= errp) return -1; } =20 -void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp) +void monitor_new_hmp(const char *chardev_id, bool use_readline, Error **er= rp) { } --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208678; cv=none; d=zohomail.com; s=zohoarc; b=HUxXrk2PqabgbfOC5C9zua5cCVmNiAJOVNgmo5DMNInXvaBDEhdtHy+GisH70mqdhTmDndIdQzmUyk0BwwVlaCSxypEo8eIn7UsuBXku4x5WnZhVzlOhPkC9/XBSlY/7G80Pc2euaCzqA/f7v0xRz99HUY3O6hBJDWCJflol1O0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208678; h=Content-Type: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=TVLsFc4Leaz2HmQzWluoN1shnQd+30arM+66dPFIyms=; b=I2LXFPPeS0XcM+mtv2tg+jop1XpU/hh1rF4LlZFGBmKMdhjZPMKlH5Lknb8WllJWAyevg8QWKsIq4NZQ9IhR2l+EXzbltTPsVLTLzHTdRkMR4jKxUAoMceS/CIBekCbjS8I5lrAXGaQyk+zDctnTuMOAmZCPkh0itfniag5g2SM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208678393197.9342582487385; Tue, 23 Jun 2026 02:57:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxrr-0003SV-GL; Tue, 23 Jun 2026 05:56:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxrq-0003S9-Jg for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:30 -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 1wbxrp-0003Tj-7q for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:30 -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-687-vUNzQWJ9PcGcqkl7XYYWgQ-1; Tue, 23 Jun 2026 05:56:25 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 0511418011E6; Tue, 23 Jun 2026 09:56:24 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D9D19D6E; Tue, 23 Jun 2026 09:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208588; 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=TVLsFc4Leaz2HmQzWluoN1shnQd+30arM+66dPFIyms=; b=i1NPhPK5zJ4YsmY/E/0pdatxmkHqP5O+g0tkUxSed4ocanSPEvbbDkNIUpkovT6CDu5jTt kSZ2MWd4e0CvlZpQYS5RIGh+Nri6BA7iB5DfKZfJaG4YKuaJc4mn6drS/GMSO3LIUYwsZi D7EXI5PCajOo83bpKTvscLGSVNGaqVQ= X-MC-Unique: vUNzQWJ9PcGcqkl7XYYWgQ-1 X-Mimecast-MFC-AGG-ID: vUNzQWJ9PcGcqkl7XYYWgQ_1782208584 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 07/35] monitor: add 'readline' property to HMP Monitor class Date: Tue, 23 Jun 2026 10:55:23 +0100 Message-ID: <20260623095551.2106712-8-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1782208680519158500 This determines whether a human monitor runs with readline for interactive use, or without readline for non-interactive use by the GDB stub. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/hmp.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index 4ab81b5904..d5905e2279 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -50,12 +50,37 @@ static void monitor_hmp_finalize(Object *obj) { } =20 +static bool monitor_hmp_get_readline(Object *obj, Error **errp) +{ + MonitorHMP *mon =3D MONITOR_HMP(obj); + + return mon->use_readline; +} + +static void monitor_hmp_set_readline(Object *obj, bool val, Error **errp) +{ + MonitorHMP *mon =3D MONITOR_HMP(obj); + + mon->use_readline =3D val; +} + static void monitor_hmp_class_init(ObjectClass *cls, const void *data) { + object_class_property_add_bool(cls, "readline", + monitor_hmp_get_readline, + monitor_hmp_set_readline); } =20 static void monitor_hmp_init(Object *obj) { + MonitorHMP *hmp =3D MONITOR_HMP(obj); + + /* + * Default to common case for external HMP use, + * as opposed to non-interactive internal use + * from gdbstub + */ + hmp->use_readline =3D true; } =20 static void monitor_command_cb(void *opaque, const char *cmdline, @@ -1550,6 +1575,7 @@ void monitor_new_hmp(const char *chardev_id, bool use= _readline, Error **errp) id, errp, "chardev", chardev_id, + "readline", use_readline ? "yes" := "no", NULL); =20 if (!obj) { @@ -1566,7 +1592,6 @@ void monitor_new_hmp(const char *chardev_id, bool use= _readline, Error **errp) =20 monitor_data_init(&mon->parent_obj, false, false, false); =20 - mon->use_readline =3D use_readline; if (mon->use_readline) { mon->rs =3D readline_init(monitor_readline_printf, monitor_readline_flush, --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208621; cv=none; d=zohomail.com; s=zohoarc; b=JaSlOsWkmlyW3G5feL9MwWwKBbi/GpUXxQYSEMdJfxu9CYeIXchbBxVBaDxPc4CaqusfDb5+Ma+u4RzxQT5ZLL09tqFHJAgIiaZ95BrxOZzq72xbs/Gi5aswwf/t0NDZi56apgg8hnGDZoEatr3DoN1fAosaidCTJeobBFveMOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208621; h=Content-Type: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=5PNRLvKKq9Fd6wQBFJY1X5kKHeTnmWLKDPWDcl5Zmms=; b=mmgdfiD3kaFEV2zW+5fIpfdxgpsrKZwUJVc5Awmm2fJF7ovAeOf8l80HRKInAS1X6pMcT6Y0p8yslrnSDA7OcUxIVj+XVeHIrOwod830p4qRNMTS6H4vHj3D35ZJf24BrFdN1OmKEQqvun5/4jEVdbGnE8HqtPYa1bsbSDs+GLc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208621536862.2698084884042; Tue, 23 Jun 2026 02:57:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxrw-0003T9-F5; Tue, 23 Jun 2026 05:56:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxru-0003Sj-7C for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:34 -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 1wbxrs-0003UB-Pi for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:33 -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-39-VU_DVl6GNHecXnwdt8d0iQ-1; Tue, 23 Jun 2026 05:56:28 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 8F63E180267C; Tue, 23 Jun 2026 09:56:27 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8CAA4D6E; Tue, 23 Jun 2026 09:56:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208592; 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=5PNRLvKKq9Fd6wQBFJY1X5kKHeTnmWLKDPWDcl5Zmms=; b=Aaxk0gqW8FH/2eqFMDgRLZU5MwRn2gzGrCBawsZls2iv6NTEqJBAjs1I9C9ZxoQxfhCmVX NR4+JFMdmsTUheKqRSHoGr1C0IHpxcRvLKbqadg352Y5MgFjYzPVztEBOV9lja3lBZ4tc+ Tj1eppTDofyn1JPl30rY0nHCZnecybQ= X-MC-Unique: VU_DVl6GNHecXnwdt8d0iQ-1 X-Mimecast-MFC-AGG-ID: VU_DVl6GNHecXnwdt8d0iQ_1782208587 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 08/35] monitor: add 'pretty' property to QMP Monitor class Date: Tue, 23 Jun 2026 10:55:24 +0100 Message-ID: <20260623095551.2106712-9-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1782208622313158500 This determines whether the QMP JSON responses are pretty printed with newlines and indentation, or compact with no extra whitespace. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/qmp.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/monitor/qmp.c b/monitor/qmp.c index 0abf2677f9..2a8532ef96 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -77,8 +77,25 @@ static void monitor_qmp_finalize(Object *obj) { } =20 +static bool monitor_qmp_get_pretty(Object *obj, Error **errp) +{ + MonitorQMP *mon =3D MONITOR_QMP(obj); + + return mon->pretty; +} + +static void monitor_qmp_set_pretty(Object *obj, bool val, Error **errp) +{ + MonitorQMP *mon =3D MONITOR_QMP(obj); + + mon->pretty =3D val; +} + static void monitor_qmp_class_init(ObjectClass *cls, const void *data) { + object_class_property_add_bool(cls, "pretty", + monitor_qmp_get_pretty, + monitor_qmp_set_pretty); } =20 static void monitor_qmp_init(Object *obj) @@ -538,6 +555,7 @@ void monitor_new_qmp(const char *chardev_id, bool prett= y, Error **errp) id, errp, "chardev", chardev_id, + "pretty", pretty ? "yes" : "no", NULL); =20 if (!obj) { @@ -558,8 +576,6 @@ void monitor_new_qmp(const char *chardev_id, bool prett= y, Error **errp) qemu_chr_has_feature(mon->parent_obj.chr.chr, QEMU_CHAR_FEATURE_GCONTEXT)); =20 - mon->pretty =3D pretty; - qemu_mutex_init(&mon->qmp_queue_lock); mon->qmp_requests =3D g_queue_new(); =20 --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208621; cv=none; d=zohomail.com; s=zohoarc; b=U0nfrOrIGltLESKcDwESxuHQna+Ki0dsB2KthuePe1nC5jtZbhoac/lLUOWLboIi6uwyPpPZDEoasGMGhIhQKzSH9xrH3vpji9G6NH9f7rDsjncjiPiUSi73S2HgieB1r6ZKv0WX6TA+0v2cVfxfb/TDyfLPKIHZM1PjUI1g7vA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208621; h=Content-Type: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=KmimI47nQ6qKsuSsw8Wt1fXJdxy8LoAqdc0xiFquuQ8=; b=U07Qc7+lASW/FVDZmNB8tp4YAasvAPoTi+EFEQ2+SBtIGExl6Pxln/SROWlzMQt41ZoYRFD9qs8sDDeVuyjJsuFSjuOYEcfI0wwk/o2NUYI5fz2DNQucVqWCZ8YQIMgCKT73YeZytP078Rsb7sRofMo4/eauwQUcgjIMGlViysg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208621533327.0539325576643; Tue, 23 Jun 2026 02:57:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxs1-0003Wi-Or; Tue, 23 Jun 2026 05:56:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxry-0003V1-9L for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxrw-0003UZ-Mc for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:38 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-652-RGnlKFJaNYW1O_JC3ZHv3Q-1; Tue, 23 Jun 2026 05:56:32 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5D40E1955F5A; Tue, 23 Jun 2026 09:56:31 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0FA54D6E; Tue, 23 Jun 2026 09:56:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208596; 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=KmimI47nQ6qKsuSsw8Wt1fXJdxy8LoAqdc0xiFquuQ8=; b=D/qkjz+Gqng42fPbyLPejVL4VQ4mdsVAvpWiH5x0lhZbFzmotMdQpnpXhzsU8iPJ0qSReh vOVSzL9UmCytuuXODEpnsBXTVrYYo/32fGP8++5Ny/xiB1ExZs3pvARIJ0ncPhB3Y5G6qt hSQrv7Y2X95OxnPFgZSGJw24xKGYVn8= X-MC-Unique: RGnlKFJaNYW1O_JC3ZHv3Q-1 X-Mimecast-MFC-AGG-ID: RGnlKFJaNYW1O_JC3ZHv3Q_1782208591 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 09/35] monitor: remove 'skip_flush' field Date: Tue, 23 Jun 2026 10:55:25 +0100 Message-ID: <20260623095551.2106712-10-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208622348158500 The 'skip_flush' field is set on the dummy throwaway HMP monitor object created by QMP's 'human-monitor-command', as an indication not to try to write data to the chardev. Instead the QMP command impl will grab the data straight out of the in-memory buffer. The flag is redundant, however, as the monitor code could instead simply check the 'fe_is_open' field on the CharFrontend, which will be false in the same scenarios that 'skip_flush' is true. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/hmp.c | 2 +- monitor/monitor-internal.h | 4 +--- monitor/monitor.c | 11 +++++++---- monitor/qmp-cmds.c | 2 +- monitor/qmp.c | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index d5905e2279..516aa25d4c 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1590,7 +1590,7 @@ void monitor_new_hmp(const char *chardev_id, bool use= _readline, Error **errp) return; } =20 - monitor_data_init(&mon->parent_obj, false, false, false); + monitor_data_init(&mon->parent_obj, false, false); =20 if (mon->use_readline) { mon->rs =3D readline_init(monitor_readline_printf, diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 145d52fd71..d34f9be139 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -112,7 +112,6 @@ struct Monitor { CharFrontend chr; int suspend_cnt; /* Needs to be accessed atomically */ bool is_qmp; - bool skip_flush; bool use_io_thread; =20 char *mon_cpu_path; @@ -194,8 +193,7 @@ extern QemuMutex monitor_lock; extern MonitorList mon_list; =20 void monitor_complete(Monitor *mon, Error **errp); -void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush, - bool use_io_thread); +void monitor_data_init(Monitor *mon, bool is_qmp, bool use_io_thread); void monitor_data_destroy(Monitor *mon); int monitor_can_read(void *opaque); void monitor_list_append(Monitor *mon); diff --git a/monitor/monitor.c b/monitor/monitor.c index 747ca27fd5..e3e5623a4b 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -188,7 +188,12 @@ void monitor_flush_locked(Monitor *mon) size_t len; const char *buf; =20 - if (mon->skip_flush) { + /* + * When used by QMP human-monitor-command, no chardev + * will be connected, as we want to just collect the + * output in the buffer + */ + if (!mon->chr.fe_is_open) { return; } =20 @@ -642,8 +647,7 @@ static void monitor_iothread_init(void) mon_iothread =3D iothread_create("mon_iothread", &error_abort); } =20 -void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush, - bool use_io_thread) +void monitor_data_init(Monitor *mon, bool is_qmp, bool use_io_thread) { if (use_io_thread && !mon_iothread) { monitor_iothread_init(); @@ -651,7 +655,6 @@ void monitor_data_init(Monitor *mon, bool is_qmp, bool = skip_flush, qemu_mutex_init(&mon->mon_lock); mon->is_qmp =3D is_qmp; mon->outbuf =3D g_string_new(NULL); - mon->skip_flush =3D skip_flush; mon->use_io_thread =3D use_io_thread; } =20 diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index bfde769ef0..0d9adad288 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -168,7 +168,7 @@ char *qmp_human_monitor_command(const char *command_lin= e, bool has_cpu_index, char *output =3D NULL; MonitorHMP *hmp =3D MONITOR_HMP(object_new(TYPE_MONITOR_HMP)); =20 - monitor_data_init(&hmp->parent_obj, false, true, false); + monitor_data_init(&hmp->parent_obj, false, false); =20 if (has_cpu_index) { int ret =3D monitor_set_cpu(&hmp->parent_obj, cpu_index); diff --git a/monitor/qmp.c b/monitor/qmp.c index 2a8532ef96..e3318b57db 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -572,7 +572,7 @@ void monitor_new_qmp(const char *chardev_id, bool prett= y, Error **errp) qemu_chr_fe_set_echo(&mon->parent_obj.chr, true); =20 /* Note: we run QMP monitor in I/O thread when @chr supports that */ - monitor_data_init(&mon->parent_obj, true, false, + monitor_data_init(&mon->parent_obj, true, qemu_chr_has_feature(mon->parent_obj.chr.chr, QEMU_CHAR_FEATURE_GCONTEXT)); =20 --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208667; cv=none; d=zohomail.com; s=zohoarc; b=EEzyjiyU9nwHv00H4jhzhSFKoczufOl2Z2RF44Qx05xrHLUhk6jImD8XzPGJozWGWHSlIF4g6/Q6FzCCiMO+7hfQb7lCiTTigpagFa5sMWAuKVCfwXqKEyKx2WDiXtboHyxKm4JgGwbViME3iK3LOU/dhzjVE3mzrBpPJpYzI5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208667; h=Content-Type: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=nzVajuluyRlzC1DSJS8hgQNZ6gXOgkeOIGH/NAVPWgg=; b=fPkc75RR46MJj79NT8K2/mB8i3PLFGVWg2OBSezobne6qQYlmZoxyxVHuWr/TgxZHqqQ/OulHiWtzs9WX66tisHdRkMlz/90S0DlPH4ye/ToXH6p4id3LajhEtmNxjAcHbou3+teEO4zp02/SCgEgQexkHwLri5E5JF7DpZw5z0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208667487896.0430723770841; Tue, 23 Jun 2026 02:57:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxs5-0003X0-Gj; Tue, 23 Jun 2026 05:56:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxs2-0003Wl-76 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:42 -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 1wbxs0-0003Uq-6t for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:41 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-329-Uiq0wMp7NUGBpRujkgnZfA-1; Tue, 23 Jun 2026 05:56:36 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D34311955F70; Tue, 23 Jun 2026 09:56:34 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D60AA1624; Tue, 23 Jun 2026 09:56:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208599; 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=nzVajuluyRlzC1DSJS8hgQNZ6gXOgkeOIGH/NAVPWgg=; b=Jlk3T52mapqVN1ehTtQlK7Yyr4VXPRXG+/T0/mEB/E1JE5eQGlfuZeX/bmJ3iy5efxP/SR lEKL1yRt3pkz7qauczI3y8kaxPcvRMDx7NClJ3nO+qO/16F5AfFwKG4cE/2Wz0ZLHThXmV lXEy2DlvvSKQy7tpPrVMuQuSIMUWLtI= X-MC-Unique: Uiq0wMp7NUGBpRujkgnZfA-1 X-Mimecast-MFC-AGG-ID: Uiq0wMp7NUGBpRujkgnZfA_1782208594 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 10/35] monitor: move monitor_data_(init|destroy) into QOM init/finalize Date: Tue, 23 Jun 2026 10:55:26 +0100 Message-ID: <20260623095551.2106712-11-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208668558158500 Start to take advantage of QOM, by using object init and finalize methods to replace monitor_data_init and monitor_data_destroy. A standalone helper is provided to enable the I/O thread for QMP where appropriate for the chardev backend. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/hmp.c | 6 +++-- monitor/monitor-internal.h | 3 +-- monitor/monitor.c | 46 +++++++++++++------------------------- monitor/qmp-cmds.c | 3 --- monitor/qmp.c | 34 +++++++++++++++------------- 5 files changed, 40 insertions(+), 52 deletions(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index 516aa25d4c..2bb2333da5 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -48,6 +48,10 @@ OBJECT_DEFINE_TYPE(MonitorHMP, monitor_hmp, MONITOR_HMP,= MONITOR); =20 static void monitor_hmp_finalize(Object *obj) { + MonitorHMP *mon =3D MONITOR_HMP(obj); + if (mon->rs) { + readline_free(mon->rs); + } } =20 static bool monitor_hmp_get_readline(Object *obj, Error **errp) @@ -1590,8 +1594,6 @@ void monitor_new_hmp(const char *chardev_id, bool use= _readline, Error **errp) return; } =20 - monitor_data_init(&mon->parent_obj, false, false); - if (mon->use_readline) { mon->rs =3D readline_init(monitor_readline_printf, monitor_readline_flush, diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index d34f9be139..6a4c3b0f37 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -193,8 +193,7 @@ extern QemuMutex monitor_lock; extern MonitorList mon_list; =20 void monitor_complete(Monitor *mon, Error **errp); -void monitor_data_init(Monitor *mon, bool is_qmp, bool use_io_thread); -void monitor_data_destroy(Monitor *mon); +void monitor_iothread_init(Monitor *mon); int monitor_can_read(void *opaque); void monitor_list_append(Monitor *mon); void monitor_fdsets_cleanup(void); diff --git a/monitor/monitor.c b/monitor/monitor.c index e3e5623a4b..76df379a2c 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -80,6 +80,10 @@ static void monitor_finalize(Object *obj) Monitor *mon =3D MONITOR(obj); =20 g_free(mon->chardev_id); + g_free(mon->mon_cpu_path); + qemu_chr_fe_deinit(&mon->chr, false); + g_string_free(mon->outbuf, true); + qemu_mutex_destroy(&mon->mon_lock); } =20 static char *monitor_get_chardev_id(Object *obj, Error **errp) @@ -106,6 +110,11 @@ static void monitor_class_init(ObjectClass *cls, const= void *data) =20 static void monitor_init(Object *obj) { + Monitor *mon =3D MONITOR(obj); + + qemu_mutex_init(&mon->mon_lock); + mon->is_qmp =3D !!object_dynamic_cast(obj, TYPE_MONITOR_QMP); + mon->outbuf =3D g_string_new(NULL); } =20 Monitor *monitor_cur(void) @@ -637,38 +646,16 @@ void monitor_list_append(Monitor *mon) qemu_mutex_unlock(&monitor_lock); =20 if (mon) { - monitor_data_destroy(mon); object_unparent(OBJECT(mon)); } } =20 -static void monitor_iothread_init(void) -{ - mon_iothread =3D iothread_create("mon_iothread", &error_abort); -} - -void monitor_data_init(Monitor *mon, bool is_qmp, bool use_io_thread) +void monitor_iothread_init(Monitor *mon) { - if (use_io_thread && !mon_iothread) { - monitor_iothread_init(); + if (!mon_iothread) { + mon_iothread =3D iothread_create("mon_iothread", &error_abort); } - qemu_mutex_init(&mon->mon_lock); - mon->is_qmp =3D is_qmp; - mon->outbuf =3D g_string_new(NULL); - mon->use_io_thread =3D use_io_thread; -} - -void monitor_data_destroy(Monitor *mon) -{ - g_free(mon->mon_cpu_path); - qemu_chr_fe_deinit(&mon->chr, false); - if (monitor_is_qmp(mon)) { - monitor_data_destroy_qmp(container_of(mon, MonitorQMP, parent_obj)= ); - } else { - readline_free(container_of(mon, MonitorHMP, parent_obj)->rs); - } - g_string_free(mon->outbuf, true); - qemu_mutex_destroy(&mon->mon_lock); + mon->use_io_thread =3D true; } =20 void monitor_cleanup(void) @@ -686,7 +673,7 @@ void monitor_cleanup(void) * Letting the iothread continue while shutting down the dispatcher * means that new requests may still be coming in. This is okay, * we'll just leave them in the queue without sending a response - * and monitor_data_destroy() will free them. + * and object finalization will free them. */ WITH_QEMU_LOCK_GUARD(&monitor_lock) { qmp_dispatcher_co_shutdown =3D true; @@ -700,8 +687,8 @@ void monitor_cleanup(void) /* * We need to explicitly stop the I/O thread (but not destroy it), * clean up the monitor resources, then destroy the I/O thread since - * we need to unregister from chardev below in - * monitor_data_destroy(), and chardev is not thread-safe yet + * we need to unregister from chardev below in object + * finalization, and chardev is not thread-safe yet */ if (mon_iothread) { iothread_stop(mon_iothread); @@ -716,7 +703,6 @@ void monitor_cleanup(void) /* Permit QAPI event emission from character frontend release */ qemu_mutex_unlock(&monitor_lock); monitor_flush(mon); - monitor_data_destroy(mon); qemu_mutex_lock(&monitor_lock); object_unparent(OBJECT(mon)); } diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 0d9adad288..6cb0b587fb 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -168,8 +168,6 @@ char *qmp_human_monitor_command(const char *command_lin= e, bool has_cpu_index, char *output =3D NULL; MonitorHMP *hmp =3D MONITOR_HMP(object_new(TYPE_MONITOR_HMP)); =20 - monitor_data_init(&hmp->parent_obj, false, false); - if (has_cpu_index) { int ret =3D monitor_set_cpu(&hmp->parent_obj, cpu_index); if (ret < 0) { @@ -186,7 +184,6 @@ char *qmp_human_monitor_command(const char *command_lin= e, bool has_cpu_index, } =20 out: - monitor_data_destroy(&hmp->parent_obj); object_unref(hmp); return output; } diff --git a/monitor/qmp.c b/monitor/qmp.c index e3318b57db..694d303215 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -73,8 +73,16 @@ QmpCommandList qmp_commands, qmp_cap_negotiation_command= s; =20 OBJECT_DEFINE_TYPE(MonitorQMP, monitor_qmp, MONITOR_QMP, MONITOR); =20 +static void monitor_qmp_cleanup_req_queue_locked(MonitorQMP *mon); + static void monitor_qmp_finalize(Object *obj) { + MonitorQMP *mon =3D MONITOR_QMP(obj); + + json_message_parser_destroy(&mon->parser); + qemu_mutex_destroy(&mon->qmp_queue_lock); + monitor_qmp_cleanup_req_queue_locked(mon); + g_queue_free(mon->qmp_requests); } =20 static bool monitor_qmp_get_pretty(Object *obj, Error **errp) @@ -98,8 +106,15 @@ static void monitor_qmp_class_init(ObjectClass *cls, co= nst void *data) monitor_qmp_set_pretty); } =20 +static void handle_qmp_command(void *opaque, QObject *req, Error *err); static void monitor_qmp_init(Object *obj) { + MonitorQMP *mon =3D MONITOR_QMP(obj); + + qemu_mutex_init(&mon->qmp_queue_lock); + mon->qmp_requests =3D g_queue_new(); + + json_message_parser_init(&mon->parser, handle_qmp_command, mon, NULL); } =20 static bool qmp_oob_enabled(MonitorQMP *mon) @@ -522,14 +537,6 @@ static void monitor_qmp_event(void *opaque, QEMUChrEve= nt event) } } =20 -void monitor_data_destroy_qmp(MonitorQMP *mon) -{ - json_message_parser_destroy(&mon->parser); - qemu_mutex_destroy(&mon->qmp_queue_lock); - monitor_qmp_cleanup_req_queue_locked(mon); - g_queue_free(mon->qmp_requests); -} - static void monitor_qmp_setup_handlers_bh(void *opaque) { MonitorQMP *mon =3D opaque; @@ -572,14 +579,11 @@ void monitor_new_qmp(const char *chardev_id, bool pre= tty, Error **errp) qemu_chr_fe_set_echo(&mon->parent_obj.chr, true); =20 /* Note: we run QMP monitor in I/O thread when @chr supports that */ - monitor_data_init(&mon->parent_obj, true, - qemu_chr_has_feature(mon->parent_obj.chr.chr, - QEMU_CHAR_FEATURE_GCONTEXT)); - - qemu_mutex_init(&mon->qmp_queue_lock); - mon->qmp_requests =3D g_queue_new(); + if (qemu_chr_has_feature(mon->parent_obj.chr.chr, + QEMU_CHAR_FEATURE_GCONTEXT)) { + monitor_iothread_init(&mon->parent_obj); + } =20 - json_message_parser_init(&mon->parser, handle_qmp_command, mon, NULL); if (mon->parent_obj.use_io_thread) { /* * Make sure the old iowatch is gone. It's possible when --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208906; cv=none; d=zohomail.com; s=zohoarc; b=G6NUQj8hhoVrjdJ98iWgspwoi4zUS+T8E4UK+3gGaWDam3FNPiVkca48KzA3IUZHUPJ4x2bdVVPLw9hZy34mL5lQVGD38U0b0RE5FZDC/8rphyxdjDk60oQea2M5/qWxA8QzlIIfajGoN70hqQag4/ItnLJfTnYP3jIWlKOE+1o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208906; h=Content-Type: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=ml9Wb/hhzybibso9lYWgCMYriBAQIFedGYdh4Ow1Njg=; b=Mj1pUt5PsM53KBupc6fCBj1YF/tIUyGkX5JIHeY5cBbU5wb4uxi2o9TIg9QabG49/gTftrLbMsTvhHP2xTIcCJFd0609V47C79tbOV44kiWdIsJYkRACZlpqXSwMoDatP79+pcIOQU9lTLQxJ4H1m4WwcXzlX43p75k1EbZU/pk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208906441880.6137382388564; Tue, 23 Jun 2026 03:01:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxs7-0003Zi-Ap; Tue, 23 Jun 2026 05:56:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxs5-0003XH-Ir for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:45 -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 1wbxs3-0003X1-JT for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:45 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-433-xpLKH80TNCOaDCMjCruxTg-1; Tue, 23 Jun 2026 05:56:39 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 66D5B1956070; Tue, 23 Jun 2026 09:56:38 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4E3C1D6E; Tue, 23 Jun 2026 09:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208603; 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=ml9Wb/hhzybibso9lYWgCMYriBAQIFedGYdh4Ow1Njg=; b=K87cXSRThScaa8BEhA5mata95L7xQ/fDV/b40+VVPkwb7P18cgVnNLg4WZ/Y/SKRA5JDhG X1Oo/IgicfnZUQtmwtwqyazRfM9//1Jc0+Cj2G1gp4z80L4fHwrjiFc7gFL484RYvF8MGi LfgAvpc83/8a1iVT/4P6U+tppEHKVmY= X-MC-Unique: xpLKH80TNCOaDCMjCruxTg-1 X-Mimecast-MFC-AGG-ID: xpLKH80TNCOaDCMjCruxTg_1782208598 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 11/35] monitor: use class methods for monitor_vprintf Date: Tue, 23 Jun 2026 10:55:27 +0100 Message-ID: <20260623095551.2106712-12-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208908322158500 This removes the need for using monitor_is_qmp() to check the subclass type, which is an anti-pattern. Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/hmp.c | 13 +++++++++++++ monitor/monitor-internal.h | 7 +++++++ monitor/monitor.c | 11 ++++------- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index 2bb2333da5..08055839a4 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -68,11 +68,18 @@ static void monitor_hmp_set_readline(Object *obj, bool = val, Error **errp) mon->use_readline =3D val; } =20 +int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap) + G_GNUC_PRINTF(2, 0); + static void monitor_hmp_class_init(ObjectClass *cls, const void *data) { + MonitorClass *moncls =3D MONITOR_CLASS(cls); + object_class_property_add_bool(cls, "readline", monitor_hmp_get_readline, monitor_hmp_set_readline); + + moncls->vprintf =3D monitor_hmp_vprintf; } =20 static void monitor_hmp_init(Object *obj) @@ -87,6 +94,12 @@ static void monitor_hmp_init(Object *obj) hmp->use_readline =3D true; } =20 +int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap) +{ + g_autofree char *buf =3D g_strdup_vprintf(fmt, ap); + return monitor_puts(mon, buf); +} + static void monitor_command_cb(void *opaque, const char *cmdline, void *readline_opaque) { diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 6a4c3b0f37..23cef68153 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -104,6 +104,13 @@ typedef struct HMPCommand { =20 struct MonitorClass { ObjectClass parent_class; + + /* + * If non-NULL, the monitor is able to print messages + * for attention of the client user + */ + int (*vprintf)(Monitor *mon, const char *fmt, va_list ap) + G_GNUC_PRINTF(2, 0); }; =20 struct Monitor { diff --git a/monitor/monitor.c b/monitor/monitor.c index 76df379a2c..8b70380d64 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -262,21 +262,18 @@ int monitor_puts(Monitor *mon, const char *str) =20 int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) { - char *buf; - int n; + MonitorClass *moncls; =20 if (!mon) { return -1; } =20 - if (monitor_is_qmp(mon)) { + moncls =3D MONITOR_GET_CLASS(mon); + if (!moncls->vprintf) { return -1; } =20 - buf =3D g_strdup_vprintf(fmt, ap); - n =3D monitor_puts(mon, buf); - g_free(buf); - return n; + return moncls->vprintf(mon, fmt, ap); } =20 int monitor_printf(Monitor *mon, const char *fmt, ...) --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208627; cv=none; d=zohomail.com; s=zohoarc; b=QSbbpT5bJKg5KfrbkL3PRHjyIfJHVwmeW+ueYVmt4xwsMqUjXkV4HHxPzrQ0e2GoqITEGeki2f9Edfpc66YgCva9u98x7aMiTEAaedob4AkNmJ5FdWBXMYshRtkVGnQbvrBuug5KCk7j91b6h9H8fE8YyhhO30VxUdy8bFV9JqQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208627; h=Content-Type: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=GaZRS6kP11If+aWj61dmpl8rRVDzTEa+hA64LShi8ho=; b=kM+WxEn7kPiY05C7HiEW5k3nBZewzjG6/+NwuZGbWqWr+Xs0Npowpcxs0yAi+EE+RT8Cc0ctNrflIIiLUAdJjro3kDARr0rA4vQ1Jbi6pUyNnyILm4J1jT2Ry3yeNknlcbsLBup02XxGfdT+DHt1lx2aw7t6A6NCnQxXr8APw9s= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208627481359.28295319020367; Tue, 23 Jun 2026 02:57:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxsB-0003iT-Ee; Tue, 23 Jun 2026 05:56:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxs8-0003aa-Jm for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxs7-0003XX-2f for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:48 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-246-IsBX1QS_O6ygaQpwVuILAQ-1; Tue, 23 Jun 2026 05:56:43 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DBE3A1955D59; Tue, 23 Jun 2026 09:56:41 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D59B41624; Tue, 23 Jun 2026 09:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208606; 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=GaZRS6kP11If+aWj61dmpl8rRVDzTEa+hA64LShi8ho=; b=aTddUus1OLd4uDdkrR7sxWqZevHt/rCmqtgx+/8SPW1VTmmqONJnoQ1yKF3zMQSd8DAWIv N7XWCslGDUuU9RbNnRswCg4cuwdSdQrFhk0dFShy+CuoBKpB0+GdKWyzt38ntH780ldMKM MSebQrATJgJzk9UZ8BVlbZDeiY4qM1Y= X-MC-Unique: IsBX1QS_O6ygaQpwVuILAQ-1 X-Mimecast-MFC-AGG-ID: IsBX1QS_O6ygaQpwVuILAQ_1782208602 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 12/35] monitor: use class methods for monitor_qapi_event_emit Date: Tue, 23 Jun 2026 10:55:28 +0100 Message-ID: <20260623095551.2106712-13-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208628511158500 This removes the need for using monitor_is_qmp() to check the subclass type, which is an anti-pattern. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- include/monitor/monitor.h | 1 + monitor/monitor-internal.h | 5 +++++ monitor/monitor.c | 15 +++------------ monitor/qmp.c | 20 ++++++++++++++++++++ 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index a135b3a590..8cb3db677b 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -3,6 +3,7 @@ =20 #include "block/block.h" #include "qapi/qapi-types-misc.h" +#include "qapi/qapi-emit-events.h" #include "qemu/readline.h" #include "exec/hwaddr.h" #include "qom/object.h" diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 23cef68153..763b5c9625 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -111,6 +111,11 @@ struct MonitorClass { */ int (*vprintf)(Monitor *mon, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0); + /* + * If non-NULL, the monitor is able to send event + * notifications back to the client + */ + void (*emit_event)(Monitor *mon, QAPIEvent event, QDict *qdict); }; =20 struct Monitor { diff --git a/monitor/monitor.c b/monitor/monitor.c index 8b70380d64..6f0353d9f1 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -346,22 +346,13 @@ static inline QEMUClockType monitor_get_event_clock(v= oid) static void monitor_qapi_event_emit(QAPIEvent event, QDict *qdict) { Monitor *mon; - MonitorQMP *qmp_mon; =20 trace_monitor_protocol_event_emit(event, qdict); QTAILQ_FOREACH(mon, &mon_list, entry) { - if (!monitor_is_qmp(mon)) { - continue; + MonitorClass *cls =3D MONITOR_GET_CLASS(mon); + if (cls->emit_event) { + cls->emit_event(mon, event, qdict); } - - qmp_mon =3D container_of(mon, MonitorQMP, parent_obj); - { - QEMU_LOCK_GUARD(&mon->mon_lock); - if (qmp_mon->commands =3D=3D &qmp_cap_negotiation_commands) { - continue; - } - } - qmp_send_response(qmp_mon, qdict); } } =20 diff --git a/monitor/qmp.c b/monitor/qmp.c index 694d303215..ec17050a70 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -99,11 +99,17 @@ static void monitor_qmp_set_pretty(Object *obj, bool va= l, Error **errp) mon->pretty =3D val; } =20 +static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *q= dict); + static void monitor_qmp_class_init(ObjectClass *cls, const void *data) { + MonitorClass *moncls =3D MONITOR_CLASS(cls); + object_class_property_add_bool(cls, "pretty", monitor_qmp_get_pretty, monitor_qmp_set_pretty); + + moncls->emit_event =3D monitor_qmp_emit_event; } =20 static void handle_qmp_command(void *opaque, QObject *req, Error *err); @@ -117,6 +123,20 @@ static void monitor_qmp_init(Object *obj) json_message_parser_init(&mon->parser, handle_qmp_command, mon, NULL); } =20 +static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *q= dict) +{ + MonitorQMP *qmp =3D MONITOR_QMP(mon); + + WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { + if (qmp->commands =3D=3D &qmp_cap_negotiation_commands) { + return; + } + } + + qmp_send_response(qmp, qdict); +} + + static bool qmp_oob_enabled(MonitorQMP *mon) { return mon->capab[QMP_CAPABILITY_OOB]; --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208621; cv=none; d=zohomail.com; s=zohoarc; b=G0tvVtVf/HX8NwJagtVcGh9XjDN90RIXG6O+afqe+xj2/iNEpqX4slZBLOuLTzpemcfWJlVbNuBkm138iEc2o9xeKdGzFMYx+Y8ex0A/yBAnAKiG9m7On41WaGdQxWjGHg/vhBSMLnhsBwNAaHD7jExdaI6PlUpZL154F4kQG7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208621; h=Content-Type: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=XsChjUp1KcbZxYJjnmda8WFjS2K5/o40Uam9XYFjjhM=; b=CK1kIzhXb0GN9SqQM7QlOErpuGlUQuG4giIF+Au+QYPkQndyRP+U2WlY1mazpHufIFeqEwk4venRtGj2+2Ksq6pmt9rZv9G9443y5pDEbJl9FA9IqhITYTSCw4D4a0hfZXvhVohOy7AncaWEGu1GHv0kZG175T0NyB5Ceb7LwHc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208621252451.43999278878346; Tue, 23 Jun 2026 02:57:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxsE-0003n3-Hg; Tue, 23 Jun 2026 05:56:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsB-0003ie-Ii for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsA-0003Xv-59 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:51 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-444-uvCJpXtfNKiK4qixwAn2cA-1; Tue, 23 Jun 2026 05:56:48 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 75E88195410D; Tue, 23 Jun 2026 09:56:45 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 563651624; Tue, 23 Jun 2026 09:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208609; 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=XsChjUp1KcbZxYJjnmda8WFjS2K5/o40Uam9XYFjjhM=; b=MJ6D65g88IUerNvwW6F0DRv6x67RHFuRF+QdNV2tNpVwfra8+5jBFP2oK8FR7rG39dfS6P q78nz3vmsD5cmRm71Md+mX9iuie/1TKBRhQ4uKNlbVy6SJcu+kj2JwbUznjhWMf8JGWGYS +3iDT0FbHh93q+jkyut70NmvpAJ8tug= X-MC-Unique: uvCJpXtfNKiK4qixwAn2cA-1 X-Mimecast-MFC-AGG-ID: uvCJpXtfNKiK4qixwAn2cA_1782208606 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 13/35] monitor: use class methods for monitor_accept_input Date: Tue, 23 Jun 2026 10:55:29 +0100 Message-ID: <20260623095551.2106712-14-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208622330158500 This removes the need for using monitor_is_qmp() to check the subclass type, which is an anti-pattern. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/hmp.c | 16 ++++++++++++++++ monitor/monitor-internal.h | 5 +++++ monitor/monitor.c | 12 +++--------- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index 08055839a4..1da9370ead 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -70,6 +70,7 @@ static void monitor_hmp_set_readline(Object *obj, bool va= l, Error **errp) =20 int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0); +static void monitor_hmp_accept_input(Monitor *mon); =20 static void monitor_hmp_class_init(ObjectClass *cls, const void *data) { @@ -80,6 +81,7 @@ static void monitor_hmp_class_init(ObjectClass *cls, cons= t void *data) monitor_hmp_set_readline); =20 moncls->vprintf =3D monitor_hmp_vprintf; + moncls->accept_input =3D monitor_hmp_accept_input; } =20 static void monitor_hmp_init(Object *obj) @@ -100,6 +102,20 @@ int monitor_hmp_vprintf(Monitor *mon, const char *fmt,= va_list ap) return monitor_puts(mon, buf); } =20 +static void monitor_hmp_accept_input(Monitor *mon) +{ + qemu_mutex_lock(&mon->mon_lock); + if (mon->reset_seen) { + MonitorHMP *hmp =3D MONITOR_HMP(mon); + assert(hmp->rs); + readline_restart(hmp->rs); + qemu_mutex_unlock(&mon->mon_lock); + readline_show_prompt(hmp->rs); + } else { + qemu_mutex_unlock(&mon->mon_lock); + } +} + static void monitor_command_cb(void *opaque, const char *cmdline, void *readline_opaque) { diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 763b5c9625..592f146331 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -116,6 +116,11 @@ struct MonitorClass { * notifications back to the client */ void (*emit_event)(Monitor *mon, QAPIEvent event, QDict *qdict); + /* + * If non-NULL, perform any actions needed to prepare + * the monitor to accept further client input + */ + void (*accept_input)(Monitor *mon); }; =20 struct Monitor { diff --git a/monitor/monitor.c b/monitor/monitor.c index 6f0353d9f1..2f16cd3053 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -576,16 +576,10 @@ int monitor_suspend(Monitor *mon) static void monitor_accept_input(void *opaque) { Monitor *mon =3D opaque; + MonitorClass *cls =3D MONITOR_GET_CLASS(mon); =20 - qemu_mutex_lock(&mon->mon_lock); - if (!monitor_is_qmp(mon) && mon->reset_seen) { - MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, parent_obj); - assert(hmp_mon->rs); - readline_restart(hmp_mon->rs); - qemu_mutex_unlock(&mon->mon_lock); - readline_show_prompt(hmp_mon->rs); - } else { - qemu_mutex_unlock(&mon->mon_lock); + if (cls->accept_input) { + cls->accept_input(mon); } =20 qemu_chr_fe_accept_input(&mon->chr); --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208636; cv=none; d=zohomail.com; s=zohoarc; b=Y+LUXuVEUwzIibLwD8LMA6mu0Fh/ZaPIwszNjzJ0t5oaHrCshijCaVAW+wJ3VSTiAr3IRVgeMUJI96vJ9UqSYqyHeUW6pVOEWq0dv4KX3yjxZNmRMTyU3x5AXDO29ofItJJ2uiHZvlxv083MxugeyJV7/FIx6QGDjXIiHx8LUr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208636; h=Content-Type: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=9AQldYg5h2VAyCRnkpJZstjEVQUu9sZhbO2jPxkeD/k=; b=fDo5NlK8gKUxLVy1AVwQ2IEDRmohk0OCxN3gWhGS4USs2tYZG1IJC4zG++bUFCZUj+AD5P5rB/Jw/M633FHbaifoinRUqzHkkeyI6lvuBLDzajyxK9U2wUtwpDuNAHFbSs9EOr9W3b/o/Ohsqh+7K4lM5FxEG45DXSJ1jmd1Ud0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208636890621.1570913374504; Tue, 23 Jun 2026 02:57:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxsI-0003uX-6A; Tue, 23 Jun 2026 05:56:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsG-0003qh-33 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsE-0003YQ-14 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:56:55 -0400 Received: from mx-prod-mc-06.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-78-zSsMVH93OAKExLI6TW3SqA-1; Tue, 23 Jun 2026 05:56:50 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E38E41800594; Tue, 23 Jun 2026 09:56:48 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E58B41624; Tue, 23 Jun 2026 09:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208613; 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=9AQldYg5h2VAyCRnkpJZstjEVQUu9sZhbO2jPxkeD/k=; b=NOC0y+hq7LQT6iZW6xyfEpq8MLd/1+Yf1doWGNINGeydOC/ET9bSE5YiyjujhEDKbvYbLN JaDvouGYYCg2Ips3BTM5sRTIE2n+UMLeYTZkZ1oERYSbNDS5yj1HBueLt2nrHUofwKNe+T O86G60L4kMvXUTWkN56lDSZJMe+hF7Y= X-MC-Unique: zSsMVH93OAKExLI6TW3SqA-1 X-Mimecast-MFC-AGG-ID: zSsMVH93OAKExLI6TW3SqA_1782208609 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 14/35] monitor: use class method for I/O thread request Date: Tue, 23 Jun 2026 10:55:30 +0100 Message-ID: <20260623095551.2106712-15-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1782208638621158500 Introducing a virtual "requires_iothread" method allows the code to automatically initialize the I/O thread during object completion. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/monitor-internal.h | 14 +++++++++----- monitor/monitor.c | 22 ++++++++++++---------- monitor/qmp.c | 20 +++++++++++--------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 592f146331..efd21b8912 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -121,6 +121,12 @@ struct MonitorClass { * the monitor to accept further client input */ void (*accept_input)(Monitor *mon); + + /* + * If non-NULL and returns true, then an I/O thread + * is required for processing the monitor + */ + bool (*requires_iothread)(const Monitor *mon); }; =20 struct Monitor { @@ -129,7 +135,6 @@ struct Monitor { CharFrontend chr; int suspend_cnt; /* Needs to be accessed atomically */ bool is_qmp; - bool use_io_thread; =20 char *mon_cpu_path; QTAILQ_ENTRY(Monitor) entry; @@ -159,9 +164,8 @@ struct MonitorHMP { bool use_readline; /* * State used only in the thread "owning" the monitor. - * If @use_io_thread, this is @mon_iothread. (This does not actually h= appen - * in the current state of the code.) - * Else, it's the main thread. + * This is currently always the main thread, since + * HMP does not allow use of the I/O thread at this time. * These members can be safely accessed without locks. */ ReadLineState *rs; @@ -210,7 +214,7 @@ extern QemuMutex monitor_lock; extern MonitorList mon_list; =20 void monitor_complete(Monitor *mon, Error **errp); -void monitor_iothread_init(Monitor *mon); +bool monitor_requires_iothread(const Monitor *mon); int monitor_can_read(void *opaque); void monitor_list_append(Monitor *mon); void monitor_fdsets_cleanup(void); diff --git a/monitor/monitor.c b/monitor/monitor.c index 2f16cd3053..b788669f1f 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -160,6 +160,12 @@ bool monitor_cur_is_qmp(void) return cur_mon && monitor_is_qmp(cur_mon); } =20 +bool monitor_requires_iothread(const Monitor *mon) +{ + MonitorClass *cls =3D MONITOR_GET_CLASS(mon); + return cls->requires_iothread && cls->requires_iothread(mon); +} + /** * Is @mon is using readline? * Note: not all HMP monitors use readline, e.g., gdbserver has a @@ -561,7 +567,7 @@ int monitor_suspend(Monitor *mon) =20 qatomic_inc(&mon->suspend_cnt); =20 - if (mon->use_io_thread) { + if (monitor_requires_iothread(mon)) { /* * Kick I/O thread to make sure this takes effect. It'll be * evaluated again in prepare() of the watch object. @@ -594,7 +600,7 @@ void monitor_resume(Monitor *mon) if (qatomic_dec_fetch(&mon->suspend_cnt) =3D=3D 0) { AioContext *ctx; =20 - if (mon->use_io_thread) { + if (monitor_requires_iothread(mon)) { ctx =3D iothread_get_aio_context(mon_iothread); } else { ctx =3D qemu_get_aio_context(); @@ -632,14 +638,6 @@ void monitor_list_append(Monitor *mon) } } =20 -void monitor_iothread_init(Monitor *mon) -{ - if (!mon_iothread) { - mon_iothread =3D iothread_create("mon_iothread", &error_abort); - } - mon->use_io_thread =3D true; -} - void monitor_cleanup(void) { /* @@ -734,6 +732,10 @@ void monitor_complete(Monitor *mon, Error **errp) return; } } + + if (monitor_requires_iothread(mon) && !mon_iothread) { + mon_iothread =3D iothread_create("mon_iothread", &error_abort); + } } =20 int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp) diff --git a/monitor/qmp.c b/monitor/qmp.c index ec17050a70..93f576c19d 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -100,6 +100,7 @@ static void monitor_qmp_set_pretty(Object *obj, bool va= l, Error **errp) } =20 static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *q= dict); +static bool monitor_qmp_requires_iothread(const Monitor *mon); =20 static void monitor_qmp_class_init(ObjectClass *cls, const void *data) { @@ -110,6 +111,7 @@ static void monitor_qmp_class_init(ObjectClass *cls, co= nst void *data) monitor_qmp_set_pretty); =20 moncls->emit_event =3D monitor_qmp_emit_event; + moncls->requires_iothread =3D monitor_qmp_requires_iothread; } =20 static void handle_qmp_command(void *opaque, QObject *req, Error *err); @@ -136,6 +138,11 @@ static void monitor_qmp_emit_event(Monitor *mon, QAPIE= vent event, QDict *qdict) qmp_send_response(qmp, qdict); } =20 +static bool monitor_qmp_requires_iothread(const Monitor *mon) +{ + return qemu_chr_has_feature(mon->chr.chr, + QEMU_CHAR_FEATURE_GCONTEXT); +} =20 static bool qmp_oob_enabled(MonitorQMP *mon) { @@ -146,7 +153,8 @@ static void monitor_qmp_caps_reset(MonitorQMP *mon) { memset(mon->capab_offered, 0, sizeof(mon->capab_offered)); memset(mon->capab, 0, sizeof(mon->capab)); - mon->capab_offered[QMP_CAPABILITY_OOB] =3D mon->parent_obj.use_io_thre= ad; + mon->capab_offered[QMP_CAPABILITY_OOB] =3D + monitor_requires_iothread(MONITOR(mon)); } =20 static void qmp_request_free(QMPRequest *req) @@ -562,7 +570,7 @@ static void monitor_qmp_setup_handlers_bh(void *opaque) MonitorQMP *mon =3D opaque; GMainContext *context; =20 - assert(mon->parent_obj.use_io_thread); + assert(monitor_requires_iothread(MONITOR(mon))); context =3D iothread_get_g_main_context(mon_iothread); assert(context); qemu_chr_fe_set_handlers(&mon->parent_obj.chr, monitor_can_read, @@ -598,13 +606,7 @@ void monitor_new_qmp(const char *chardev_id, bool pret= ty, Error **errp) =20 qemu_chr_fe_set_echo(&mon->parent_obj.chr, true); =20 - /* Note: we run QMP monitor in I/O thread when @chr supports that */ - if (qemu_chr_has_feature(mon->parent_obj.chr.chr, - QEMU_CHAR_FEATURE_GCONTEXT)) { - monitor_iothread_init(&mon->parent_obj); - } - - if (mon->parent_obj.use_io_thread) { + if (monitor_requires_iothread(MONITOR(mon))) { /* * Make sure the old iowatch is gone. It's possible when * e.g. the chardev is in client mode, with wait=3Don. --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208696; cv=none; d=zohomail.com; s=zohoarc; b=I/kxm9swVYf02xR3m9C5I8mogbyZYv6bG5P3tIhssJTj+0kLR5TgTrPiVDliSfCya0esqzLmXrhxoZvJXwqvzrLRcDfrZvzP9lBJ/6gNCdwX2wlE/CikjQiZGA6tJLnfNuq4yGMPLdrMGK9UXgcBdEpZS3Nu6lT5wrItHLjycyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208696; h=Content-Type: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=okPUFA5nF2VL2bdY5JbJOUyGsqh+2WdGWj2cWhNtcvA=; b=P+a4C7Y640DFPVX+TFHG17dNgWQENwTinp6U4t/SxWzcsRNOTHiBEZiOK0b6XrDuXx6mZEHIzEcPKMNm4Duoow7TZ2gatqQUb6zRGo6o5E4gBkVTllHPDwxm0A5SmOXCQqQkOQPJPqKnwwKmx+LoDW1Cm9DThAssYIshR28f+Ro= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208696282485.05261408298065; Tue, 23 Jun 2026 02:58:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxsR-0004ly-TO; Tue, 23 Jun 2026 05:57:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsP-0004Vw-Tz for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:05 -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 1wbxsM-0003Yw-Mf for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:05 -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-361-m8LW5O2RP8GqpD0nRiUFxA-1; Tue, 23 Jun 2026 05:56:55 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 6EE221800BD0; Tue, 23 Jun 2026 09:56:52 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6E8B11624; Tue, 23 Jun 2026 09:56:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208619; 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=okPUFA5nF2VL2bdY5JbJOUyGsqh+2WdGWj2cWhNtcvA=; b=MLGPumDEotGNsSJ5YYBEsj4SI8TjbvFONhwSissQlVIqO5Rj0/D0h6rNYyGIy04bQe1/lV kvcZhEUpI5Nc+F0KG+fAiR8PTXrpbvRvULLy+z9zmqkYY4ZqZq9QuUGIzYfYmGWalEkohy YOSFjOd9YEY0e4znc5A2IcRDg/qqCOc= X-MC-Unique: m8LW5O2RP8GqpD0nRiUFxA-1 X-Mimecast-MFC-AGG-ID: m8LW5O2RP8GqpD0nRiUFxA_1782208612 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 15/35] monitor: use dynamic cast in monitor_qmp_requests_pop_any_with_lock Date: Tue, 23 Jun 2026 10:55:31 +0100 Message-ID: <20260623095551.2106712-16-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1782208696802158500 This eliminates a use of monitor_is_qmp() from the QMP coroutine dispatch path. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/qmp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/monitor/qmp.c b/monitor/qmp.c index 93f576c19d..d2a03bb7e3 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -277,11 +277,12 @@ static QMPRequest *monitor_qmp_requests_pop_any_with_= lock(void) MonitorQMP *qmp_mon; =20 QTAILQ_FOREACH(mon, &mon_list, entry) { - if (!monitor_is_qmp(mon)) { + qmp_mon =3D MONITOR_QMP( + object_dynamic_cast(OBJECT(mon), TYPE_MONITOR_QMP)); + if (!qmp_mon) { continue; } =20 - qmp_mon =3D container_of(mon, MonitorQMP, parent_obj); qemu_mutex_lock(&qmp_mon->qmp_queue_lock); req_obj =3D g_queue_pop_head(qmp_mon->qmp_requests); if (req_obj) { --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208665; cv=none; d=zohomail.com; s=zohoarc; b=YoNvO97LFo+g0rQjtY9MFNFkiVNQIhkbIqwwkmzrWq1isPpD5QZLWpJsODPCkCJ2FzT7igcvwdsygUN313EVqX681VzZK5t0IegS/awpyG6XAgf3+kC7qS9f4q85TsIIHuCa2XLhUmDjQLhrQ0BzqZeU+26gITw3491I6z7KllU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208665; h=Content-Type: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=xJyrN9qzF/1N7R7DAoaxuEo+MdMZmlFBVWGcX0sE8hs=; b=H+6Xu/6yjZ76VT0fENK6iY8LEhPtpc6LkSr1N3pSzde4xPaKRinlu3QVIYwsiDct64KxOrsflPEHJ9jp10EYYG7ANTzChWcUpYKYOgqVbQHruDSs/KrC/IirwZIjQ+q/SXJg7q0LB/QHVTVC4dsbNBK5g0V15tPKVLxAU+tVRl8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208665347993.8827161055351; Tue, 23 Jun 2026 02:57:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxsT-0004w9-1p; Tue, 23 Jun 2026 05:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsR-0004hM-83 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsO-0003Yy-Ad for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:06 -0400 Received: from mx-prod-mc-06.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-294-Gzq2siAXM-22BAtzuFFVgA-1; Tue, 23 Jun 2026 05:56:57 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 003741800597; Tue, 23 Jun 2026 09:56:56 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DF0DCD6E; Tue, 23 Jun 2026 09:56:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208619; 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=xJyrN9qzF/1N7R7DAoaxuEo+MdMZmlFBVWGcX0sE8hs=; b=asKPtVrhJeNvQK7TWFNZK3+jtBVBAJJCyJ8+toA8WdCYWMOYxcOIItLdWcvESjzuozEkD3 YeI2xSi8hYR2VF25otiHYzH/bklCvQ3SGgOi1dOCNy7axx/KKh8beNfRo58+9B9y/xBccR 1W6GeziVpd21+wqvm6QNapuSl1EvUOE= X-MC-Unique: Gzq2siAXM-22BAtzuFFVgA-1 X-Mimecast-MFC-AGG-ID: Gzq2siAXM-22BAtzuFFVgA_1782208616 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 16/35] util: use dynamic cast in error vreport Date: Tue, 23 Jun 2026 10:55:32 +0100 Message-ID: <20260623095551.2106712-17-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1782208666466158501 This eliminates a use of monitor_is_qmp() from the error reporting path. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- util/error-report.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/util/error-report.c b/util/error-report.c index f832ad9b6b..f333af9249 100644 --- a/util/error-report.c +++ b/util/error-report.c @@ -231,16 +231,15 @@ char *real_time_iso8601(void) G_GNUC_PRINTF(2, 0) static void vreport(report_type type, const char *fmt, va_list ap) { - Monitor *cur =3D monitor_cur(); - gchar *timestr; - /* * When current monitor is QMP, messages must go to stderr - * and have prefixes added + * and have prefixes added, so we cast to HMP, leaving 'cur' + * as NULL in QMP case */ - if (monitor_cur_is_qmp()) { - cur =3D NULL; - } + Monitor *cur =3D MONITOR( + object_dynamic_cast(OBJECT(monitor_cur()), TYPE_MONITOR_HMP)); + gchar *timestr; + if (!cur) { qemu_flockfile(stderr); } --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208671; cv=none; d=zohomail.com; s=zohoarc; b=Fqgpvxc9ZnH3yNubFXN/xAcTonijPj/a4TCYWsa+A2DMvs2yVmzEElIpFeRk7H9E+K2MfEi3qZRFvpczG79ytrQkkIV3P+85m8c6eWcOA89x51VHsGKaUa4oXCpiQ6eAUFNjM7Hw8RXpt5bTLTh5dQbsm3QqQ/dLojmH4KtRDLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208671; h=Content-Type: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=vBccP12uRP4gweSRAyvqJ41BwcAVqGdV/qDAEkpLjv0=; b=VDblf4MmmtKJRGmU99ogEsv+uu4lJZX9DCxRK7TaFMc4n+DIq79hArbX0YQM5raB9EPeyDTxNItTQq3PX8AhCJh24QzroASaZWkvcavwyj9It9KXPVUeEkyYfCHGL9thDXIyhRVH0lep+tm/ibBby1qFW7bQt4ySay0Vwc0i1kM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208671779710.7763899280437; Tue, 23 Jun 2026 02:57:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxsT-00050W-OC; Tue, 23 Jun 2026 05:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsR-0004j4-Eo for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:07 -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 1wbxsP-0003aw-IR for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:07 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-35-ie9Q5r1ROveBbqvcSHYvwg-1; Tue, 23 Jun 2026 05:57:01 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 927621956058; Tue, 23 Jun 2026 09:56:59 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 78127D6E; Tue, 23 Jun 2026 09:56:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208624; 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=vBccP12uRP4gweSRAyvqJ41BwcAVqGdV/qDAEkpLjv0=; b=eHZFTPLGVZnL0U0rm0JhiOqpnK9CYNRCZp+Zae6XcF2rvnLJsriRw4MRkEOQdWO0Vi41ho hJVfxQS1ETiSvlEI9aYvhIyvLv/63iEuPcqx3iuYbL+l12IQrF5fISqbxk2zUEovC7Edki PnBLmmgF1MmxAnRB1mz20rFlPzsfU+Q= X-MC-Unique: ie9Q5r1ROveBbqvcSHYvwg-1 X-Mimecast-MFC-AGG-ID: ie9Q5r1ROveBbqvcSHYvwg_1782208619 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 17/35] monitor: drop unused monitor_cur_is_qmp Date: Tue, 23 Jun 2026 10:55:33 +0100 Message-ID: <20260623095551.2106712-18-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208672481158500 The previous patch dropped the only remaining use of monitor_cur_is_qmp. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- include/monitor/monitor.h | 1 - monitor/monitor.c | 10 ---------- stubs/monitor-core.c | 5 ----- tests/unit/test-util-sockets.c | 1 - tools/qemu-vnc/stubs.c | 5 ----- 5 files changed, 22 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 8cb3db677b..3f730cffee 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -25,7 +25,6 @@ extern QemuOptsList qemu_mon_opts; =20 Monitor *monitor_cur(void); Monitor *monitor_set_cur(Coroutine *co, Monitor *mon); -bool monitor_cur_is_qmp(void); =20 void monitor_init_globals(void); void monitor_init_globals_core(void); diff --git a/monitor/monitor.c b/monitor/monitor.c index b788669f1f..0db7903795 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -150,16 +150,6 @@ Monitor *monitor_set_cur(Coroutine *co, Monitor *mon) return old_monitor; } =20 -/** - * Is the current monitor, if any, a QMP monitor? - */ -bool monitor_cur_is_qmp(void) -{ - Monitor *cur_mon =3D monitor_cur(); - - return cur_mon && monitor_is_qmp(cur_mon); -} - bool monitor_requires_iothread(const Monitor *mon) { MonitorClass *cls =3D MONITOR_GET_CLASS(mon); diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c index 078a5012e9..a7c32297c9 100644 --- a/stubs/monitor-core.c +++ b/stubs/monitor-core.c @@ -7,11 +7,6 @@ Monitor *monitor_cur(void) return NULL; } =20 -bool monitor_cur_is_qmp(void) -{ - return false; -} - Monitor *monitor_set_cur(Coroutine *co, Monitor *mon) { return NULL; diff --git a/tests/unit/test-util-sockets.c b/tests/unit/test-util-sockets.c index b9f2453e29..ee66d727c3 100644 --- a/tests/unit/test-util-sockets.c +++ b/tests/unit/test-util-sockets.c @@ -74,7 +74,6 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Erro= r **errp) Monitor *monitor_cur(void) { return cur_mon; } Monitor *monitor_set_cur(Coroutine *co, Monitor *mon) { abort(); } int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) { abort(); } -bool monitor_cur_is_qmp(void) { abort(); }; =20 #ifndef _WIN32 static void test_socket_fd_pass_name_good(void) diff --git a/tools/qemu-vnc/stubs.c b/tools/qemu-vnc/stubs.c index a865ce85f0..1c82d8cff4 100644 --- a/tools/qemu-vnc/stubs.c +++ b/tools/qemu-vnc/stubs.c @@ -36,11 +36,6 @@ Monitor *monitor_cur(void) return NULL; } =20 -bool monitor_cur_is_qmp(void) -{ - return false; -} - Monitor *monitor_set_cur(Coroutine *co, Monitor *mon) { return NULL; --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208882; cv=none; d=zohomail.com; s=zohoarc; b=NAPBl6wP5L6dJceliYB7arNMpJ82GEvdWlxG32zwuV/DYKziGWPlaFPRcAR/EKv5XpmZ2ijMnFdDDjpMVxMRCKOW4Z0pNuogPux/F/zZsZBVAOmnuwwNR3Lvt32sWRff7pwr4n9/cc3cOF+36eJk3izbgWu4orFfaFXqb2oYNQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208882; h=Content-Type: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=d4J3NY6SkrF2r5U11bkZ7/+5afUfsOT+vnHqEhm70ao=; b=B2Gp/HBSnfJt2/xjOIhE8RLLY3loqJFs3ak0JLBAXlmIjAKck936jpQnfO23NSYYKzBRQWpaq2OXl1vR4uAGdWb6fGkghLCOquqet3WIX3pCHvygoakXzX3uAHbqmvYKOV6j3Yjpmw6LTgjTJDaWPQ0QuSSgB+XXLoLKpbgUlps= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208882025453.13015009799483; Tue, 23 Jun 2026 03:01:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxsU-0005D3-Fv; Tue, 23 Jun 2026 05:57:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsS-0004tf-OF for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:08 -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 1wbxsR-0003bu-2T for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:08 -0400 Received: from mx-prod-mc-06.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-241-TYcYAXTRPfmU5D5cD_4K3Q-1; Tue, 23 Jun 2026 05:57:04 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3DF66180034E; Tue, 23 Jun 2026 09:57:03 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 12BA21624; Tue, 23 Jun 2026 09:56:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208626; 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=d4J3NY6SkrF2r5U11bkZ7/+5afUfsOT+vnHqEhm70ao=; b=ZId9awpWZwCs0y2Zp6kYl+VB9jz8WfKwFXwJq4QVAA6u5UbhX1sFQRJtMmsLVTRPJB+yNF RsSIGx59QgAdOALrij47zlj1D+ejcg8tHPWAdUIn9JA+El9P/qHVYueFpwtNJVSxLFzXzb hfI4Tcfnk3pSpnYprLyNrEqYVsg2B64= X-MC-Unique: TYcYAXTRPfmU5D5cD_4K3Q-1 X-Mimecast-MFC-AGG-ID: TYcYAXTRPfmU5D5cD_4K3Q_1782208623 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 18/35] monitor: use dynamic cast in QMP commands Date: Tue, 23 Jun 2026 10:55:34 +0100 Message-ID: <20260623095551.2106712-19-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1782208883945158500 Rather than asserting monitor_is_qmp(), use a QOM cast via MONITOR_QMP which performs an assert already. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/qmp-cmds-control.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/monitor/qmp-cmds-control.c b/monitor/qmp-cmds-control.c index af6a2a118b..8fe0876a3d 100644 --- a/monitor/qmp-cmds-control.c +++ b/monitor/qmp-cmds-control.c @@ -72,11 +72,7 @@ static bool qmp_caps_accept(MonitorQMP *mon, QMPCapabili= tyList *list, void qmp_qmp_capabilities(bool has_enable, QMPCapabilityList *enable, Error **errp) { - Monitor *cur_mon =3D monitor_cur(); - MonitorQMP *mon; - - assert(monitor_is_qmp(cur_mon)); - mon =3D container_of(cur_mon, MonitorQMP, parent_obj); + MonitorQMP *mon =3D MONITOR_QMP(monitor_cur()); =20 if (mon->commands =3D=3D &qmp_commands) { error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, @@ -122,11 +118,7 @@ static void query_commands_cb(const QmpCommand *cmd, v= oid *opaque) CommandInfoList *qmp_query_commands(Error **errp) { CommandInfoList *list =3D NULL; - Monitor *cur_mon =3D monitor_cur(); - MonitorQMP *mon; - - assert(monitor_is_qmp(cur_mon)); - mon =3D container_of(cur_mon, MonitorQMP, parent_obj); + MonitorQMP *mon =3D MONITOR_QMP(monitor_cur()); =20 qmp_for_each_command(mon->commands, query_commands_cb, &list); =20 --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208652; cv=none; d=zohomail.com; s=zohoarc; b=A7maBk+IWitSp6s2U2hsqIJmTzNJflS6g9U/pfOyTWtWzdv2UDePrZEB4HZrSNKISSudugyxak266Y3w/5uF+svt3p+fquy33LJh49mCxJ9eyXKHmyLAsCFOLXc7712DYgSXvr921M1ZjSE/3tyXphSgd4WyEJMM0TpYsnZIjn8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208652; h=Content-Type: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=sjPuAHOwXTifWErLIRrpxO/YAfesF1rBMpyxwl4gzCg=; b=VIbRz0ImFhX0uWfJ0w3PMrQ1O652LE0P2JhUnQNKIakrMIYfhBUh6ddOLLhpilYTRF8UkN73qD6y86FqkwX6e1nEQFncbCtN+69j0PXnUlzmDnpdrq659eFfIMknSX3J3JVFZDz6e/l0hynrscvq6I+MEjGTi6FQPe0EIGk0UVA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208652961496.50385839646503; Tue, 23 Jun 2026 02:57:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxsY-0005cJ-UQ; Tue, 23 Jun 2026 05:57:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsX-0005Qr-Au for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:13 -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 1wbxsW-0003d7-0L for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:13 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-xoJSe16YPC-N6BsfOx0TJA-1; Tue, 23 Jun 2026 05:57:08 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D73DE1955F7C; Tue, 23 Jun 2026 09:57:06 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 83570D6E; Tue, 23 Jun 2026 09:57:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208631; 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=sjPuAHOwXTifWErLIRrpxO/YAfesF1rBMpyxwl4gzCg=; b=XH6XoC1tLV/sY1/Xyld4dtOmot/Z6ZSKh0/rQuJtNLFPznES59w3kxsY9QtZ/2HMSckCt5 IkeneE8hidb+mcllVZ+b95n1wNhkkWrsAWIUnAWLIjtdIdDmbsUFFK1NTJFQ7LJkKNPzgW vtwjcuCK9uuiqeNqp+dNptLyuMrlreY= X-MC-Unique: xoJSe16YPC-N6BsfOx0TJA-1 X-Mimecast-MFC-AGG-ID: xoJSe16YPC-N6BsfOx0TJA_1782208627 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 19/35] monitor: use dynamic cast in monitor_is_hmp_non_interactive Date: Tue, 23 Jun 2026 10:55:35 +0100 Message-ID: <20260623095551.2106712-20-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208654523158500 Rather than checking !monitor_is_qmp(), use a dynamic cast to check for HMP. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor/monitor.c b/monitor/monitor.c index 0db7903795..15e49d78d7 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -168,7 +168,7 @@ static inline bool monitor_uses_readline(const MonitorH= MP *mon) =20 static inline bool monitor_is_hmp_non_interactive(const Monitor *mon) { - if (monitor_is_qmp(mon)) { + if (!object_dynamic_cast(OBJECT(mon), TYPE_MONITOR_HMP)) { return false; } =20 --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208732; cv=none; d=zohomail.com; s=zohoarc; b=nVhThzE0VXlJLYh+vqds3g/UvORoilyadJlY/D/y1SUWoY1D18UPF9JPn+0NqFxz6C1wJMl92tx8T5j5S5Bi7bXI0ciDx3y/UqeHYnvUuVfVx0IDGQa7HWG2rbKk+CfJzeaBX223rGc5etkYNqpeR0tn7EpGs6pXOq0zUYKifnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208732; h=Content-Type: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=lnkUfljp0szhH6NWfGe9eUMa/D1XCsRE4LST+qUrluM=; b=bfHZDtbqQizZLSOM/20keOlx2pKkFO4GAICq8G9SLUsjn9P/jfd9KGjw2VKfaHo9E+4Hpit59gbzV9VYefLkZGXh6C2fqId7JENPI+92t/gSVZcK2k4z1DdmZ1Qf/ELI+JoAEuFFZmV5RTmq2wQfwJe2Ls2QrI9Pb77mWjsCgOQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208732044893.6500199245112; Tue, 23 Jun 2026 02:58:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxsd-000607-Gw; Tue, 23 Jun 2026 05:57:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsb-0005tM-Bi for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsZ-0003f4-La for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:16 -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-542-ZszxbFrkOCyML68TjNxpgQ-1; Tue, 23 Jun 2026 05:57:11 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 886F41800D9C; Tue, 23 Jun 2026 09:57:10 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5B12AD6E; Tue, 23 Jun 2026 09:57:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208635; 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=lnkUfljp0szhH6NWfGe9eUMa/D1XCsRE4LST+qUrluM=; b=eB1IXutOLdtcggDrJDZ6hCvUHjS75l+c8MDBj9WiQFL8NF3BjLkUdyJFpmmldKVJjml13Z PIrH8PrG1CGRT1EC41kbYe+6iYcWrQUHzEiDjXn62VmRskCaVYOCHLqnW/po6jnQ7ZwGus XIN/gcRNGyhD2vTwy88uu8oAtZBu87I= X-MC-Unique: ZszxbFrkOCyML68TjNxpgQ-1 X-Mimecast-MFC-AGG-ID: ZszxbFrkOCyML68TjNxpgQ_1782208630 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 20/35] monitor: drop unused monitor_is_qmp method Date: Tue, 23 Jun 2026 10:55:36 +0100 Message-ID: <20260623095551.2106712-21-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1782208732827158500 The previous patch dropped the only remaining use of monitor_is_qmp. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/monitor-internal.h | 9 --------- monitor/monitor.c | 1 - 2 files changed, 10 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index efd21b8912..fe5703af6d 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -134,7 +134,6 @@ struct Monitor { char *chardev_id; CharFrontend chr; int suspend_cnt; /* Needs to be accessed atomically */ - bool is_qmp; =20 char *mon_cpu_path; QTAILQ_ENTRY(Monitor) entry; @@ -197,14 +196,6 @@ struct MonitorQMP { GQueue *qmp_requests; }; =20 -/** - * Is @mon a QMP monitor? - */ -static inline bool monitor_is_qmp(const Monitor *mon) -{ - return mon->is_qmp; -} - typedef QTAILQ_HEAD(MonitorList, Monitor) MonitorList; extern IOThread *mon_iothread; extern Coroutine *qmp_dispatcher_co; diff --git a/monitor/monitor.c b/monitor/monitor.c index 15e49d78d7..6ed586fc4f 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -113,7 +113,6 @@ static void monitor_init(Object *obj) Monitor *mon =3D MONITOR(obj); =20 qemu_mutex_init(&mon->mon_lock); - mon->is_qmp =3D !!object_dynamic_cast(obj, TYPE_MONITOR_QMP); mon->outbuf =3D g_string_new(NULL); } =20 --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208886; cv=none; d=zohomail.com; s=zohoarc; b=PfpkNnDVt985T4dlNAA5p7jR4jrf0LTej2V7kxRkYYP7vfZuw+yM9MEfxReAC7qNK94SpP7sGEkeIurFOkEw1DLirv3+LaeR8YbzxEdB2tuFh2H2aW2YqXyijXWwaszd4h0/axYvagyGLFmYK8F22fmIFkEduthjq52xdNU8hXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208886; h=Content-Type: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=71Iwq7ab+LPd69dB396/P5lONndhgRWtxvu0kCeQ7HA=; b=lc5kO4JTWFeviznDA2PndUButDDsZI4pRJqzGfhQHUYk4lm6RX3RdmDnE0WAJXttfqY+LcYHgjggcGhFARuRVT9fnrcB3A+LEDFmAl3s/765TQdYzwUcoYrgZFyq9RCa7tyrLK3zr8goDL5URR7JVmrqNpIBjDpI9ydcZiTTTM4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208886193560.7043203015331; Tue, 23 Jun 2026 03:01:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxst-0006IH-Nd; Tue, 23 Jun 2026 05:57:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsf-00067J-S7 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:22 -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 1wbxsd-0003fp-8P for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:20 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-529-3CRcmcjXM0SdcF9O-JSj4w-1; Tue, 23 Jun 2026 05:57:15 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EFB3E1955F13; Tue, 23 Jun 2026 09:57:13 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0EAC4D6E; Tue, 23 Jun 2026 09:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208638; 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=71Iwq7ab+LPd69dB396/P5lONndhgRWtxvu0kCeQ7HA=; b=QmqG5M5Y8RZ4SRzMl0pbtCUyC8lKpB2DyYS5MAkD9MNrNNjMapyK/2V1fvBICUzvy9yp9Y D5bKbxvjknpEwdp1Kj7Wr9DTnck2Xgu2j3HYUsLFbdCbfnz9XgZ+rZ3ADjONDmjwNoPBd+ 8qhN6evSgRfwL0SK1vCPVdWSq+5sGvU= X-MC-Unique: 3CRcmcjXM0SdcF9O-JSj4w-1 X-Mimecast-MFC-AGG-ID: 3CRcmcjXM0SdcF9O-JSj4w_1782208634 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 21/35] monitor: eliminate monitor_is_hmp_non_interactive method Date: Tue, 23 Jun 2026 10:55:37 +0100 Message-ID: <20260623095551.2106712-22-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208888085158500 The monitor_is_hmp_non_interactive method is used by monitor_suspend and monitor_resume, to make them a no-op if the HMP does not use readline. There are only a handful of callers of suspend/resume and they can be made to skip the call when readline is not present. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- include/monitor/monitor.h | 2 +- migration/migration-hmp-cmds.c | 5 ++++- monitor/hmp-cmds.c | 5 ++++- monitor/hmp.c | 11 ++++++++--- monitor/monitor.c | 30 +----------------------------- 5 files changed, 18 insertions(+), 35 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 3f730cffee..ffda343585 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -34,7 +34,7 @@ int monitor_new(MonitorOptions *opts, bool allow_hmp, Err= or **errp); int monitor_new_opts(QemuOpts *opts, Error **errp); void monitor_cleanup(void); =20 -int monitor_suspend(Monitor *mon); +void monitor_suspend(Monitor *mon); void monitor_resume(Monitor *mon); =20 int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp); diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index 8b385f560e..502ca704da 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -19,6 +19,7 @@ #include "monitor/hmp.h" #include "monitor/hmp-completion.h" #include "monitor/monitor.h" +#include "monitor/monitor-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-visit-migration.h" @@ -853,12 +854,14 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) =20 if (!detach) { HMPMigrationStatus *status; + MonitorHMP *hmp =3D MONITOR_HMP(mon); =20 - if (monitor_suspend(mon) < 0) { + if (!hmp->use_readline) { monitor_printf(mon, "terminal does not allow synchronous " "migration, continuing detached\n"); return; } + monitor_suspend(mon); =20 status =3D g_malloc0(sizeof(*status)); status->mon =3D mon; diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index e139caeba9..e9fb8d827a 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -129,7 +129,10 @@ void hmp_info_version(Monitor *mon, const QDict *qdict) =20 void hmp_quit(Monitor *mon, const QDict *qdict) { - monitor_suspend(mon); + MonitorHMP *hmp =3D MONITOR_HMP(mon); + if (hmp->use_readline) { + monitor_suspend(mon); + } qmp_quit(NULL); } =20 diff --git a/monitor/hmp.c b/monitor/hmp.c index 1da9370ead..b8cccdcde3 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1528,13 +1528,16 @@ static void monitor_read(void *opaque, const uint8_= t *buf, int size) static void monitor_event(void *opaque, QEMUChrEvent event) { Monitor *mon =3D opaque; + MonitorHMP *hmp =3D MONITOR_HMP(mon); =20 switch (event) { case CHR_EVENT_MUX_IN: qemu_mutex_lock(&mon->mon_lock); if (mon->mux_out) { mon->mux_out =3D 0; - monitor_resume(mon); + if (hmp->use_readline) { + monitor_resume(mon); + } } qemu_mutex_unlock(&mon->mon_lock); break; @@ -1547,7 +1550,9 @@ static void monitor_event(void *opaque, QEMUChrEvent = event) } else { monitor_flush_locked(mon); } - monitor_suspend(mon); + if (hmp->use_readline) { + monitor_suspend(mon); + } mon->mux_out =3D 1; } qemu_mutex_unlock(&mon->mon_lock); @@ -1558,7 +1563,7 @@ static void monitor_event(void *opaque, QEMUChrEvent = event) "information\n", QEMU_VERSION); qemu_mutex_lock(&mon->mon_lock); mon->reset_seen =3D 1; - if (!mon->mux_out) { + if (!mon->mux_out && hmp->use_readline) { /* Suspend-resume forces the prompt to be printed. */ monitor_suspend(mon); monitor_resume(mon); diff --git a/monitor/monitor.c b/monitor/monitor.c index 6ed586fc4f..f88364a574 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -155,25 +155,6 @@ bool monitor_requires_iothread(const Monitor *mon) return cls->requires_iothread && cls->requires_iothread(mon); } =20 -/** - * Is @mon is using readline? - * Note: not all HMP monitors use readline, e.g., gdbserver has a - * non-interactive HMP monitor, so readline is not used there. - */ -static inline bool monitor_uses_readline(const MonitorHMP *mon) -{ - return mon->use_readline; -} - -static inline bool monitor_is_hmp_non_interactive(const Monitor *mon) -{ - if (!object_dynamic_cast(OBJECT(mon), TYPE_MONITOR_HMP)) { - return false; - } - - return !monitor_uses_readline(container_of(mon, MonitorHMP, parent_obj= )); -} - static gboolean monitor_unblocked(void *do_not_use, GIOCondition cond, void *opaque) { @@ -548,12 +529,8 @@ static gboolean qapi_event_throttle_equal(const void *= a, const void *b) return TRUE; } =20 -int monitor_suspend(Monitor *mon) +void monitor_suspend(Monitor *mon) { - if (monitor_is_hmp_non_interactive(mon)) { - return -ENOTTY; - } - qatomic_inc(&mon->suspend_cnt); =20 if (monitor_requires_iothread(mon)) { @@ -565,7 +542,6 @@ int monitor_suspend(Monitor *mon) } =20 trace_monitor_suspend(mon, 1); - return 0; } =20 static void monitor_accept_input(void *opaque) @@ -582,10 +558,6 @@ static void monitor_accept_input(void *opaque) =20 void monitor_resume(Monitor *mon) { - if (monitor_is_hmp_non_interactive(mon)) { - return; - } - if (qatomic_dec_fetch(&mon->suspend_cnt) =3D=3D 0) { AioContext *ctx; =20 --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208755; cv=none; d=zohomail.com; s=zohoarc; b=LwHCFxKjuvCsNckvAWw5km0ZlOZi6UXdApX0Xo0FL9vkfQDrL1nn9oqPs0oBMCB7phh9AkEwjLecWmF60fLBwN5y+zusQT/8qH/OpwpXytJhAXEgO38fPputi3KaO3tVfx/1AjOMm1/Bb5FiPgoxzTC7xYMFzjYKkrpOx5yzEIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208755; h=Content-Type: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=Eob6SJOinKItugfukgpZa7Zjyu3vocuIFBZwRiFs1PQ=; b=ARYzzu00Tn3yio7sAE4EOP3NC2im1k7PJldFX21PKuffVt574mpmORwlMMFMHMI3bI2wsRTya3Axs0oDQ1/ub2/9ii9WL1QsACy9o1dG4DEUO/ziqys3OTRXNKvwlocZRK0DerFYfgJVicQi3TNol5TGOLesVE/7snvVmhgsYIA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208755448610.5077826397722; Tue, 23 Jun 2026 02:59:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxsx-0006aj-11; Tue, 23 Jun 2026 05:57:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsj-0006BR-3H for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:25 -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 1wbxsg-0003gH-Mo for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:24 -0400 Received: from mx-prod-mc-06.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-369-w-JWLS9NMIuK5FUD6l-Tlw-1; Tue, 23 Jun 2026 05:57:18 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9866D18005A2; Tue, 23 Jun 2026 09:57:17 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6A0C31624; Tue, 23 Jun 2026 09:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208642; 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=Eob6SJOinKItugfukgpZa7Zjyu3vocuIFBZwRiFs1PQ=; b=bGdfTdloHMwhhSM5nYFHrzwF/2MPYIfY4rxi1f7aIV1BTIQ97VxvuByuPufTD4lFoZuJpg y9b2wcwk4vBE5Fk5SZAPTtNA2l20L708rPkHUgUasA+bsuOdn4eOXed3X6Vn/D1rQtMRMR /k6tCa5v0ImsNw7bpc2novFPWSWFEBg= X-MC-Unique: w-JWLS9NMIuK5FUD6l-Tlw-1 X-Mimecast-MFC-AGG-ID: w-JWLS9NMIuK5FUD6l-Tlw_1782208637 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 22/35] monitor: implement "user creatable" interface for adding monitors Date: Tue, 23 Jun 2026 10:55:38 +0100 Message-ID: <20260623095551.2106712-23-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1782208757056158500 Implement the user creatable QOM interface and define the monitor-qmp and monitor-hmp types in QAPI. This unlocks the ability to create them on the command line with -object or in HMP/QMP with object_add. For example: $QEMU -chardev stdio,id=3Dmonchr0 -object monitor-hmp,id=3Dmon0,chrdev=3D= monchr0 Initially the "prepare_delete" callback is hardcoded to return an error which means -object and object_add can be used, but object_del will fail. Support for deleting monitors will be introduced in subsequent commits. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/hmp.c | 70 ++++++++++++++++++++++++-------------- monitor/monitor-internal.h | 1 - monitor/monitor.c | 14 ++++++-- monitor/qmp.c | 46 +++++++++++++++++-------- qapi/qom.json | 43 +++++++++++++++++++++++ stubs/monitor-internal.c | 1 + system/vl.c | 8 ++++- 7 files changed, 138 insertions(+), 45 deletions(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index b8cccdcde3..2cd508f1ee 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -40,6 +40,7 @@ #include "qemu/base-arch-defs.h" #include "qemu/target-info.h" #include "qemu/units.h" +#include "qom/object_interfaces.h" #include "exec/gdbstub.h" #include "system/block-backend.h" #include "trace.h" @@ -71,10 +72,13 @@ static void monitor_hmp_set_readline(Object *obj, bool = val, Error **errp) int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0); static void monitor_hmp_accept_input(Monitor *mon); +static void monitor_hmp_complete(UserCreatable *uc, Error **errp); +static bool monitor_hmp_prepare_delete(UserCreatable *uc, Error **errp); =20 static void monitor_hmp_class_init(ObjectClass *cls, const void *data) { MonitorClass *moncls =3D MONITOR_CLASS(cls); + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(cls); =20 object_class_property_add_bool(cls, "readline", monitor_hmp_get_readline, @@ -82,6 +86,9 @@ static void monitor_hmp_class_init(ObjectClass *cls, cons= t void *data) =20 moncls->vprintf =3D monitor_hmp_vprintf; moncls->accept_input =3D monitor_hmp_accept_input; + + ucc->complete =3D monitor_hmp_complete; + ucc->prepare_delete =3D monitor_hmp_prepare_delete; } =20 static void monitor_hmp_init(Object *obj) @@ -1604,42 +1611,53 @@ static void monitor_readline_flush(void *opaque) =20 void monitor_new_hmp(const char *chardev_id, bool use_readline, Error **er= rp) { - ERRP_GUARD(); - MonitorHMP *mon; static int counter; g_autofree char *id =3D g_strdup_printf("hmpcompat%d", counter++); - Object *obj =3D object_new_with_props(TYPE_MONITOR_HMP, - object_get_objects_root(), - id, - errp, - "chardev", chardev_id, - "readline", use_readline ? "yes" := "no", - NULL); - - if (!obj) { - return; - } + object_new_with_props(TYPE_MONITOR_HMP, + object_get_objects_root(), + id, + errp, + "chardev", chardev_id, + "readline", use_readline ? "yes" : "no", + NULL); +} =20 - mon =3D MONITOR_HMP(obj); +static void monitor_hmp_complete(UserCreatable *uc, Error **errp) +{ + MonitorHMP *mon =3D MONITOR_HMP(uc); + UserCreatableClass *ucc_parent =3D + USER_CREATABLE_CLASS( + object_class_get_parent( + OBJECT_CLASS(MONITOR_HMP_GET_CLASS(mon)))); + ERRP_GUARD(); =20 - monitor_complete(MONITOR(mon), errp); + ucc_parent->complete(uc, errp); if (*errp) { - object_unparent(OBJECT(mon)); return; } =20 - if (mon->use_readline) { - mon->rs =3D readline_init(monitor_readline_printf, - monitor_readline_flush, - mon, - monitor_find_completion); - monitor_read_command(mon, 0); + if (mon->parent_obj.chardev_id) { + if (mon->use_readline) { + mon->rs =3D readline_init(monitor_readline_printf, + monitor_readline_flush, + mon, + monitor_find_completion); + monitor_read_command(mon, 0); + } + + qemu_chr_fe_set_handlers(&mon->parent_obj.chr, + monitor_can_read, + monitor_read, + monitor_event, NULL, + &mon->parent_obj, NULL, true); + monitor_list_append(&mon->parent_obj); } +} =20 - qemu_chr_fe_set_handlers(&mon->parent_obj.chr, - monitor_can_read, monitor_read, monitor_event, - NULL, &mon->parent_obj, NULL, true); - monitor_list_append(&mon->parent_obj); +static bool monitor_hmp_prepare_delete(UserCreatable *uc, Error **errp) +{ + error_setg(errp, "Deleting HMP monitors is not supported"); + return false; } =20 /** diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index fe5703af6d..012d442a20 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -204,7 +204,6 @@ extern QmpCommandList qmp_commands, qmp_cap_negotiation= _commands; extern QemuMutex monitor_lock; extern MonitorList mon_list; =20 -void monitor_complete(Monitor *mon, Error **errp); bool monitor_requires_iothread(const Monitor *mon); int monitor_can_read(void *opaque); void monitor_list_append(Monitor *mon); diff --git a/monitor/monitor.c b/monitor/monitor.c index f88364a574..bf5e8a184a 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -29,6 +29,7 @@ #include "qapi/qapi-emit-events.h" #include "qapi/qapi-visit-control.h" #include "qobject/qdict.h" +#include "qom/object_interfaces.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "system/qtest.h" @@ -73,7 +74,8 @@ static GHashTable *coroutine_mon; /* Maps Coroutine* to M= onitor* */ MonitorList mon_list; static bool monitor_destroyed; =20 -OBJECT_DEFINE_TYPE(Monitor, monitor, MONITOR, OBJECT); +OBJECT_DEFINE_TYPE_EXTENDED(Monitor, monitor, MONITOR, OBJECT, true, + { TYPE_USER_CREATABLE }, {}); =20 static void monitor_finalize(Object *obj) { @@ -101,11 +103,17 @@ static void monitor_set_chardev_id(Object *obj, const= char *str, Error **errp) mon->chardev_id =3D g_strdup(str); } =20 +static void monitor_complete(UserCreatable *uc, Error **errp); + static void monitor_class_init(ObjectClass *cls, const void *data) { + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(cls); + object_class_property_add_str(cls, "chardev", monitor_get_chardev_id, monitor_set_chardev_id); + + ucc->complete =3D monitor_complete; } =20 static void monitor_init(Object *obj) @@ -680,8 +688,10 @@ void monitor_init_globals(void) aio_co_schedule(iohandler_get_aio_context(), qmp_dispatcher_co); } =20 -void monitor_complete(Monitor *mon, Error **errp) +static void monitor_complete(UserCreatable *uc, Error **errp) { + Monitor *mon =3D MONITOR(uc); + if (mon->chardev_id) { Chardev *chr =3D qemu_chr_find(mon->chardev_id); if (chr =3D=3D NULL) { diff --git a/monitor/qmp.c b/monitor/qmp.c index d2a03bb7e3..0e1c3eb52b 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -31,6 +31,7 @@ #include "qobject/qdict.h" #include "qobject/qjson.h" #include "qobject/qlist.h" +#include "qom/object_interfaces.h" #include "trace.h" =20 /* @@ -101,10 +102,13 @@ static void monitor_qmp_set_pretty(Object *obj, bool = val, Error **errp) =20 static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *q= dict); static bool monitor_qmp_requires_iothread(const Monitor *mon); +static void monitor_qmp_complete(UserCreatable *uc, Error **errp); +static bool monitor_qmp_prepare_delete(UserCreatable *uc, Error **errp); =20 static void monitor_qmp_class_init(ObjectClass *cls, const void *data) { MonitorClass *moncls =3D MONITOR_CLASS(cls); + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(cls); =20 object_class_property_add_bool(cls, "pretty", monitor_qmp_get_pretty, @@ -112,6 +116,9 @@ static void monitor_qmp_class_init(ObjectClass *cls, co= nst void *data) =20 moncls->emit_event =3D monitor_qmp_emit_event; moncls->requires_iothread =3D monitor_qmp_requires_iothread; + + ucc->complete =3D monitor_qmp_complete; + ucc->prepare_delete =3D monitor_qmp_prepare_delete; } =20 static void handle_qmp_command(void *opaque, QObject *req, Error *err); @@ -583,25 +590,28 @@ static void monitor_qmp_setup_handlers_bh(void *opaqu= e) void monitor_new_qmp(const char *chardev_id, bool pretty, Error **errp) { ERRP_GUARD(); - MonitorQMP *mon; static int counter; g_autofree char *id =3D g_strdup_printf("qmpcompat%d", counter++); - Object *obj =3D object_new_with_props(TYPE_MONITOR_QMP, - object_get_objects_root(), - id, - errp, - "chardev", chardev_id, - "pretty", pretty ? "yes" : "no", - NULL); - - if (!obj) { - return; - } + object_new_with_props(TYPE_MONITOR_QMP, + object_get_objects_root(), + id, + errp, + "chardev", chardev_id, + "pretty", pretty ? "yes" : "no", + NULL); +} =20 - mon =3D MONITOR_QMP(obj); - monitor_complete(MONITOR(mon), errp); +static void monitor_qmp_complete(UserCreatable *uc, Error **errp) +{ + MonitorQMP *mon =3D MONITOR_QMP(uc); + UserCreatableClass *ucc_parent =3D + USER_CREATABLE_CLASS( + object_class_get_parent( + OBJECT_CLASS(MONITOR_QMP_GET_CLASS(mon)))); + ERRP_GUARD(); + + ucc_parent->complete(uc, errp); if (*errp) { - object_unparent(OBJECT(mon)); return; } =20 @@ -633,3 +643,9 @@ void monitor_new_qmp(const char *chardev_id, bool prett= y, Error **errp) monitor_list_append(&mon->parent_obj); } } + +static bool monitor_qmp_prepare_delete(UserCreatable *uc, Error **errp) +{ + error_setg(errp, "Deleting QMP monitors is not supported"); + return false; +} diff --git a/qapi/qom.json b/qapi/qom.json index dd45ac1087..6ed510858e 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -1187,6 +1187,45 @@ 'data': { '*cpu-affinity': ['uint16'], '*node-affinity': ['uint16'] } } =20 +## +# @MonitorProperties: +# +# Properties for all monitors +# +# @chardev: ID of the character device providing the monitor transport +# +# Since: 11.1 +## +{ 'struct': 'MonitorProperties', + 'data': { 'chardev': 'str' }} + +## +# @MonitorHMPProperties: +# +# Properties for the HMP monitor +# +# @readline: whether to enable readline for interactive command +# usage (default: enabled) +# +# Since: 11.1 +## +{ 'struct': 'MonitorHMPProperties', + 'base': 'MonitorProperties', + 'data': { '*readline': 'bool' } } + +## +# @MonitorQMPProperties: +# +# Properties for the QMP monitor +# +# @pretty: whether to pretty print JSON responses (default: disabled) +# +# Since: 11.1 +## +{ 'struct': 'MonitorQMPProperties', + 'base': 'MonitorProperties', + 'data': { '*pretty': 'bool' } } + ## # @ObjectType: # @@ -1237,6 +1276,8 @@ 'memory-backend-ram', { 'name': 'memory-backend-shm', 'if': 'CONFIG_POSIX' }, + 'monitor-hmp', + 'monitor-qmp', 'pef-guest', { 'name': 'pr-manager-helper', 'if': 'CONFIG_LINUX' }, @@ -1315,6 +1356,8 @@ 'memory-backend-ram': 'MemoryBackendProperties', 'memory-backend-shm': { 'type': 'MemoryBackendShmProperties', 'if': 'CONFIG_POSIX' }, + 'monitor-hmp': {'type': 'MonitorHMPProperties' }, + 'monitor-qmp': {'type': 'MonitorQMPProperties' }, 'pr-manager-helper': { 'type': 'PrManagerHelperProperties', 'if': 'CONFIG_LINUX' }, 'qtest': 'QtestProperties', diff --git a/stubs/monitor-internal.c b/stubs/monitor-internal.c index 51db7588b9..59ccc4b35c 100644 --- a/stubs/monitor-internal.c +++ b/stubs/monitor-internal.c @@ -10,4 +10,5 @@ int monitor_get_fd(Monitor *mon, const char *name, Error = **errp) =20 void monitor_new_hmp(const char *chardev_id, bool use_readline, Error **er= rp) { + g_assert_not_reached(); } diff --git a/system/vl.c b/system/vl.c index fb36140aac..79ed2be449 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1830,6 +1830,10 @@ static void object_option_add_visitor(Visitor *v) { ObjectOption *opt =3D g_new0(ObjectOption, 1); visit_type_ObjectOptions(v, NULL, &opt->opts, &error_fatal); + if (opt->opts->qom_type =3D=3D OBJECT_TYPE_MONITOR_HMP || + opt->opts->qom_type =3D=3D OBJECT_TYPE_MONITOR_QMP) { + default_monitor =3D 0; + } QTAILQ_INSERT_TAIL(&object_opts, opt, next); } =20 @@ -1971,7 +1975,9 @@ static bool object_create_early(const char *type) =20 /* Reason: property "chardev" */ if (g_str_equal(type, "rng-egd") || - g_str_equal(type, "qtest")) { + g_str_equal(type, "qtest") || + g_str_equal(type, "monitor-hmp") || + g_str_equal(type, "monitor-qmp")) { return false; } =20 --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208854; cv=none; d=zohomail.com; s=zohoarc; b=LNlpfJJVpjECNgjjFqEWApF7lqVXit7tfuKDF3tTXCUTIovlTb3ZVieqn9hPlprjX81Sfh3esEeRsop1HiBHn6WqdGP3hGNe16XCIa5+ryGNxmCnZgsquGkuLi0SEfSiFwjjFyCdEjxoymxx3ihsDmdM4VjW4M9VCpETpEx2BsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208854; h=Content-Type: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=xF2fzgiS4x3BwcX0ZbEt4nOr3+zcOied7FUPcgFukPs=; b=LrE8tgrRoe4eX3UzdjQAYyv7Hh9f0+nS01nl/BPGVZuMLsnUnyB98AkpuJ0mADqc0zLj0Zd6VDEDtgpKKIExvtDtZeYxhdXt1Q1k/nhrnWwDP7umGBLZ/hi+4M16M6dz+8MKCTGSNZzrH0M9qEVaXQQ8WFuGFO7L3Lg9ZLjU+qU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208854496298.67740538975875; Tue, 23 Jun 2026 03:00:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxt1-0006tc-IJ; Tue, 23 Jun 2026 05:57:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsv-0006Xg-RB for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:37 -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 1wbxsk-0003gm-Ux for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:28 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-551-UzS64SHbNGuMGnGTd30OLA-1; Tue, 23 Jun 2026 05:57:22 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 443F31956059; Tue, 23 Jun 2026 09:57:21 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F32F21686; Tue, 23 Jun 2026 09:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208646; 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=xF2fzgiS4x3BwcX0ZbEt4nOr3+zcOied7FUPcgFukPs=; b=TfKMbTkOJVoBY/MP3uqy1DqGm379iKp0EY2eAyAAP+DXoO+mpxd/CL5C2OJ9FBzd4ZaUAv pfeSAmvZ8xF7EzbTWHhCzKgfg1TPV9UTkCdXCrG/GEkmbFqg6ydtYYQ0+S1NsMjcQkUF1s sBrt29qjfWJEJHMlwCcOgD4VftlYcc8= X-MC-Unique: UzS64SHbNGuMGnGTd30OLA-1 X-Mimecast-MFC-AGG-ID: UzS64SHbNGuMGnGTd30OLA_1782208641 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 23/35] monitor: convert from oneshot BH to persistent BH Date: Tue, 23 Jun 2026 10:55:39 +0100 Message-ID: <20260623095551.2106712-24-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208855675158500 From: Christian Brauner Convert monitor_accept_input from a oneshot BH (aio_bh_schedule_oneshot) to a persistent BH (aio_bh_new + qemu_bh_schedule). Oneshot BHs cannot be cancelled, so monitor_resume() racing with destruction would schedule a callback against memory that monitor_qmp_destroy() is about to free. A persistent BH can be deleted during destruction, cancelling any pending schedule. Signed-off-by: Christian Brauner (Amutable) [DB: extracted oneshot BH conversion from larger commit] Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/monitor-internal.h | 2 +- monitor/monitor.c | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 012d442a20..a82e1aacb6 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -134,7 +134,7 @@ struct Monitor { char *chardev_id; CharFrontend chr; int suspend_cnt; /* Needs to be accessed atomically */ - + QEMUBH *accept_input_bh; /* persistent BH for monitor_accept_input = */ char *mon_cpu_path; QTAILQ_ENTRY(Monitor) entry; =20 diff --git a/monitor/monitor.c b/monitor/monitor.c index bf5e8a184a..312e069bc5 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -81,6 +81,9 @@ static void monitor_finalize(Object *obj) { Monitor *mon =3D MONITOR(obj); =20 + if (mon->accept_input_bh) { + qemu_bh_delete(mon->accept_input_bh); + } g_free(mon->chardev_id); g_free(mon->mon_cpu_path); qemu_chr_fe_deinit(&mon->chr, false); @@ -567,15 +570,7 @@ static void monitor_accept_input(void *opaque) void monitor_resume(Monitor *mon) { if (qatomic_dec_fetch(&mon->suspend_cnt) =3D=3D 0) { - AioContext *ctx; - - if (monitor_requires_iothread(mon)) { - ctx =3D iothread_get_aio_context(mon_iothread); - } else { - ctx =3D qemu_get_aio_context(); - } - - aio_bh_schedule_oneshot(ctx, monitor_accept_input, mon); + qemu_bh_schedule(mon->accept_input_bh); } =20 trace_monitor_suspend(mon, -1); @@ -691,6 +686,7 @@ void monitor_init_globals(void) static void monitor_complete(UserCreatable *uc, Error **errp) { Monitor *mon =3D MONITOR(uc); + AioContext *ctx; =20 if (mon->chardev_id) { Chardev *chr =3D qemu_chr_find(mon->chardev_id); @@ -704,9 +700,16 @@ static void monitor_complete(UserCreatable *uc, Error = **errp) } } =20 - if (monitor_requires_iothread(mon) && !mon_iothread) { - mon_iothread =3D iothread_create("mon_iothread", &error_abort); + if (monitor_requires_iothread(mon)) { + if (!mon_iothread) { + mon_iothread =3D iothread_create("mon_iothread", &error_abort); + } + + ctx =3D iothread_get_aio_context(mon_iothread); + } else { + ctx =3D qemu_get_aio_context(); } + mon->accept_input_bh =3D aio_bh_new(ctx, monitor_accept_input, mon); } =20 int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp) --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208681; cv=none; d=zohomail.com; s=zohoarc; b=R2pvITsvK8h9SkF9CYZHI1ZZiJkbexv7V87G1YtRlPEcIAicZV8cYZecLdHomuLiPeo2mc18vkulTUIRJtH+4B9DNGB1B0tduj0//Z7rQ1SfZtuz6MdGGgyOqEJxcbQAZy0exU94uzHYVG9MOzM+CRsetGxk5Iih6Dgf/8Y4BCQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208681; h=Content-Type: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=jObDFOXIQZ2Ilsnj5eLFY5LyP5UJd+AnpueiZqhM9Lk=; b=kgpvGtMmr94fU/h0MV3ZzhwKRq/8BBC6qI/wC2Y8Br7xQawt9qFXsm78QQ/5purTKAars+wBtB5o/8GWpzkLEndJM0i8A8K4OeUz3UpCTb8/ehq83rXrFDH6vksOBcDs5oimKQDy1FxuSe04JbjZySM7wievAnWMHoj8Evu5cZk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208681714577.7311938967307; Tue, 23 Jun 2026 02:58:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxt3-00079a-UY; Tue, 23 Jun 2026 05:57:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxt1-0006xT-MV for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:43 -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 1wbxsv-0003h0-OW for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:40 -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-577-Q_TUCwSlPu2lU-Xn4Fci0Q-1; Tue, 23 Jun 2026 05:57:26 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 21B3C1802669; Tue, 23 Jun 2026 09:57:25 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B3940D6E; Tue, 23 Jun 2026 09:57:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208649; 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=jObDFOXIQZ2Ilsnj5eLFY5LyP5UJd+AnpueiZqhM9Lk=; b=IqhgEw0qdWimi9UCbxIjZIGMTYc1TY4ozMjipIn49jfKjLUKVdhKfTrXz9sVsJ0zWivxjI NfCCaj/4NWPQlrvWlWYPtvWf8qrNi2EMZVH/kPapAR12GomoPBM1qK/rAlDv+AuU3qjvSq qvJK/OgmYo3qAJoUq0tOQN4t2DwQ/Sk= X-MC-Unique: Q_TUCwSlPu2lU-Xn4Fci0Q-1 X-Mimecast-MFC-AGG-ID: Q_TUCwSlPu2lU-Xn4Fci0Q_1782208645 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 24/35] monitor: reject attempts to delete the current monitor Date: Tue, 23 Jun 2026 10:55:40 +0100 Message-ID: <20260623095551.2106712-25-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1782208682546158500 From: Christian Brauner If an 'object_del' command for a QMP monitor arrives targetting the current monitor, reject this request. If the current monitor is deleted, it will be impossible to send any reply and the client won't be able to remove the corresponding chardev backend. Note, it is not possible to rely on checking monitor_cur() because if 'object_del' is called via human-monitor-command, monitor_cur() will reflect the temporary HMP, not the QMP target that needs to be checked. Signed-off-by: Christian Brauner (Amutable) [DB: extracted monitor tracking from larger commit; added logic to monitor_qmp_prepare_delete to reject request] Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/qmp.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/monitor/qmp.c b/monitor/qmp.c index 0e1c3eb52b..b0535dec68 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -72,6 +72,9 @@ typedef struct QMPRequest QMPRequest; =20 QmpCommandList qmp_commands, qmp_cap_negotiation_commands; =20 +/* Monitor being serviced by the dispatcher. Protected by BQL. */ +static MonitorQMP *qmp_dispatcher_current_mon; + OBJECT_DEFINE_TYPE(MonitorQMP, monitor_qmp, MONITOR_QMP, MONITOR); =20 static void monitor_qmp_cleanup_req_queue_locked(MonitorQMP *mon); @@ -369,6 +372,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) */ =20 mon =3D req_obj->mon; + qmp_dispatcher_current_mon =3D mon; =20 /* * We need to resume the monitor if handle_qmp_command() @@ -429,6 +433,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) } =20 qmp_request_free(req_obj); + qmp_dispatcher_current_mon =3D NULL; } qatomic_set(&qmp_dispatcher_co, NULL); } @@ -573,6 +578,11 @@ static void monitor_qmp_event(void *opaque, QEMUChrEve= nt event) } } =20 +static bool monitor_qmp_dispatcher_is_servicing(MonitorQMP *mon) +{ + return qmp_dispatcher_current_mon =3D=3D mon; +} + static void monitor_qmp_setup_handlers_bh(void *opaque) { MonitorQMP *mon =3D opaque; @@ -646,6 +656,13 @@ static void monitor_qmp_complete(UserCreatable *uc, Er= ror **errp) =20 static bool monitor_qmp_prepare_delete(UserCreatable *uc, Error **errp) { + MonitorQMP *qmp =3D MONITOR_QMP(uc); + + if (monitor_qmp_dispatcher_is_servicing(qmp)) { + error_setg(errp, "Cannot delete the current QMP monitor"); + return false; + } + error_setg(errp, "Deleting QMP monitors is not supported"); return false; } --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208688; cv=none; d=zohomail.com; s=zohoarc; b=de2MTz4J5/rCyVMyz7/wUG+suC8CSApgef/HJOKuuquCBzXzNBnTprgu/x3BvQD6nuDgjpX90Bcttx6XA5sEyEXwYaQ6kpJdXDth5kto5EMhEWOoUBJD/cZoZMb30mnqvnbksXSB01lxSDCEgxuZ8LfeMjdUJvgM5OB13SU7vTk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208688; h=Content-Type: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=JFRa6q4588q2duUPMM7iZlQA2mmDHScsKHYzc0PDDlE=; b=W0DSAxZFaaiMoW/Mp2l0WepL+kayhXw+uxGuI60OxyDI8USoGwubDjILXR4ncHoThvYFgSC5MxQEZv+7nKuYbuodtyeZ2VYa/t+ExZs/Xbek/CwMtBDNfmsxxked2ecWEhwfK0ms4EObSTgfNFatSIx7sbUL5y+Ld19iB2sfaHg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208688119978.3553597843064; Tue, 23 Jun 2026 02:58:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxt3-00070s-CP; Tue, 23 Jun 2026 05:57:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsx-0006m7-TB for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsv-0003h6-NN for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:39 -0400 Received: from mx-prod-mc-06.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-620-SUkDfbY6PVygZcLMMQkxQg-1; Tue, 23 Jun 2026 05:57:29 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B18721800867; Tue, 23 Jun 2026 09:57:28 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 99E28D6E; Tue, 23 Jun 2026 09:57:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208651; 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=JFRa6q4588q2duUPMM7iZlQA2mmDHScsKHYzc0PDDlE=; b=QZ4N+C7JSuxUIxhU6S+2hBtRTm+Lxgw0lWTV0znRYzFATSbzV6UHGQUX6kNx8sAqMUVnee AyZxg62bjn7Iaz56HbeKRFuNwMcJZrQCcmPHrya91HmCDnN6uC3QQMBxYy7ZXXi4cF2uiR gW+atfce4QZ9v3n8DK5zTaoCRK0duBU= X-MC-Unique: SUkDfbY6PVygZcLMMQkxQg-1 X-Mimecast-MFC-AGG-ID: SUkDfbY6PVygZcLMMQkxQg_1782208648 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 25/35] monitor: protect qemu_chr_fe_accept_input with monitor lock Date: Tue, 23 Jun 2026 10:55:41 +0100 Message-ID: <20260623095551.2106712-26-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1782208688617158500 From: Christian Brauner The monitor_accept_input API is called from a bottom half, and will invoke qemu_chr_fe_accept_input(). When a following patch introduces the ability to delete monitors, it will be neccesary to delete the bottom half. Protecting the call to qemu_chr_fe_accept_input with the monitor lock will allow for synchronization with the deletion process. Signed-off-by: Christian Brauner (Amutable) [DB: extracted from a larger commit and refactored to apply to the new monitor class structure] Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/hmp.c | 2 ++ monitor/monitor.c | 6 +----- monitor/qmp.c | 9 +++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/monitor/hmp.c b/monitor/hmp.c index 2cd508f1ee..7b084c6ff8 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -116,9 +116,11 @@ static void monitor_hmp_accept_input(Monitor *mon) MonitorHMP *hmp =3D MONITOR_HMP(mon); assert(hmp->rs); readline_restart(hmp->rs); + qemu_chr_fe_accept_input(&mon->chr); qemu_mutex_unlock(&mon->mon_lock); readline_show_prompt(hmp->rs); } else { + qemu_chr_fe_accept_input(&mon->chr); qemu_mutex_unlock(&mon->mon_lock); } } diff --git a/monitor/monitor.c b/monitor/monitor.c index 312e069bc5..0e1c623555 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -560,11 +560,7 @@ static void monitor_accept_input(void *opaque) Monitor *mon =3D opaque; MonitorClass *cls =3D MONITOR_GET_CLASS(mon); =20 - if (cls->accept_input) { - cls->accept_input(mon); - } - - qemu_chr_fe_accept_input(&mon->chr); + cls->accept_input(mon); } =20 void monitor_resume(Monitor *mon) diff --git a/monitor/qmp.c b/monitor/qmp.c index b0535dec68..2131be82c7 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -107,6 +107,7 @@ static void monitor_qmp_emit_event(Monitor *mon, QAPIEv= ent event, QDict *qdict); static bool monitor_qmp_requires_iothread(const Monitor *mon); static void monitor_qmp_complete(UserCreatable *uc, Error **errp); static bool monitor_qmp_prepare_delete(UserCreatable *uc, Error **errp); +static void monitor_qmp_accept_input(Monitor *mon); =20 static void monitor_qmp_class_init(ObjectClass *cls, const void *data) { @@ -119,6 +120,7 @@ static void monitor_qmp_class_init(ObjectClass *cls, co= nst void *data) =20 moncls->emit_event =3D monitor_qmp_emit_event; moncls->requires_iothread =3D monitor_qmp_requires_iothread; + moncls->accept_input =3D monitor_qmp_accept_input; =20 ucc->complete =3D monitor_qmp_complete; ucc->prepare_delete =3D monitor_qmp_prepare_delete; @@ -666,3 +668,10 @@ static bool monitor_qmp_prepare_delete(UserCreatable *= uc, Error **errp) error_setg(errp, "Deleting QMP monitors is not supported"); return false; } + +static void monitor_qmp_accept_input(Monitor *mon) +{ + WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { + qemu_chr_fe_accept_input(&mon->chr); + } +} --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208868; cv=none; d=zohomail.com; s=zohoarc; b=bGFd3yFEECkt4auZhho9CIiZ0d7ZWNsouEEy2t/djp8He5PRelaRX3wK7XHyYvXry2eDpbMLO5y1Ylg3Nx/lXcmHrKJxJWktmsDEFJXlsMHR7z64DbBR9OjgN0ag8KrYLu4rjvmDfWBb2ikkl3gRxsRchzVOzXZJYSLbrENiSss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208868; h=Content-Type: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=+DiqiuAoyzpcmTmO1qDIbEjH8n0qU8CDdYBQcQOhM50=; b=eeWL+LEICStgAaGgm5aKZtZ25VZUZeiFTTBo+/r80V4Kdx9uqE8DvaomNl4P/QZxJD6BXNOIjb0FExmk6yN4UUAdxnedwqFDp/yoBfovvqID9dcZXPpQm88shvBSpV+wPBHCnT/LPSyBl98ljzZHcmyYKUtIGeV13vxrbpNju68= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208868239159.0378196502005; Tue, 23 Jun 2026 03:01:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxt4-0007E7-G7; Tue, 23 Jun 2026 05:57:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxt1-0006xX-Mi for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:43 -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 1wbxsv-0003hM-O2 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:40 -0400 Received: from mx-prod-mc-06.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-21-n1A5ogA3Pv-uU9dlR4znGw-1; Tue, 23 Jun 2026 05:57:33 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1CBCE180064A; Tue, 23 Jun 2026 09:57:32 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2D9BFD6E; Tue, 23 Jun 2026 09:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208656; 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=+DiqiuAoyzpcmTmO1qDIbEjH8n0qU8CDdYBQcQOhM50=; b=CoXNjDiztWCAfsLa6Tr8L+ekxSq7ZEbVn5InrPMIAzUMzZg4vLbtQi1lilmURB73A5An0Y EgnsCAToyEeyBq1eyUQHgf9OBDlF2qD7Gh1L9eqbFR5X3b+SV2CQB8vMPL7v6Rtj3TEfQu FW7E+Xas0W04vpDW8v+IgHRmmk3ln7I= X-MC-Unique: n1A5ogA3Pv-uU9dlR4znGw-1 X-Mimecast-MFC-AGG-ID: n1A5ogA3Pv-uU9dlR4znGw_1782208652 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 26/35] monitor: implement support for deleting QMP objects Date: Tue, 23 Jun 2026 10:55:42 +0100 Message-ID: <20260623095551.2106712-27-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1782208869867158500 From: Christian Brauner The removal sequence is: 1. Remove from mon_list under monitor_lock. This must happen before disconnecting chardev handlers to prevent event broadcast from calling monitor_flush_locked() after the gcontext reset, which would create an out_watch on the wrong GMainContext (see monitor_cancel_out_watch()). 2. Cancel any pending out_watch while gcontext still points to the correct context. 3. Disconnect chardev handlers, passing context=3DNULL and close the connection. 4. Drain pending requests from any in-flight monitor_qmp_read(). 5. Destroy the monitor object Signed-off-by: Christian Brauner (Amutable) [DB: extracted from a larger commit and refactored to apply to the new monitor class structure. Remove 'self delete' feature which requires complex special-case code] Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/monitor-internal.h | 2 ++ monitor/monitor.c | 22 ++++++++++++++++ monitor/qmp.c | 54 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 2 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index a82e1aacb6..5522e05464 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -178,6 +178,7 @@ struct MonitorQMP { Monitor parent_obj; JSONMessageParser parser; bool pretty; + bool setup_pending; /* iothread BH has not yet set up chardev handlers= */ /* * When a client connects, we're in capabilities negotiation mode. * @commands is &qmp_cap_negotiation_commands then. When command @@ -206,6 +207,7 @@ extern MonitorList mon_list; =20 bool monitor_requires_iothread(const Monitor *mon); int monitor_can_read(void *opaque); +void monitor_cancel_out_watch(Monitor *mon); void monitor_list_append(Monitor *mon); void monitor_fdsets_cleanup(void); int monitor_set_cpu(Monitor *mon, int cpu_index); diff --git a/monitor/monitor.c b/monitor/monitor.c index 0e1c623555..b155f58546 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -177,6 +177,28 @@ static gboolean monitor_unblocked(void *do_not_use, GI= OCondition cond, return G_SOURCE_REMOVE; } =20 +/* Cancel a pending out_watch GSource. Caller must hold mon_lock. */ +void monitor_cancel_out_watch(Monitor *mon) +{ + if (mon->out_watch) { + GMainContext *ctx =3D NULL; + GSource *src; + + if (monitor_requires_iothread(mon)) { + ctx =3D iothread_get_g_main_context(mon_iothread); + } + src =3D g_main_context_find_source_by_id(ctx, mon->out_watch); + if (!src && ctx) { + /* Handler disconnect may have reset gcontext to NULL. */ + src =3D g_main_context_find_source_by_id(NULL, mon->out_watch); + } + if (src) { + g_source_destroy(src); + } + mon->out_watch =3D 0; + } +} + /* Caller must hold mon->mon_lock */ void monitor_flush_locked(Monitor *mon) { diff --git a/monitor/qmp.c b/monitor/qmp.c index 2131be82c7..5301927f09 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -184,6 +184,12 @@ static void monitor_qmp_cleanup_req_queue_locked(Monit= orQMP *mon) } } =20 +static void monitor_qmp_drain_queue(MonitorQMP *mon) +{ + QEMU_LOCK_GUARD(&mon->qmp_queue_lock); + monitor_qmp_cleanup_req_queue_locked(mon); +} + static void monitor_qmp_cleanup_queue_and_resume(MonitorQMP *mon) { QEMU_LOCK_GUARD(&mon->qmp_queue_lock); @@ -597,6 +603,7 @@ static void monitor_qmp_setup_handlers_bh(void *opaque) monitor_qmp_read, monitor_qmp_event, NULL, &mon->parent_obj, context, true); monitor_list_append(&mon->parent_obj); + qatomic_set(&mon->setup_pending, false); } =20 void monitor_new_qmp(const char *chardev_id, bool pretty, Error **errp) @@ -645,6 +652,7 @@ static void monitor_qmp_complete(UserCreatable *uc, Err= or **errp) * since chardev might be running in the monitor I/O * thread. Schedule a bottom half. */ + mon->setup_pending =3D true; aio_bh_schedule_oneshot(iothread_get_aio_context(mon_iothread), monitor_qmp_setup_handlers_bh, mon); /* The bottom half will add @mon to @mon_list */ @@ -656,8 +664,14 @@ static void monitor_qmp_complete(UserCreatable *uc, Er= ror **errp) } } =20 +static void monitor_qmp_iothread_quiesce(void *opaque) +{ + /* No-op: synchronization point only */ +} + static bool monitor_qmp_prepare_delete(UserCreatable *uc, Error **errp) { + Monitor *mon =3D MONITOR(uc); MonitorQMP *qmp =3D MONITOR_QMP(uc); =20 if (monitor_qmp_dispatcher_is_servicing(qmp)) { @@ -665,8 +679,44 @@ static bool monitor_qmp_prepare_delete(UserCreatable *= uc, Error **errp) return false; } =20 - error_setg(errp, "Deleting QMP monitors is not supported"); - return false; + if (qatomic_read(&qmp->setup_pending)) { + error_setg(errp, "monitor is still initializing"); + return false; + } + + /* Remove from mon_list before chardev disconnect. */ + WITH_QEMU_LOCK_GUARD(&monitor_lock) { + QTAILQ_REMOVE(&mon_list, mon, entry); + } + + /* Cancel out_watch while gcontext still points to the right ctx. */ + WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { + monitor_cancel_out_watch(mon); + } + + qemu_chr_fe_set_handlers(&mon->chr, NULL, NULL, NULL, NULL, + NULL, NULL, true); + + /* Drain requests from any in-flight monitor_qmp_read(). */ + monitor_qmp_drain_queue(qmp); + + WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { + /* Disable flushes before cancel -- gcontext is already wrong. */ + qemu_chr_fe_set_open(&mon->chr, false); + monitor_cancel_out_watch(mon); + } + + /* Synchronize with in-flight iothread callbacks. */ + if (monitor_requires_iothread(mon)) { + aio_wait_bh_oneshot(iothread_get_aio_context(mon_iothread), + monitor_qmp_iothread_quiesce, NULL); + } + + /* Catch requests from a racing monitor_qmp_read(). */ + monitor_qmp_drain_queue(qmp); + monitor_fdsets_cleanup(); + + return true; } =20 static void monitor_qmp_accept_input(Monitor *mon) --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208668; cv=none; d=zohomail.com; s=zohoarc; b=lsT2KO9MM7kEsHQsd9kCWNGcImENqquaQQ9un3ji+uLumDjT3a3EVJ4YpY2uCY1vdI6TtIjCrQCqJunXb8+FH/XstkesyJS3wQTdFg0F7jTi80B+7Q/ruNgrwEnABrw68zpFn+Pmk6YnDMFST3WXRcL+9mcKHPMPGRc5So3zrGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208668; h=Content-Type: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=+AUDsS66Hb9/8n/10lpnhTOC4pHWJD/VtKQl6aJ5g68=; b=jTgb6B0LB/N51ZkFLNTrVFe2nUasmw2zBJbHa+u1WLxktyhe/GeNh4MJ2y3BTeJ7Lozj1AwErI5M77iBRTW0qxwGVIbkYuorOFC2aw3T0HWHWmEe0LCnyr/dxGG0Fg4w+ZnsnCXX37yHFivd2nHhgfV7Ywd+CcYsaFtI4b6qDDw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208668284897.5982889392892; Tue, 23 Jun 2026 02:57:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxt3-00079I-SB; Tue, 23 Jun 2026 05:57:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxt1-0006xM-L2 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxsw-0003ht-Hh for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:40 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-584-JtLp1Ya5PPGT-FMgtpbEIg-1; Tue, 23 Jun 2026 05:57:36 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 77233195411C; Tue, 23 Jun 2026 09:57:35 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8BA4A1686; Tue, 23 Jun 2026 09:57:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208658; 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=+AUDsS66Hb9/8n/10lpnhTOC4pHWJD/VtKQl6aJ5g68=; b=CoS4omVsL+Zu3szgD2xgQYTGjSYqiQlv7zihjnd4Irs2nutjoBo2xWOtWbsdrvkZc3KwwT 1XkIwYfR5zr4joDF2328PskxCwRmaPZa9r50bVrBy9BsGCOfqo4P5N4JYq7NW33QhNlwcv bWuC+pHaRm614LsDnpHignaxteU8rMU= X-MC-Unique: JtLp1Ya5PPGT-FMgtpbEIg-1 X-Mimecast-MFC-AGG-ID: JtLp1Ya5PPGT-FMgtpbEIg_1782208655 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 27/35] tests/qtest: add tests for dynamic monitor add/remove Date: Tue, 23 Jun 2026 10:55:43 +0100 Message-ID: <20260623095551.2106712-28-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208670462158500 From: Christian Brauner Test the object-add/object-del QMP commands with the monitor-qmp object type. - Basic lifecycle: chardev-add -> object-add -> object-del -> chardev-remove - Error: object-add with nonexistent chardev - Error: second monitor on same chardev (chardev already in use) - Removal of CLI-created QMP monitor succeeds - Error: object-remove on HMP monitor - Re-add after remove: same id and chardev reusable after removal Signed-off-by: Christian Brauner (Amutable) [DB: modified to use object-add/object-del, removing redundant scenarios already handled by object-add/del code] Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- tests/qtest/qmp-test.c | 174 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) diff --git a/tests/qtest/qmp-test.c b/tests/qtest/qmp-test.c index edf0886787..3a325a04e0 100644 --- a/tests/qtest/qmp-test.c +++ b/tests/qtest/qmp-test.c @@ -337,6 +337,174 @@ static void test_qmp_missing_any_arg(void) qtest_quit(qts); } =20 +static void test_qmp_monitor_add_remove(void) +{ + QTestState *qts; + QDict *resp; + + qts =3D qtest_init(common_args); + + /* Create a null chardev for the dynamic monitor */ + resp =3D qtest_qmp(qts, + "{'execute': 'chardev-add'," + " 'arguments': {'id': 'monitor-chardev'," + " 'backend': {'type': 'null'," + " 'data': {}}}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Add a dynamic monitor */ + resp =3D qtest_qmp(qts, + "{'execute': 'object-add'," + " 'arguments': {'qom-type': 'monitor-qmp'," + " 'id': 'dyn-mon'," + " 'chardev': 'monitor-chardev'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Remove the dynamic monitor */ + resp =3D qtest_qmp(qts, + "{'execute': 'object-del'," + " 'arguments': {'id': 'dyn-mon'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Add again after remove -- same id and chardev should work */ + resp =3D qtest_qmp(qts, + "{'execute': 'object-add'," + " 'arguments': {'qom-type': 'monitor-qmp'," + " 'id': 'dyn-mon'," + " 'chardev': 'monitor-chardev'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Clean up */ + resp =3D qtest_qmp(qts, + "{'execute': 'object-del'," + " 'arguments': {'id': 'dyn-mon'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + resp =3D qtest_qmp(qts, + "{'execute': 'chardev-remove'," + " 'arguments': {'id': 'monitor-chardev'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + qtest_quit(qts); +} + +static void test_qmp_monitor_error_paths(void) +{ + QTestState *qts; + QDict *resp; + + qts =3D qtest_init(common_args); + + /* Error: chardev does not exist */ + resp =3D qtest_qmp(qts, + "{'execute': 'object-add'," + " 'arguments': {'qom-type': 'monitor-qmp'," + " 'id': 'bad-mon'," + " 'chardev': 'nonexistent'}}"); + qmp_expect_error_and_unref(resp, "GenericError"); + + qtest_quit(qts); +} + +static void test_qmp_monitor_chardev_in_use(void) +{ + QTestState *qts; + QDict *resp; + + qts =3D qtest_init(common_args); + + /* Create a null chardev */ + resp =3D qtest_qmp(qts, + "{'execute': 'chardev-add'," + " 'arguments': {'id': 'shared-chr'," + " 'backend': {'type': 'null'," + " 'data': {}}}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Attach first monitor */ + resp =3D qtest_qmp(qts, + "{'execute': 'object-add'," + " 'arguments': {'qom-type': 'monitor-qmp'," + " 'id': 'mon-1'," + " 'chardev': 'shared-chr'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* Error: second monitor on the same chardev */ + resp =3D qtest_qmp(qts, + "{'execute': 'object-add'," + " 'arguments': {'qom-type': 'monitor-qmp'," + " 'id': 'mon-2'," + " 'chardev': 'shared-chr'}}"); + qmp_expect_error_and_unref(resp, "GenericError"); + + /* Clean up */ + resp =3D qtest_qmp(qts, + "{'execute': 'object-del'," + " 'arguments': {'id': 'mon-1'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + resp =3D qtest_qmp(qts, + "{'execute': 'chardev-remove'," + " 'arguments': {'id': 'shared-chr'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + qtest_quit(qts); +} + +static void test_qmp_monitor_remove_cli(void) +{ + QTestState *qts; + QDict *resp; + + /* Launch with a named CLI monitor on a null chardev */ + qts =3D qtest_initf("%s -chardev null,id=3Dcli-chr" + " -object monitor-qmp,id=3Dcli-mon,chardev=3Dcli-chr= ", + common_args); + + /* CLI-created QMP monitors can be removed */ + resp =3D qtest_qmp(qts, + "{'execute': 'object-del'," + " 'arguments': {'id': 'cli-mon'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + resp =3D qtest_qmp(qts, + "{'execute': 'chardev-remove'," + " 'arguments': {'id': 'cli-chr'}}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + qtest_quit(qts); +} + +static void test_qmp_monitor_remove_hmp(void) +{ + QTestState *qts; + QDict *resp; + + qts =3D qtest_initf("%s -chardev null,id=3Dhmp-chr" + " -object monitor-hmp,id=3Dhmp-mon,chardev=3Dhmp-chr= ", + common_args); + + /* Error: object_del must reject HMP monitors */ + resp =3D qtest_qmp(qts, + "{'execute': 'object-del'," + " 'arguments': {'id': 'hmp-mon'}}"); + qmp_expect_error_and_unref(resp, "GenericError"); + + qtest_quit(qts); +} + int main(int argc, char *argv[]) { g_test_init(&argc, &argv, NULL); @@ -348,6 +516,12 @@ int main(int argc, char *argv[]) #endif qtest_add_func("qmp/preconfig", test_qmp_preconfig); qtest_add_func("qmp/missing-any-arg", test_qmp_missing_any_arg); + qtest_add_func("qmp/monitor-add-remove", test_qmp_monitor_add_remove); + qtest_add_func("qmp/monitor-error-paths", test_qmp_monitor_error_paths= ); + qtest_add_func("qmp/monitor-chardev-in-use", + test_qmp_monitor_chardev_in_use); + qtest_add_func("qmp/monitor-remove-cli", test_qmp_monitor_remove_cli); + qtest_add_func("qmp/monitor-remove-hmp", test_qmp_monitor_remove_hmp); =20 return g_test_run(); } --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208905; cv=none; d=zohomail.com; s=zohoarc; b=fbb0Y8J8qAPgUOb+PBWNJFCVTDfql8VTfjojPa7lkPdPi6l0ZG+v0KH7aCjW2mTDoUhokLFMoJvhSSFE0omjC+b0H/R2kuL/XmEdZi3TLsAkatBxWkgrvSjh8JnR/ZyJ0tKi+AdDYazGtXo+pGNsKaw/7sd6PhEhdqioNWM1188= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208905; h=Content-Type: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=wz2PSLBFKrn1N549o0J+VKYJ8TZFU7BHdMiqZT6zgdg=; b=dgnvbK0NsJMJyFGgKgWju2VMZ4Uqj8GCgVLbc6tCSDhchwDLigoaqVGSRT0AYx/AUR+C2+fJSXOHTEOUPlx6VDQ5Kh7gE2/TZBPUAWhVpUCuhEXsy3UGGQsirvFETSnp/d4mp0NqimK+C8f5vLJ2jPRED7Oz8lUJok3IwFQISKI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208905787716.9633556216293; Tue, 23 Jun 2026 03:01:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxt5-0007M3-J3; Tue, 23 Jun 2026 05:57:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxt3-000770-Fp for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:45 -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 1wbxt1-0003ll-F8 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:45 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-343-aOwJk3XgOPS6c61rrgleiw-1; Tue, 23 Jun 2026 05:57:40 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D7049195608D; Tue, 23 Jun 2026 09:57:38 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E60101772; Tue, 23 Jun 2026 09:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208662; 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=wz2PSLBFKrn1N549o0J+VKYJ8TZFU7BHdMiqZT6zgdg=; b=SWESCfeV/DXaCpkSJFnsTNEAg2qF07M4Rn+Om5oDgg/1zzdA8m7Pe3FSenERrp2LottuUk d/IPwAbiNf5k4tCT4XnoMbd+HRac7sybAT/ER0+jMn9z3VVI0+LkNdg1kE2AuGtWG4s0TY WkFHbQR43nOeScD0HEiJaZmF/y3rIgc= X-MC-Unique: aOwJk3XgOPS6c61rrgleiw-1 X-Mimecast-MFC-AGG-ID: aOwJk3XgOPS6c61rrgleiw_1782208659 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 28/35] tests/functional: add e2e test for dynamic QMP monitor hotplug Date: Tue, 23 Jun 2026 10:55:44 +0100 Message-ID: <20260623095551.2106712-29-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208906557158501 From: Christian Brauner Add functional tests that exercise dynamic monitor hotplug with real socket connections: - Hotplug cycle: chardev-add a unix socket, object-add, connect to the socket, receive the QMP greeting, negotiate capabilities, send query-version, disconnect, remove the monitor and chardev, then repeat the entire cycle a second time to verify cleanup and reuse. - Self-removal: a dynamically-added monitor sends object-del targeting itself, verifying that the request is rejected - Large response: send query-qmp-schema on a dynamic monitor to exercise the output buffer flush path with a large response payload. - Events after negotiation: trigger STOP/RESUME events via the main monitor and verify they are delivered on the dynamic monitor. This complements the qtest unit tests by verifying that a real QMP client can connect to a dynamically-added monitor and exchange messages. Signed-off-by: Christian Brauner (Amutable) [DB: modified to use object-add/object-del; adjust self-removal test to validate rejection of request] Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- MAINTAINERS | 1 + tests/functional/generic/meson.build | 1 + .../generic/test_monitor_hotplug.py | 168 ++++++++++++++++++ 3 files changed, 170 insertions(+) create mode 100755 tests/functional/generic/test_monitor_hotplug.py diff --git a/MAINTAINERS b/MAINTAINERS index 93df53d87f..c74ffe56ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3616,6 +3616,7 @@ F: docs/interop/*qmp-* F: scripts/qmp/ F: tests/qtest/qmp-test.c F: tests/qtest/qmp-cmd-test.c +F: tests/functional/generic/test_monitor_hotplug.py T: git https://repo.or.cz/qemu/armbru.git qapi-next =20 qtest diff --git a/tests/functional/generic/meson.build b/tests/functional/generi= c/meson.build index 09763c5d22..c94105c62e 100644 --- a/tests/functional/generic/meson.build +++ b/tests/functional/generic/meson.build @@ -4,6 +4,7 @@ tests_generic_system =3D [ 'empty_cpu_model', 'info_usernet', 'linters', + 'monitor_hotplug', 'version', 'vnc', ] diff --git a/tests/functional/generic/test_monitor_hotplug.py b/tests/funct= ional/generic/test_monitor_hotplug.py new file mode 100755 index 0000000000..5d8a159eb0 --- /dev/null +++ b/tests/functional/generic/test_monitor_hotplug.py @@ -0,0 +1,168 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Functional test for dynamic QMP monitor hotplug +# +# Copyright (c) 2026 Christian Brauner + +import os + +from qemu_test import QemuSystemTest + +from qemu.qmp.legacy import QEMUMonitorProtocol + + +class MonitorHotplug(QemuSystemTest): + + def setUp(self): + super().setUp() + sock_dir =3D self.socket_dir() + self._sock_path =3D os.path.join(sock_dir.name, 'hotplug.sock') + + def _add_monitor(self): + """Create a chardev + monitor and return the socket path.""" + sock =3D self._sock_path + self.vm.cmd('chardev-add', id=3D'hotplug-chr', backend=3D{ + 'type': 'socket', + 'data': { + 'addr': { + 'type': 'unix', + 'data': {'path': sock} + }, + 'server': True, + 'wait': False, + } + }) + self.vm.cmd('object-add', id=3D'hotplug-mon', + qom_type=3D'monitor-qmp', + chardev=3D'hotplug-chr') + return sock + + def _remove_monitor(self): + """Remove the monitor + chardev.""" + self.vm.cmd('object-del', id=3D'hotplug-mon') + self.vm.cmd('chardev-remove', id=3D'hotplug-chr') + + def _connect_and_handshake(self, sock_path): + """ + Connect to the dynamic monitor socket, perform the QMP + greeting and capability negotiation, send a command, then + disconnect. + """ + qmp =3D QEMUMonitorProtocol(sock_path) + + # connect(negotiate=3DTrue) receives the greeting, validates it, + # and sends qmp_capabilities automatically. + greeting =3D qmp.connect(negotiate=3DTrue) + self.assertIn('QMP', greeting) + self.assertIn('version', greeting['QMP']) + self.assertIn('capabilities', greeting['QMP']) + + # Send a real command to prove the session is fully functional + resp =3D qmp.cmd_obj({'execute': 'query-version'}) + self.assertIn('return', resp) + self.assertIn('qemu', resp['return']) + + qmp.close() + + def test_hotplug_cycle(self): + """ + Hotplug a monitor, do the full QMP handshake, unplug it, + then repeat the whole cycle a second time. + """ + self.set_machine('none') + self.vm.add_args('-nodefaults') + self.vm.launch() + + # First cycle + sock =3D self._add_monitor() + self._connect_and_handshake(sock) + self._remove_monitor() + + # Second cycle -- same ids, same path, must work + sock =3D self._add_monitor() + self._connect_and_handshake(sock) + self._remove_monitor() + + def test_self_removal(self): + """ + A dynamically-added monitor sends object-del targeting + itself. Verify the request is rejected, but the monitor + can still be deleted from outside its own context. + """ + self.set_machine('none') + self.vm.add_args('-nodefaults') + self.vm.launch() + + sock =3D self._add_monitor() + + qmp =3D QEMUMonitorProtocol(sock) + greeting =3D qmp.connect(negotiate=3DTrue) + self.assertIn('QMP', greeting) + + # Self-removal: the dynamic monitor raises error + resp =3D qmp.cmd_obj({'execute': 'object-del', + 'arguments': {'id': 'hotplug-mon'}}) + self.assertIn('error', resp) + + qmp.close() + + resp =3D self.vm.cmd('object-del', id=3D'hotplug-mon') + + # Clean up the chardev + self.vm.cmd('chardev-remove', id=3D'hotplug-chr') + + def test_large_response(self): + """ + Send a command with a large response (query-qmp-schema) on a + dynamically-added monitor to exercise the output buffer flush + path. + """ + self.set_machine('none') + self.vm.add_args('-nodefaults') + self.vm.launch() + + sock =3D self._add_monitor() + + qmp =3D QEMUMonitorProtocol(sock) + qmp.connect(negotiate=3DTrue) + + resp =3D qmp.cmd_obj({'execute': 'query-qmp-schema'}) + self.assertIn('return', resp) + self.assertIsInstance(resp['return'], list) + self.assertGreater(len(resp['return']), 0) + + qmp.close() + self._remove_monitor() + + def test_events_after_negotiation(self): + """ + Verify that QMP events are delivered on a dynamically-added + monitor after capability negotiation completes. + """ + self.set_machine('none') + self.vm.add_args('-nodefaults') + self.vm.launch() + + sock =3D self._add_monitor() + + qmp =3D QEMUMonitorProtocol(sock) + qmp.connect(negotiate=3DTrue) + + # Trigger a STOP event via the main monitor, then read it + # from the dynamic monitor. + self.vm.cmd('stop') + resp =3D qmp.pull_event(wait=3DTrue) + self.assertEqual(resp['event'], 'STOP') + + self.vm.cmd('cont') + resp =3D qmp.pull_event(wait=3DTrue) + self.assertEqual(resp['event'], 'RESUME') + + qmp.close() + self._remove_monitor() + + +if __name__ =3D=3D '__main__': + QemuSystemTest.main() --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208908; cv=none; d=zohomail.com; s=zohoarc; b=dCVnn/iTfmYa6TS/Fn5Dn6OM/R9qxNV+qdIYNk08hef6j/tEoGIbRwhfcIV8KVBbj+IztNT+1l21U66L0j2PJxPdiJh0q9Kqn8ostiiOWKr/Dz0APSW8CfUTabXrqt6Qwaw3duPtMrvx43obek6qho/Bp7F8K3Zt5KX4BKAEza0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208908; h=Content-Type: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=ujsKwFFgURa1HeOejuIFxe0Lo00uy5++usFNyisU6eQ=; b=hcW+3vfdOwo1ZyikKx1IfwNuPt88AK0HPIa1DbC9+hwB1o4xwgcDqQUOEszQygi9esGiVqy5iCUJfZCrtubaBNnZQCtTIEJWHZwxkwpGciwrMkuvBBCzrsiCnfindivEQmOR1TyYz0vk6avC3apDbKtVKm92JVxhymRkC3n7KP4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208908169473.9761927236916; Tue, 23 Jun 2026 03:01:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxtA-00087t-4k; Tue, 23 Jun 2026 05:57:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxt8-0007u7-8I for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:50 -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 1wbxt6-0003mK-MO for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:50 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-499-dzpWGB5LOjyzWIwcrd1v1A-1; Tue, 23 Jun 2026 05:57:43 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6F28C19540F0; Tue, 23 Jun 2026 09:57:42 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 50F6D1686; Tue, 23 Jun 2026 09:57:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208668; 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=ujsKwFFgURa1HeOejuIFxe0Lo00uy5++usFNyisU6eQ=; b=PKdlI/GOO6fQWY/49HiDIVt7B25XDLUJxIVF6P+Ut0KuQZYcQJi8aTGHxuN4Zkgbl2d+1+ X2AdN18AKKaOyaJdmLKDQiioUkSgwFbDEDO85jVtjG+L3o3WTbcuvFCdJpJG2Jv6Z1ozN/ n7TmuTK4rupbryk2yggXnMusX87kgtA= X-MC-Unique: dzpWGB5LOjyzWIwcrd1v1A-1 X-Mimecast-MFC-AGG-ID: dzpWGB5LOjyzWIwcrd1v1A_1782208662 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 29/35] tests/functional: add a stress test for monitor hot unplug Date: Tue, 23 Jun 2026 10:55:45 +0100 Message-ID: <20260623095551.2106712-30-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208910308158501 When unplugging a monitor there is a careful synchronization dance between the monitor handling the "object-del" command and the command processing for the monitor being deleted. The stress test runs a busy loop of 'query-qmp-schema' on a second monitor, while the primary monitor requests its deletion. Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- .../generic/test_monitor_hotplug.py | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tests/functional/generic/test_monitor_hotplug.py b/tests/funct= ional/generic/test_monitor_hotplug.py index 5d8a159eb0..55af8a238f 100755 --- a/tests/functional/generic/test_monitor_hotplug.py +++ b/tests/functional/generic/test_monitor_hotplug.py @@ -6,11 +6,16 @@ # # Copyright (c) 2026 Christian Brauner =20 +import asyncio import os +import random +import threading +import time =20 from qemu_test import QemuSystemTest =20 from qemu.qmp.legacy import QEMUMonitorProtocol +from qemu.qmp import QMPClient =20 =20 class MonitorHotplug(QemuSystemTest): @@ -163,6 +168,63 @@ def test_events_after_negotiation(self): qmp.close() self._remove_monitor() =20 + def stress_mon(self, sock): + async def main(): + qmp =3D QMPClient('testvm') + await qmp.connect(sock) + # Run query-version in a tight loop so that the + # monitor thread/dispatcher is very busy at the + # time we try to delete the monitor + while True: + try: + # A command which returns a lot of data to make + # it more likely we're in the I/O reply path + # when deleting the monitor + res =3D await qmp.execute('query-qmp-schema') + # Some commands which generate async events + # as those can trigger different code paths + res =3D await qmp.execute('stop') + res =3D await qmp.execute('cont') + except: + # we'll get here if the monitor is terminated + # by QEMU in which case we must disconnect + # out side, but.... + try: + await qmp.disconnect() + except (ConnectionResetError, EOFError, BrokenPipeErro= r): + # ... disconnect() will probably see + # errors too, but we must try to call it + # regardless to cleanup asyncio state + # and prevent python warnings at GC time + pass + return + asyncio.run(main()) + + def test_hotplug_stress(self): + """ + Repeatedly hotplug and unplug a monitor, while another thread + concurrently issues commands on that monitor. This stresses + the synchronization with the monitor thread during cleanup + """ + self.set_machine('none') + self.vm.add_args('-nodefaults') + self.vm.launch() + + # Each loop sleeps at most 0.5 seconds, so this should + # give an upper bound of approx 5 seconds execution + # time which is reasonable to run by default + repeat =3D 10 + for i in range(repeat): + # First cycle + sock =3D self._add_monitor() + print ("# stress cycle %02d/%02d" % (i, repeat)) + stress =3D threading.Thread(target=3Dself.stress_mon, args=3D[= sock]) + stress.start() + # Sleep upto 1/2 second to vary the races + time.sleep(random.random() / 2) + self._remove_monitor() + stress.join() + =20 if __name__ =3D=3D '__main__': QemuSystemTest.main() --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208703; cv=none; d=zohomail.com; s=zohoarc; b=gd5qUdrwgftiqs/7W5SnhVa2tVdpft9eSPKs42CARKjRwpvf5IUCq/zkMAkMsKMqnJw7+PgkRJ7AGhO3cqfWAfa9ICx0QIyY5d5Ze+YD/FEnNfZ6A0tuS0RG2yVt5PGuFGD6MYS3dSVHNDLcv5nIrWFhIhOLWdfZTN6M0Fk0ZzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208703; h=Content-Type: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=FDaBDsCeCeayrGnc3vkPZXGa5K8jSeL4dUmbPZZjw0w=; b=PNgZmQ1gQwkEkS0T4prOmT1K20YjNMWv4M9KOOsnxNQBBmpO8q38Vg8+VPnbrAYA874S2oAgGXbU/RU41isaj1hDnVqeECaPaiN8EANmzWFnQm94xUNUykXnZKp7vDw/xixHoFFtiOBJD3NzGbLVq2ddJ1wVsL1FBDQ/XrJxpRM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208703259304.2136103028015; Tue, 23 Jun 2026 02:58:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxtB-0008Fb-72; Tue, 23 Jun 2026 05:57:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxt9-00087W-TC for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxt8-0003mR-Dc for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:51 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-680-qQvmLeLVPgG0saEKmpBx5w-1; Tue, 23 Jun 2026 05:57:47 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DBE521954117; Tue, 23 Jun 2026 09:57:45 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DD1A61686; Tue, 23 Jun 2026 09:57:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208669; 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=FDaBDsCeCeayrGnc3vkPZXGa5K8jSeL4dUmbPZZjw0w=; b=BGV+yGjK8zABiDoXcjJ+6QuIvgvzoc5rJq95qCg95mej+GhR6MrfCs0h9EBPFZOQWn54vA UNxI9L8QXm4MzOeSmksDohZGPvtfuhAn2i7O2uHhqux0OG3RqCgwj3dH71QVH/NID4+tn4 D6n2sbjsCDM8TvQHgmDzCZlwKcy8loM= X-MC-Unique: qQvmLeLVPgG0saEKmpBx5w-1 X-Mimecast-MFC-AGG-ID: qQvmLeLVPgG0saEKmpBx5w_1782208666 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 30/35] qom: add method for getting the "id" of a QOM object Date: Tue, 23 Jun 2026 10:55:46 +0100 Message-ID: <20260623095551.2106712-31-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208704649158500 The 'user_creatable_del' method doesn't want the 'Object *', but instead the "id" of the object to be deleted. While most of its work could be done with the "Object *" alone, purging the QemuOpts values needs the "id". The "id" is not recorded against an Object though, it is indirectly stored as a property linking the parent and child objects together. Add an accessor that can fetch this property name. Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- include/qom/object.h | 10 ++++++++++ qom/object.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/qom/object.h b/include/qom/object.h index 11f55613fc..216d2a30f6 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1759,6 +1759,16 @@ ObjectProperty *object_property_try_add_child(Object= *obj, const char *name, ObjectProperty *object_property_add_child(Object *obj, const char *name, Object *child); =20 +/** + * object_property_get_child_name: + * @obj: the object that owns the property + * @child: the object referenced by the child property + * + * Return the property name against which @child is registered + * with @obj, or NULL if @obj is not a parent of @child. + */ +char *object_property_get_child_name(Object *obj, Object *child); + typedef enum { /* Unref the link pointer when the property is deleted */ OBJ_PROP_LINK_STRONG =3D 0x1, diff --git a/qom/object.c b/qom/object.c index f79b2cf361..66bbd1488b 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1952,6 +1952,23 @@ object_property_add_child(Object *obj, const char *n= ame, return object_property_try_add_child(obj, name, child, &error_abort); } =20 +char *object_property_get_child_name(Object *obj, Object *child) +{ + ObjectProperty *prop; + GHashTableIter iter; + gpointer key, value; + + g_hash_table_iter_init(&iter, obj->properties); + while (g_hash_table_iter_next(&iter, &key, &value)) { + prop =3D value; + if (object_property_is_child(prop) && prop->opaque =3D=3D child) { + return g_strdup(prop->name); + } + } + return NULL; +} + + void object_property_allow_set_link(const Object *obj, const char *name, Object *val, Error **errp) { --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208721; cv=none; d=zohomail.com; s=zohoarc; b=I6I+6kPxgoYwl/uHp1Zos3CaG/Srxg6CFJ0YAL6m/KfzctA5Pr9DV9j8SxnsSG1OKGz0ZJq2tO2lnr3Nh/Uri7V4OSQA/B5fd4BTYW9Gy1FB2YTE/OFiBA+V1bZP2uGm4u6T1+BoTplfFFxtbtm2dDPTybKKw9FV0buEjDhXQFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208721; h=Content-Type: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=AJh+eQ+tuQvsb4kRcuwdD5Co5Vb3Bq8AlWcEOnTCoMM=; b=DqBC2oVMAdIs1lAI9nQWEFQ41EYOGbuoZp9VCtXIjQ4Nn3twGzvrAqmpgeYzc7VCtF8AI5zYHJWYCSXoP06thCBCmqsQhDWng5ZyS/o3KpmByQdhgMoDvr15l3XdxG1qfGOALCLVmReZpSgHxWm+QszjEMWjv6chyWzNd9HZV8o= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208721832225.55208789550647; Tue, 23 Jun 2026 02:58:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxtF-0008ME-MQ; Tue, 23 Jun 2026 05:57:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxtE-0008Hk-2D for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:56 -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 1wbxtC-0003mu-M1 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:57:55 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-327-pJsSYLx6OiaDp3swEKkTuQ-1; Tue, 23 Jun 2026 05:57:50 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 43CDA1955DAE; Tue, 23 Jun 2026 09:57:49 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5ED7B3189; Tue, 23 Jun 2026 09:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208674; 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=AJh+eQ+tuQvsb4kRcuwdD5Co5Vb3Bq8AlWcEOnTCoMM=; b=RvcsYdHt9LDATfGNz5XeTJ527PrjK9Gta28jG2njYCHkC2sEIAw1pPXQUfnc4e6bkfLHI+ 2VboPc0hJjeikBGBqYyzLuTKg9icW7L0JCRSvyFYg8QSKPMNY2YI/8MUhqgnpB9aKzQZEh 6Fdd33kGS/nXObD4cn6Yw8J0ISUChIM= X-MC-Unique: pJsSYLx6OiaDp3swEKkTuQ-1 X-Mimecast-MFC-AGG-ID: pJsSYLx6OiaDp3swEKkTuQ_1782208669 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 31/35] qom: add trace events for user creatable create/delete APIs Date: Tue, 23 Jun 2026 10:55:47 +0100 Message-ID: <20260623095551.2106712-32-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208722774158500 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- qom/object_interfaces.c | 6 ++++++ qom/trace-events | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 6faa0b2fd9..2e618a7623 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -20,12 +20,14 @@ #include "qapi/opts-visitor.h" #include "qemu/config-file.h" #include "qemu/keyval.h" +#include "trace.h" =20 bool user_creatable_complete(UserCreatable *uc, Error **errp) { UserCreatableClass *ucc =3D USER_CREATABLE_GET_CLASS(uc); ERRP_GUARD(); =20 + trace_user_creatable_complete(uc, object_get_typename(OBJECT(uc))); if (ucc->complete) { ucc->complete(uc, errp); } @@ -37,9 +39,13 @@ bool user_creatable_prepare_delete(UserCreatable *uc, Er= ror **errp) UserCreatableClass *ucc =3D USER_CREATABLE_GET_CLASS(uc); ERRP_GUARD(); =20 + trace_user_creatable_prepare_delete(uc, object_get_typename(OBJECT(uc)= )); if (ucc->prepare_delete) { ucc->prepare_delete(uc, errp); } + trace_user_creatable_prepare_delete_result( + uc, object_get_typename(OBJECT(uc)), + *errp ? error_get_pretty(*errp) : NULL); return !*errp; } =20 diff --git a/qom/trace-events b/qom/trace-events index 44c63e72af..bac8472618 100644 --- a/qom/trace-events +++ b/qom/trace-events @@ -11,3 +11,8 @@ object_property_del_child(void *obj, const char *type, vo= id *child, const char * object_property_parse(void *obj, const char *type, const char *name, const= char *value) "obj=3D%p type=3D%s prop=3D%s value=3D%s" object_class_dynamic_cast_assert(const char *type, const char *target, con= st char *file, int line, const char *func) "type=3D%s->%s (%s:%d:%s)" object_class_property_add(const char *type, const char *name, void *value)= "type=3D%s name=3D%s value=3D%p" + +# object_interfaces.c +user_creatable_complete(void *obj, const char *type) "obj=3D%p type=3D%s" +user_creatable_prepare_delete(void *obj, const char *type) "obj=3D%p type= =3D%s" +user_creatable_prepare_delete_result(void *obj, const char *type, const ch= ar *msg) "obj=3D%p type=3D%s msg=3D%s" --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208711; cv=none; d=zohomail.com; s=zohoarc; b=bvl3X+/hyR28bLezDgSDgLt1cNiNeWz0Y6SNXZhubX3IpiC0gYjO6rDYkeybz60g6Mif4vtcCxAUirUVfSTuJ4ZNxTayXpK9IE1iuZwr43KIqD5aP01i+bnZUwm/oulv+ap7wx9seCodf95bOuVaxHyShU+eRMMMBPDulH27g9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208711; h=Content-Type: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=Lgb4rSfAZLz/aNf+5eG6humki6zdAtFbfFov9RCL7k0=; b=SiYxwqPC7jxLj712ZT34L1IkxDEldPWY7UK6c9E+tCsp0+axaV2wgcsZuI2IZSH1HjRvfi/noLBhBwQw5ujmh7iTgN1Y63LLuKt1VwaCxcByDZbXGK/DMLqd4rhtRgEGcB+iqF05KmS93rjDJ++3RZTuXcUBWfGq/1V17EV7xRw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208711600464.7110684943216; Tue, 23 Jun 2026 02:58:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxtN-0000U5-7z; Tue, 23 Jun 2026 05:58:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxtL-0000LB-C8 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:58:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxtJ-0003nj-4B for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:58:03 -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-8-gOOyAjBqOy6ljQmtbioh8A-1; Tue, 23 Jun 2026 05:57:55 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 A6C721801BE8; Tue, 23 Jun 2026 09:57:52 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B209DD6E; Tue, 23 Jun 2026 09:57:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208680; 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=Lgb4rSfAZLz/aNf+5eG6humki6zdAtFbfFov9RCL7k0=; b=XSGMFhTKaeeAOXvpVJMx6iqS7SU/nlfnwGV0ixoh0JAnJQ9lYTcIQ3LAVBgudLGDYfyw8N cRPHvtG5EYmUTdQyJFuHi0oNZOMI0FVcEVUSy4YWNrpqyzNRMi47QQGigG2+YVHwcIN9yl yV6kptasLmQRLC0ORnfOpHgHjQ4y7lQ= X-MC-Unique: gOOyAjBqOy6ljQmtbioh8A-1 X-Mimecast-MFC-AGG-ID: gOOyAjBqOy6ljQmtbioh8A_1782208672 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 32/35] monitor: add support for auto-deleting monitors upon close Date: Tue, 23 Jun 2026 10:55:48 +0100 Message-ID: <20260623095551.2106712-33-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1782208712817158500 The default monitor is usually a long lived object that will exist for the entire lifetime of the VM. A monitor can only service a single client at a time though, and so it might be desirable to hotplug additional monitors at runtime for specific tasks. If doing that, however, there is a need to remove the monitor when it is no longer needed. Allowing a client to run "object-del" against its own monitor adds complex edge cases, as it would be desirable to send the QMP response despite the monitor sending it being deleted. Doing "object-del" alone will also result in orphaning a character device backend instance, as there is no opportunity to run the companion "chardev-del" command. A simpler way to ensure cleanup is to add the concept of auto-deleting monitor objects. Specifically when the "CHR_EVENT_CLOSED" event is emitted, the equivalent of "object-del" + "chardev-del" can be run internally. Since the transient client has already droppped its monitor connection, there is no synchronization to be concerned about. This is implemented via a new "close-action=3Dnone|delete" property on the 'monitor-qmp' object. This concept could be extended with further actions in future, for example: * close-action=3Dshutdown - graceful guest shutdown * close-action=3Dterminate - immediate guest poweroff * close-action=3Dstop - pause guest CPUs while the monitor is not connected to any client This is left as an exercise for future interested contributors. Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- monitor/monitor-internal.h | 3 + monitor/qmp.c | 68 +++++++++++++++++++ qapi/qom.json | 21 +++++- .../generic/test_monitor_hotplug.py | 55 +++++++++++++-- 4 files changed, 142 insertions(+), 5 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 5522e05464..23829f32f9 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -28,6 +28,7 @@ #include "chardev/char-fe.h" #include "monitor/monitor.h" #include "qapi/qapi-types-control.h" +#include "qapi/qapi-types-qom.h" #include "qapi/qmp-registry.h" #include "qobject/json-parser.h" #include "qemu/readline.h" @@ -178,7 +179,9 @@ struct MonitorQMP { Monitor parent_obj; JSONMessageParser parser; bool pretty; + MonitorQMPCloseAction close_action; bool setup_pending; /* iothread BH has not yet set up chardev handlers= */ + bool delete_pending; /* close_action has started 'delete' process */ /* * When a client connects, we're in capabilities negotiation mode. * @commands is &qmp_cap_negotiation_commands then. When command diff --git a/monitor/qmp.c b/monitor/qmp.c index 5301927f09..f6b7fe65bb 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -28,6 +28,7 @@ #include "monitor-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-control.h" +#include "qapi/qapi-commands-char.h" #include "qobject/qdict.h" #include "qobject/qjson.h" #include "qobject/qlist.h" @@ -103,6 +104,20 @@ static void monitor_qmp_set_pretty(Object *obj, bool v= al, Error **errp) mon->pretty =3D val; } =20 +static int monitor_qmp_get_close_action(Object *obj, Error **errp) +{ + MonitorQMP *mon =3D MONITOR_QMP(obj); + + return mon->close_action; +} + +static void monitor_qmp_set_close_action(Object *obj, int val, Error **err= p) +{ + MonitorQMP *mon =3D MONITOR_QMP(obj); + + mon->close_action =3D val; +} + static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *q= dict); static bool monitor_qmp_requires_iothread(const Monitor *mon); static void monitor_qmp_complete(UserCreatable *uc, Error **errp); @@ -117,6 +132,11 @@ static void monitor_qmp_class_init(ObjectClass *cls, c= onst void *data) object_class_property_add_bool(cls, "pretty", monitor_qmp_get_pretty, monitor_qmp_set_pretty); + object_class_property_add_enum(cls, "close-action", + "MonitorQMPCloseAction", + &MonitorQMPCloseAction_lookup, + monitor_qmp_get_close_action, + monitor_qmp_set_close_action); =20 moncls->emit_event =3D monitor_qmp_emit_event; moncls->requires_iothread =3D monitor_qmp_requires_iothread; @@ -550,11 +570,38 @@ static QDict *qmp_greeting(MonitorQMP *mon) ver, cap_list); } =20 +static void monitor_qmp_self_delete_bh(void *opaque) +{ + MonitorQMP *mon =3D opaque; + g_autofree char *mon_id =3D object_property_get_child_name( + object_get_objects_root(), OBJECT(mon)); + g_autofree char *chardev_id =3D g_strdup(mon->parent_obj.chardev_id); + Error *local_error =3D NULL; + + g_assert(mon_id); + + user_creatable_del(mon_id, &local_error); + object_unref(mon); + if (local_error !=3D NULL) { + error_report_err(local_error); + } else { + qmp_chardev_remove(chardev_id, NULL); + } +} + static void monitor_qmp_event(void *opaque, QEMUChrEvent event) { QDict *data; MonitorQMP *mon =3D opaque; =20 + /* Protect against race if a client drops & quickly + * reconnects - we'll have the delete BH scheduled + * so must not honour a new open request + */ + if (mon->delete_pending) { + return; + } + switch (event) { case CHR_EVENT_OPENED: WITH_QEMU_LOCK_GUARD(&mon->parent_obj.mon_lock) { @@ -566,6 +613,7 @@ static void monitor_qmp_event(void *opaque, QEMUChrEven= t event) qobject_unref(data); break; case CHR_EVENT_CLOSED: + mon->delete_pending =3D true; /* * Note: this is only useful when the output of the chardev * backend is still open. For example, when the backend is @@ -577,6 +625,26 @@ static void monitor_qmp_event(void *opaque, QEMUChrEve= nt event) json_message_parser_init(&mon->parser, handle_qmp_command, mon, NULL); monitor_fdsets_cleanup(); + switch (mon->close_action) { + case MONITOR_QMP_CLOSE_ACTION_NONE: + break; /* nada */ + case MONITOR_QMP_CLOSE_ACTION_DELETE: + /* + * Do NOT run in the AIO context associated with the + * monitor. We need to run in the default AIO context + * which is the same context in which 'qmp_object_del' + * will execute + * + * Hold an extra ref in case a separate monitor races + * with the BH by processing an expliciti 'object-del' + */ + object_ref(mon); + aio_bh_schedule_oneshot(qemu_get_aio_context(), + monitor_qmp_self_delete_bh, mon); + break; + default: + g_assert_not_reached(); + } break; case CHR_EVENT_BREAK: case CHR_EVENT_MUX_IN: diff --git a/qapi/qom.json b/qapi/qom.json index 6ed510858e..63335b8fd0 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -1213,18 +1213,37 @@ 'base': 'MonitorProperties', 'data': { '*readline': 'bool' } } =20 + +## +# @MonitorQMPCloseAction: +# +# Action to take when the character device backend is +# closed. +# +# @none: take no action (the default) +# @delete: delete both the 'monitor-qmp' object and its associated +# character device backend object +# +# Since 11.1 +## +{ 'enum' : 'MonitorQMPCloseAction', + 'data': ['none', 'delete'] } + ## # @MonitorQMPProperties: # # Properties for the QMP monitor # # @pretty: whether to pretty print JSON responses (default: disabled) +# @close-action: action to take when the character device backend +# is closed (default: none) # # Since: 11.1 ## { 'struct': 'MonitorQMPProperties', 'base': 'MonitorProperties', - 'data': { '*pretty': 'bool' } } + 'data': { '*pretty': 'bool', + '*close-action': 'MonitorQMPCloseAction' } } =20 ## # @ObjectType: diff --git a/tests/functional/generic/test_monitor_hotplug.py b/tests/funct= ional/generic/test_monitor_hotplug.py index 55af8a238f..f70aed814f 100755 --- a/tests/functional/generic/test_monitor_hotplug.py +++ b/tests/functional/generic/test_monitor_hotplug.py @@ -25,7 +25,7 @@ def setUp(self): sock_dir =3D self.socket_dir() self._sock_path =3D os.path.join(sock_dir.name, 'hotplug.sock') =20 - def _add_monitor(self): + def _add_monitor(self, autodelete=3DFalse): """Create a chardev + monitor and return the socket path.""" sock =3D self._sock_path self.vm.cmd('chardev-add', id=3D'hotplug-chr', backend=3D{ @@ -39,9 +39,15 @@ def _add_monitor(self): 'wait': False, } }) - self.vm.cmd('object-add', id=3D'hotplug-mon', - qom_type=3D'monitor-qmp', - chardev=3D'hotplug-chr') + if autodelete: + self.vm.cmd('object-add', id=3D'hotplug-mon', + qom_type=3D'monitor-qmp', + chardev=3D'hotplug-chr', + close_action=3D'delete') + else: + self.vm.cmd('object-add', id=3D'hotplug-mon', + qom_type=3D'monitor-qmp', + chardev=3D'hotplug-chr') return sock =20 def _remove_monitor(self): @@ -118,6 +124,47 @@ def test_self_removal(self): # Clean up the chardev self.vm.cmd('chardev-remove', id=3D'hotplug-chr') =20 + def test_auto_delete(self): + """ + A dynamically-added monitor is configured with 'close-action=3Ddel= ete' + should see itself deleted when the client is closed. + """ + self.set_machine('none') + self.vm.add_args('-nodefaults') + self.vm.launch() + + sock =3D self._add_monitor(autodelete=3DTrue) + + cdevs =3D [c["label"] for c in self.vm.cmd('query-chardev')] + objs =3D [o["name"] for o in self.vm.cmd('qom-list', path=3D'/obje= cts')] + assert ('hotplug-chr' in cdevs) + assert ('hotplug-mon' in objs) + + qmp =3D QEMUMonitorProtocol(sock) + greeting =3D qmp.connect(negotiate=3DTrue) + self.assertIn('QMP', greeting) + + cdevs =3D [c["label"] for c in self.vm.cmd('query-chardev')] + objs =3D [o["name"] for o in self.vm.cmd('qom-list', path=3D'/obje= cts')] + assert ('hotplug-chr' in cdevs) + assert ('hotplug-mon' in objs) + + qmp.close() + + # Wait upto 10 seconds max for chardev to auto-delete, which + # is hopefully enough for reliability under high load + for i in range(int(10 / 0.2)): + cdevs =3D [c["label"] for c in self.vm.cmd('query-chardev')] + if 'hotplug-chr' not in cdevs: + break + # Wait a little more then try again + time.sleep(0.2) + + cdevs =3D [c["label"] for c in self.vm.cmd('query-chardev')] + objs =3D [o["name"] for o in self.vm.cmd('qom-list', path=3D'/obje= cts')] + assert ('hotplug-chr' not in cdevs) + assert ('hotplug-mon' not in objs) + def test_large_response(self): """ Send a command with a large response (query-qmp-schema) on a --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208728; cv=none; d=zohomail.com; s=zohoarc; b=VqxN3iBvOHpgn1mCmbjJhJp4nldvnhNg4437TOykuxZHWjBki1SpXGihr3YCU1Ts681WXBb61Gyabqsc01twrgh3S9fMXemubUk8qClR/S9SSBo+Yi6eAXTUCezH4hEUSdcZ7mlwG7UXqGZnyF59y7KouC/kVdTmCEOAeX2tFik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208728; h=Content-Type: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=4KMpBSzRvdqMDeW+6tu+R8DcPUswTmbpth7Uej59GZI=; b=bm9If+5/6s7Fesrxnxck7s0V0Iddg/k1O4k1YRZKMuvrgU38D7FA1/2ZTn3Fy9Ls3U24BTWxGHdvBZ8FVkoRtWG5CcO9UI/2LiCOqnQ+VItJKw5ZREskSFLYvc6fcUsblNDPEGPUj2rZUgx2jJ0FBRGdS2clIxLLive6S0hMNLw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208728372170.2769882400837; Tue, 23 Jun 2026 02:58:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxtM-0000Rq-NG; Tue, 23 Jun 2026 05:58:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxtK-0000Kj-S6 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:58:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxtJ-0003no-FA for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:58:02 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-50-leKaEOINNZGq8ucDrkIChA-1; Tue, 23 Jun 2026 05:57:57 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3B04D1956062; Tue, 23 Jun 2026 09:57:56 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2C24030A8; Tue, 23 Jun 2026 09:57:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208680; 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=4KMpBSzRvdqMDeW+6tu+R8DcPUswTmbpth7Uej59GZI=; b=dkxCZATO7p+Kz+yHQxDYi2+ZfBYkjzm/lwmEQzbjsxJp0vkFTeH+qUFyQgdRGOG9W2tls0 e7Io4IX/s3CkEADT7TuppefAQ+8nzEI8Z4naL0HJhMEAK1LkgAt32xC0t3BnjLFll7Rcd/ 87rFLFyho11iVnYhf0iW4obGA0d4Jvg= X-MC-Unique: leKaEOINNZGq8ucDrkIChA-1 X-Mimecast-MFC-AGG-ID: leKaEOINNZGq8ucDrkIChA_1782208676 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 33/35] tests: switch from -mon to -object monitor-qmp Date: Tue, 23 Jun 2026 10:55:49 +0100 Message-ID: <20260623095551.2106712-34-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1782208728800158500 Use the new preferred low level option for configuring the QMP service in libqtest and the python Machine class used by tests. This will avoid triggering deprecation warnings after the subsequent commit. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- python/qemu/machine/machine.py | 4 ++-- tests/qtest/libqtest.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index ebb58d5b68..5f4845f5fb 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -304,8 +304,8 @@ def _base_args(self) -> List[str]: ) else: moncdev =3D f"socket,id=3Dmon,path=3D{self._monitor_addres= s}" - args.extend(['-chardev', moncdev, '-mon', - 'chardev=3Dmon,mode=3Dcontrol']) + args.extend(['-chardev', moncdev, '-object', + 'monitor-qmp,id=3Dqmp,chardev=3Dmon']) =20 if self._machine is not None: args.extend(['-machine', self._machine]) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 4e22c66b75..c33c799c92 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -460,7 +460,7 @@ gchar *qtest_qemu_args(const char *extra_args) "-qtest unix:%s " "-qtest-log %s " "-chardev socket,path=3D%s,id=3Dchar0 " - "-mon chardev=3Dchar0,mode=3Dcontrol " + "-object monitor-qmp,id=3Dqmp0,chardev=3Dchar0 " "-display none " "-audio none " "%s " --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208751; cv=none; d=zohomail.com; s=zohoarc; b=AwtXyYVb2l5Jm82oK+yIU8k88OglsU/qu8kWtg9XSINUl+5ka12egKuU0M5qAZpVdANFJQFg9w16ty77Q4qYqMpcK9HbxVS8tDv7MgGLlG0gsPNjJmZbXWoIp+bDY8nIytfDzkNmLeQhSSckw/sA41245RyUIYAI7mlBXmVZVps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208751; h=Content-Type: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=cHUcTrHBFHEC9ZIqdwoTi24gy2SfC+P6VP+FMz0WGLM=; b=Hnlw5xzzogxOocYYvpvPFoqmShMy5ODj+ej+3pm8y+qBvk5kDWcuYMcOQJqOZxDyGqQwlTuKn7od58johyKptCvtxwMTTfZFM+Jpkw6GGg5OklQsrpyagCDZ2G1WOrRN8iehb7oHcocR51GpdAWbVaQb0BTDqGp6gjxIl8Nzq78= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208751174898.650140964197; Tue, 23 Jun 2026 02:59:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxtN-0000Xa-Tz; Tue, 23 Jun 2026 05:58:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxtM-0000RX-KS for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:58:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxtK-0003nt-Uz for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:58:04 -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-140-YoY2iG9wNLyP3sPAuoN1fg-1; Tue, 23 Jun 2026 05:58:01 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 B89B91802669; Tue, 23 Jun 2026 09:57:59 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9872E1624; Tue, 23 Jun 2026 09:57:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208682; 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=cHUcTrHBFHEC9ZIqdwoTi24gy2SfC+P6VP+FMz0WGLM=; b=NWBEXyTpCFCFdHCjW1uqaZjklqo4YXaEc9RcH9QTccHs6nnD4bJ+X30v2u/1B9x7eg2L2K qS9oCnK3FvbYgyeIimROpM7ublgdNMVxVK3tZPFyrhnLmk8UncgXOO+mYm+CTfY4Cj82Hz oFM8RyZPlxIyCj5J99uXWHtJRJvjvDA= X-MC-Unique: YoY2iG9wNLyP3sPAuoN1fg-1 X-Mimecast-MFC-AGG-ID: YoY2iG9wNLyP3sPAuoN1fg_1782208679 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 34/35] qemu-options: document new monitor-hmp and monitor-qmp objects Date: Tue, 23 Jun 2026 10:55:50 +0100 Message-ID: <20260623095551.2106712-35-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1782208752949158500 Add new docs for the `-object monitor-hmp` and `-object monitor-qmp` options, updating `-mon` to state that it is legacy syntax sugar for the new `-object` args. Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- qemu-options.hx | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index c799286153..98c74cc9ff 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4980,6 +4980,16 @@ SRST -mon chardev=3Dmon1,mode=3Dcontrol,pretty=3Don =20 enables the QMP monitor on localhost port 4444 with pretty-printing. + + The use of ``-mon mode=3Dreadline`` is historical syntax sugar + for the new ``-object monitor-hmp`` option, each use of which + creates an object with the ID ``hmpcompatNNN`` where ``NNN`` is + a counter starting from 0. + + The use of ``-mon mode=3Dcontrol`` is historical syntax sugar + for the new ``-object monitor-qmp`` option, each use of which + creates an object with the ID ``qmpcompatNNN`` where ``NNN`` is + a counter starting from 0. ERST =20 DEF("debugcon", HAS_ARG, QEMU_OPTION_debugcon, \ @@ -5730,6 +5740,46 @@ SRST they are specified. Note that the 'id' property must be set. These objects are placed in the '/objects' path. =20 + ``-object monitor-hmp,id=3Did,chardev=3Dchardev_id,readline=3Don|off`` + Set up a monitor running the Human Monitor Protocol, + connected to the chardev ``chardev_id``. + + The ``id`` parameter is a unique ID that can be used + to dynamically delete the monitor at runtime. Note + that monitors created using the historical syntax + will be allocated IDs following the pattern ``hmpcompatNN``. + Mixing ``-object`` with the historical monitor syntax is + discouraged. + + The ``readline`` parameter, which defaults to ``on``, + controls whether the monitor provides interactive + prompts + + ``-object monitor-qmp,id=3Did,chardev=3Dchardev_id,pretty=3Don|off,clo= se-action=3Dnone|delete`` + Set up a monitor running the QEMU Monitor Protocol, + connected to the chardev ``chardev_id``. + + The ``id`` parameter is a unique ID that can be used + to dynamically delete the monitor at runtime. Note + that monitors created using the historical syntax + will be allocated IDs following the pattern ``qmpcompatNN``. + Mixing ``-object`` with the historical monitor syntax is + discouraged. + + The ``pretty`` parameter, which defaults to ``off``, + controls whether the monitor responses are pretty + printed as multi-line indented JSON, as opposed to + constrained to a single line without extraneous + whitespace. + + The ``close-action`` parameter, which defaults to ``none``, + controls what happens when the connection to the monitor + is terminated by the user. If set to ``delete``, then the + ``monitor-qmp`` object and its associated character + device are both immediately deleted. This can be useful + if an extra monitor was hotplugged for a specific task + and should be unplugged when completed. + ``-object memory-backend-file,id=3Did,size=3Dsize,mem-path=3Ddir,share= =3Don|off,discard-data=3Don|off,merge=3Don|off,dump=3Don|off,prealloc=3Don|= off,host-nodes=3Dhost-nodes,policy=3Ddefault|preferred|bind|interleave,alig= n=3Dalign,offset=3Doffset,readonly=3Don|off,rom=3Don|off|auto`` Creates a memory file backend object, which can be used to back the guest RAM with huge pages. --=20 2.54.0 From nobody Wed Jun 24 21:40:36 2026 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=1782208716; cv=none; d=zohomail.com; s=zohoarc; b=DxMAZWE4hBS+e5OiRi9s44eYOWXMFHfQnbHTs8wEPcpt/I7t9aAPxu2fk4mX0oSaYqeXSOoJA8PJRQIj4UyBJVzwlHLlZVDyAKucHQ9r7Hj9pPTop+Zl3lj1E9ft9EXhnrqHDlHi4acfoV0siuE8hsFloollJ+B4xxTO26mLvnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782208716; h=Content-Type: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=x6JFKXIntR0FDTnu+8XeJjdYYSkMOO+1c2b3wSImxsU=; b=OWdEzrid58kJLeqCR+B7y/cJz8RzVNAPGnxlfNIEHFOtx5kHmFwek/Yr3fCiI23AayoXB/ExlVS9xVn7M5l8ECp5GMx3OBJAlDxBMq1A1I+7MomzksecArY8sBCUFwu6hiwT2M7VqU82FbGBcL5R79pKs62kOS49Pba93Du27lI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782208716500815.91945835403; Tue, 23 Jun 2026 02:58:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbxtV-0001EC-1s; Tue, 23 Jun 2026 05:58:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbxtS-0000yL-Fz for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:58:10 -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 1wbxtQ-0003of-GH for qemu-devel@nongnu.org; Tue, 23 Jun 2026 05:58:10 -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-583-rgEMeClEOqOSZYsrr1ICoA-1; Tue, 23 Jun 2026 05:58:04 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 49C0F180267B; Tue, 23 Jun 2026 09:58:03 +0000 (UTC) Received: from berrange.com (unknown [10.44.34.133]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3DA441624; Tue, 23 Jun 2026 09:57:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782208687; 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=x6JFKXIntR0FDTnu+8XeJjdYYSkMOO+1c2b3wSImxsU=; b=IoGEshjkIuJVZYsYicV7pJEKLD1egqCAHC6n/uyTps1mLt+T7O8tD5kA5OxxDvc95rOZPD YAWF2vJP5lGqQHrcCbTAnul3Atdc5u+Jh+OcFECsPj68NgtYFgcRp1zI7fXf9j9wJ9Y6qg K+noQ0Lj/nmk5dA1iOrPcF5JOaQpdP8= X-MC-Unique: rgEMeClEOqOSZYsrr1ICoA-1 X-Mimecast-MFC-AGG-ID: rgEMeClEOqOSZYsrr1ICoA_1782208683 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Brauner , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 35/35] docs: mark '-mon' as deprecated in favour of -object Date: Tue, 23 Jun 2026 10:55:51 +0100 Message-ID: <20260623095551.2106712-36-berrange@redhat.com> In-Reply-To: <20260623095551.2106712-1-berrange@redhat.com> References: <20260623095551.2106712-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1782208716817158500 The high level `-qmp` and `-monitor` options can remain as convenience wrappers, but the low level `-mon` is completed obsoleted by the new `-object` support with 'monitor-qmp' and 'monitor-hmp' types. Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Peter Krempa --- docs/about/deprecated.rst | 10 ++++++++++ docs/devel/writing-monitor-commands.rst | 4 ++-- docs/system/arm/xenpvh.rst | 4 ++-- docs/system/i386/xen.rst | 3 ++- docs/system/i386/xenpvh.rst | 4 ++-- qemu-options.hx | 11 ++++++----- system/vl.c | 2 ++ 7 files changed, 26 insertions(+), 12 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 97750f5edc..8370fc5680 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -61,6 +61,16 @@ The ``debug-threads`` option of the ``-name`` argument i= s now ignored. Thread naming is unconditionally enabled for all platforms where it is supported. =20 +``-mon`` option (since 11.1) +'''''''''''''''''''''''''''' + +The ``-mon`` option was the generic mechanism for creating monitor objects +if the convenience ``-qmp`` or ``-monitor`` options were not flexible +enough. The monitor objects have been converted to QOM, so ``-mon mode=3Dr= eadline`` +is replaced by ``-object monitor-hmp`` and ``-mon mode=3Dcontrol`` is repl= aced +by ``-object monitor-qmp``. The short convenience options are not deprecat= ed, +only ``-mon``. + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/docs/devel/writing-monitor-commands.rst b/docs/devel/writing-m= onitor-commands.rst index 930da5cd06..7ae7efe327 100644 --- a/docs/devel/writing-monitor-commands.rst +++ b/docs/devel/writing-monitor-commands.rst @@ -52,8 +52,8 @@ shown here. First, QEMU should be started like this:: =20 # qemu-system-TARGET [...] \ - -chardev socket,id=3Dqmp,port=3D4444,host=3Dlocalhost,server=3Don \ - -mon chardev=3Dqmp,mode=3Dcontrol,pretty=3Don + -chardev socket,id=3Dchrqmp0,port=3D4444,host=3Dlocalhost,server=3Don= \ + -object monitor-qmp,chardev=3Dchrqmp0,pretty=3Don,id=3Dqmp0 =20 Then, in a different terminal:: =20 diff --git a/docs/system/arm/xenpvh.rst b/docs/system/arm/xenpvh.rst index 430ac2c02e..511af63e3d 100644 --- a/docs/system/arm/xenpvh.rst +++ b/docs/system/arm/xenpvh.rst @@ -27,9 +27,9 @@ Sample QEMU xenpvh commands for running and connecting wi= th Xen: =20 qemu-system-aarch64 -xen-domid 1 \ -chardev socket,id=3Dlibxl-cmd,path=3Dqmp-libxl-1,server=3Don,wait= =3Doff \ - -mon chardev=3Dlibxl-cmd,mode=3Dcontrol \ + -object monitor-qmp,id=3Dqmp0,chardev=3Dlibxl-cmd \ -chardev socket,id=3Dlibxenstat-cmd,path=3Dqmp-libxenstat-1,server= =3Don,wait=3Doff \ - -mon chardev=3Dlibxenstat-cmd,mode=3Dcontrol \ + -object monitor-qmp,id=3Dqmp1,chardev=3Dlibxenstat-cmd \ -xen-attach -name guest0 -vnc none -display none -nographic \ -machine xenpvh -m 1301 \ -chardev socket,id=3Dchrtpm,path=3Dtmp/vtpm2/swtpm-sock \ diff --git a/docs/system/i386/xen.rst b/docs/system/i386/xen.rst index 46db5f34c1..6ff5cdb1e4 100644 --- a/docs/system/i386/xen.rst +++ b/docs/system/i386/xen.rst @@ -79,7 +79,8 @@ of type ``xen-console`` to connect to it. For the Xen con= sole equivalent of the handy ``-serial mon:stdio`` option, for example: =20 .. parsed-literal:: - -chardev stdio,mux=3Don,id=3Dchar0,signal=3Doff -mon char0 \\ + -chardev stdio,mux=3Don,id=3Dchar0,signal=3Doff \\ + -object monitor-hmp,chardev=3Dchar0,id=3Dhmp0 \\ -device xen-console,chardev=3Dchar0 =20 The Xen network device is ``xen-net-device``, which becomes the default NIC diff --git a/docs/system/i386/xenpvh.rst b/docs/system/i386/xenpvh.rst index 354250f073..904778e3f5 100644 --- a/docs/system/i386/xenpvh.rst +++ b/docs/system/i386/xenpvh.rst @@ -33,9 +33,9 @@ case you need to construct one manually: =20 qemu-system-i386 -xen-domid 3 -no-shutdown \ -chardev socket,id=3Dlibxl-cmd,path=3D/var/run/xen/qmp-libxl-3,serve= r=3Don,wait=3Doff \ - -mon chardev=3Dlibxl-cmd,mode=3Dcontrol \ + -object monitor-qmp,id=3Dqmp0,chardev=3Dlibxl-cmd \ -chardev socket,id=3Dlibxenstat-cmd,path=3D/var/run/xen/qmp-libxenst= at-3,server=3Don,wait=3Doff \ - -mon chardev=3Dlibxenstat-cmd,mode=3Dcontrol \ + -object monitor-qmp,id=3Dqmp1,chardev=3Dlibxenstat-cmd \ -nodefaults \ -no-user-config \ -xen-attach -name g0 \ diff --git a/qemu-options.hx b/qemu-options.hx index 98c74cc9ff..32b0cfba03 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4137,7 +4137,7 @@ The general form of a character device option is: :: =20 -chardev stdio,mux=3Don,id=3Dchar0 \ - -mon chardev=3Dchar0,mode=3Dreadline \ + -object monitor-hmp,id=3Dhmp0,chardev=3Dchar0 \ -serial chardev:char0 \ -serial chardev:char0 =20 @@ -4149,7 +4149,7 @@ The general form of a character device option is: :: =20 -chardev stdio,mux=3Don,id=3Dchar0 \ - -mon chardev=3Dchar0,mode=3Dreadline \ + -object monitor-hmp,id=3Dhmp0,chardev=3Dchar0 \ -parallel chardev:char0 \ -chardev tcp,...,mux=3Don,id=3Dchar1 \ -serial chardev:char1 \ @@ -4950,7 +4950,8 @@ SRST -qmp tcp:localhost:4444,server=3Don,wait=3Doff =20 Not all options are configurable via this syntax; for maximum - flexibility use the ``-mon`` option and an accompanying ``-chardev``. + flexibility use ``-object monitor-qmp`` and an accompanying + ``-chardev``. =20 ERST DEF("qmp-pretty", HAS_ARG, QEMU_OPTION_qmp_pretty, \ @@ -4981,12 +4982,12 @@ SRST =20 enables the QMP monitor on localhost port 4444 with pretty-printing. =20 - The use of ``-mon mode=3Dreadline`` is historical syntax sugar + The use of ``-mon mode=3Dreadline`` is deprecated syntax sugar for the new ``-object monitor-hmp`` option, each use of which creates an object with the ID ``hmpcompatNNN`` where ``NNN`` is a counter starting from 0. =20 - The use of ``-mon mode=3Dcontrol`` is historical syntax sugar + The use of ``-mon mode=3Dcontrol`` is deprecated syntax sugar for the new ``-object monitor-qmp`` option, each use of which creates an object with the ID ``qmpcompatNNN`` where ``NNN`` is a counter starting from 0. diff --git a/system/vl.c b/system/vl.c index 79ed2be449..a7b6d37452 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3240,6 +3240,8 @@ void qemu_init(int argc, char **argv) default_monitor =3D 0; break; case QEMU_OPTION_mon: + warn_report_once("'-mon' is deprecated, use '-object' with= " + "'monitor-hmp' or 'monitor-qmp' types ins= tead"); if (!qemu_opts_parse_noisily(qemu_find_opts("mon"), optarg, true)) { exit(1); --=20 2.54.0