From nobody Fri Dec 19 16:07:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741797284081909.7717253106026; Wed, 12 Mar 2025 09:34:44 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 79EBB1CF2; Wed, 12 Mar 2025 12:34:43 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2F3DA1CB6; Wed, 12 Mar 2025 12:31:59 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8A6A61C94; Wed, 12 Mar 2025 12:31:54 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2A5901BC3 for ; Wed, 12 Mar 2025 12:31:40 -0400 (EDT) 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-19-EUQF_ArHOa2deA008vWmdg-1; Wed, 12 Mar 2025 12:31:37 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 0AB501809CA6 for ; Wed, 12 Mar 2025 16:31:36 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 32D3B1955BCB for ; Wed, 12 Mar 2025 16:31:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741797099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5J3ViOYBYZiIRSKaBNiK5fo7VL6JSti8/jFFEKfNtIY=; b=ImZj4mL4dRFz6JNCnADmSPWRyTA4/bnGcCMuixIO/ZYo1NntRNUB4XvPW1VLHxobyaZZhG 08IynbUN6w6jFMuVzjtlgYXazuETsZ+ohMolQXOKcRYLjmo3EYKlZGvZ3mz49vAxScqmGE DFjaFMve4mqH4lVkKeSC+ECmmWagkek= X-MC-Unique: EUQF_ArHOa2deA008vWmdg-1 X-Mimecast-MFC-AGG-ID: EUQF_ArHOa2deA008vWmdg_1741797096 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 04/17] qemu: monitor: Drop support for extra wrapper for 'object_add' Date: Wed, 12 Mar 2025 17:31:14 +0100 Message-ID: <1c0de760977c3ed1093f58502ee4756ff57ba905.1741796995.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: uIAIgnqTxEYyNA9QjZykbEYyF0UB0OJxcaWLBzlG7Vk_1741797096 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HR46Y4PGNAZB4QUKEITKKCVCPS77BO3C X-Message-ID-Hash: HR46Y4PGNAZB4QUKEITKKCVCPS77BO3C X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741797284603019000 Content-Type: text/plain; charset="utf-8" The QAPIfication of objects removed the extra warapper object which we were adding in the monitor code to simplify the other callers. Now that we support only qemus which don't require this we can drop the support code. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.c | 27 +-------------------------- src/qemu/qemu_monitor_priv.h | 2 -- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c069d17265..724e82e8a4 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -600,7 +600,6 @@ qemuMonitorOpenInternal(virDomainObj *vm, mon->cb =3D cb; if (priv) { - mon->objectAddNoWrap =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_= OBJECT_JSON); mon->queryNamedBlockNodesFlat =3D virQEMUCapsGet(priv->qemuCaps, Q= EMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT); mon->blockjobMaskProtocol =3D virQEMUCapsGet(priv->qemuCaps, QEMU_= CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL); } @@ -2660,7 +2659,6 @@ qemuMonitorAddObject(qemuMonitor *mon, virJSONValue **props, char **alias) { - g_autoptr(virJSONValue) pr =3D NULL; const char *type =3D NULL; const char *id =3D NULL; g_autofree char *aliasCopy =3D NULL; @@ -2688,30 +2686,7 @@ qemuMonitorAddObject(qemuMonitor *mon, if (alias) aliasCopy =3D g_strdup(id); - if (mon->objectAddNoWrap) { - pr =3D g_steal_pointer(props); - } else { - /* we need to create a wrapper which has the 'qom-type' and 'id' a= nd - * store everything else under a 'props' sub-object */ - g_autoptr(virJSONValue) typeobj =3D NULL; - g_autoptr(virJSONValue) idobj =3D NULL; - - ignore_value(virJSONValueObjectRemoveKey(*props, "qom-type", &type= obj)); - ignore_value(virJSONValueObjectRemoveKey(*props, "id", &idobj)); - - /* avoid empty 'props' member */ - if (!virJSONValueObjectGetKey(*props, 0)) - g_clear_pointer(props, virJSONValueFree); - - if (virJSONValueObjectAdd(&pr, - "s:qom-type", type, - "s:id", id, - "A:props", props, - NULL) < 0) - return -1; - } - - if (qemuMonitorJSONAddObject(mon, &pr) < 0) + if (qemuMonitorJSONAddObject(mon, props) < 0) return -1; if (alias) diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h index 0c2098c456..8cb5e2c3a4 100644 --- a/src/qemu/qemu_monitor_priv.h +++ b/src/qemu/qemu_monitor_priv.h @@ -88,8 +88,6 @@ struct _qemuMonitor { void *logOpaque; virFreeCallback logDestroy; - /* true if qemu no longer wants 'props' sub-object of object-add */ - bool objectAddNoWrap; /* query-named-block-nodes supports the 'flat' option */ bool queryNamedBlockNodesFlat; /* use the backing-mask-protocol flag of block-commit/stream */ --=20 2.48.1