From nobody Mon Feb 9 06:27:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615569725; cv=none; d=zohomail.com; s=zohoarc; b=NhdcIUM7foM6rkLlAnbrSzK3WgzhKUSYCI+Atzg3U03ruqM+nZFq92F4k6VSO9F5sOlVfsKb6Cx3nLG1OjHTFhoZ4IeW2JeSqhR+kqADbNPeUD8laSa3x1L5FwF1VzhSKWJxf72o7tPnsFwyX1Y6wN7MTeQ+7aokoQkvwRtU7XU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615569725; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tt+oJX/ZOozh4ULPx5LlrctMBfjoTvM0/sYa7gR1WdI=; b=hPazY+viCRsYmrAMXiyeLUWioLSO/t54HpG6BP4Suura8Jt/ZhKcrfkn04xE+Y2relbQkU0TaClmNhpjP25msbpi8zMMehN3yi1tYaOf4DB2qKAqRojyJlAhUyxiguuwp7iSBR7C6ie1xn7GfwputmBFvQX4jAvIb4QB0RvGtKc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1615569725081139.98680146088986; Fri, 12 Mar 2021 09:22:05 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-582-Xg1mEZ-cMG2w_K-DOU_7aw-1; Fri, 12 Mar 2021 12:21:26 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 43FA3E5762; Fri, 12 Mar 2021 17:21:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0DD8246; Fri, 12 Mar 2021 17:21:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C02621800B99; Fri, 12 Mar 2021 17:21:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHL7KC030175 for ; Fri, 12 Mar 2021 12:21:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id F080F10023AF; Fri, 12 Mar 2021 17:21:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 234051002388 for ; Fri, 12 Mar 2021 17:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569723; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=tt+oJX/ZOozh4ULPx5LlrctMBfjoTvM0/sYa7gR1WdI=; b=Ds2XUDYlQnf50oLRhZ8l+d5859E4sPTB8T5i0Hdp6oH8LWjUukDNl4/zti+kJFetMN7g7k JlEJULISJUSxBxAcBsXcD+bdmxGPCvdI3OC6U1Hf3jA7rlFKnAG30PEd/aEKQQl0uJrEEQ hqJ3pPXA8w1hRMBVehJZYLMHPkwMX/Y= X-MC-Unique: Xg1mEZ-cMG2w_K-DOU_7aw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v3 06/13] qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED Date: Fri, 12 Mar 2021 18:20:49 +0100 Message-Id: <5c06622c7621a5c22e97f2ba206fb9deb43ec56b.1615569382.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Set 'objectAddNoWrap' when the capability is present. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 31c6f2f66a..0da74d8dff 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -32,6 +32,7 @@ #include "qemu_monitor_json.h" #include "qemu_domain.h" #include "qemu_process.h" +#include "qemu_capabilities.h" #include "virerror.h" #include "viralloc.h" #include "virlog.h" @@ -672,6 +673,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm, qemuMonitorCallbacksPtr cb, void *opaque) { + qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuMonitorPtr mon; g_autoptr(GError) gerr =3D NULL; @@ -704,6 +706,9 @@ qemuMonitorOpenInternal(virDomainObjPtr vm, mon->cb =3D cb; mon->callbackOpaque =3D opaque; + if (priv) + mon->objectAddNoWrap =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_= OBJECT_QAPIFIED); + if (virSetCloseExec(mon->fd) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to set monitor close-on-exec flag")= ); --=20 2.29.2