From nobody Mon Feb 9 10:32:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1614182358; cv=none; d=zohomail.com; s=zohoarc; b=OCOhgAwJFyoo8NwOEX4/ibntgXToLQauPIgDPktt0mxyr7EtyDkK1alQHdAK9/P6J2U+nMAmAO/uhVnjqnal3WaSs3iFbTtohBoNzkzZ+Q4AfcvjEvasNxm1Vv1HW+D6vz4IJM6JbXItnSw5fWhQzd/r9gN9PQZQEx721T9RVWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614182358; 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=w4gMlhbjHbNGy73KYBX0LTaSKn0FsaJkVTIb0Z3oByc=; b=LTfKdoqUau4Aq5bYRNO3zLfHpLWJRO9QvilriyExUXbLOiQHrmFROFwDGCUchig8gTNZ/Rbrmg/aFadBAcwwJ/fH8Vh/RkP2fSITcEpptdHkQxbsULt6J1GpQSr6VML+RjFkUuFooQJGCZccfx+fUBikUnvcQkMjaIBOqVqXlfQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1614182358908549.2994418740379; Wed, 24 Feb 2021 07:59:18 -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-314-qtrCyX0DMhC8-5EFLNZCqQ-1; Wed, 24 Feb 2021 10:59:00 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8E9389E287; Wed, 24 Feb 2021 15:58:25 +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 76EF260C5F; Wed, 24 Feb 2021 15:58:25 +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 03B1F18095CD; Wed, 24 Feb 2021 15:58:25 +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 11OFwKEn010882 for ; Wed, 24 Feb 2021 10:58:20 -0500 Received: by smtp.corp.redhat.com (Postfix) id AD7E01001E73; Wed, 24 Feb 2021 15:58:20 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17A8210016F9 for ; Wed, 24 Feb 2021 15:58:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614182357; 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=w4gMlhbjHbNGy73KYBX0LTaSKn0FsaJkVTIb0Z3oByc=; b=P2l3Znkf+a6li5FGFyVBb02V3t1+EOBMtK3s5qVE/GzZmN0RkFODni9OPNYmUDE1PfeQAj 4GRhBn/BSoIIZUAt//IWn0KYY2m/SyzWjf62GRwpVjh99c3+QVPZVH76PBLi4UqRvDp9y6 0HekVYzpkkczhEmEOc1fLRurfM3kTdI= X-MC-Unique: qtrCyX0DMhC8-5EFLNZCqQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 09/12] qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED Date: Wed, 24 Feb 2021 16:58:03 +0100 Message-Id: <37256d5a768e7c3c754e00bace1ab8d2add9ebc4.1614182040.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.79 on 10.5.11.12 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 121c21be5c..1e4c4809b1 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