From nobody Mon Feb 9 16:34:19 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=1633622110; cv=none; d=zohomail.com; s=zohoarc; b=hE1Z1Mh6Un0/46u6Ng8qys86Ih+MQeOMWxIFRQAlwokRln4k8adEz/bhNnYkGcVUblCsEj44jNaEYnaN0Wz6qbmB3OL+GgESMId23+LblFia+saI70n4GBvyeB6bx5HGD8j+NpHgwNApnIdCVdYzzi3Uz5Cr81J4uIixhfLfgJw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633622110; 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=8ejocDl8JtaKtX3US6XYK25zVmZGfrvjSgWetLODCTU=; b=BvGg/UEZKXv2DgEiQQRZpC5BTmgnknQWRmHT6QQ9OAUvYSjdYiJPIsEhGeibTDHmeVNW+nBT1ASUIFxSGNg9l0vuFaLSa25YEzkSzdHtu/jwvPpLl/nXrkejpUyvMO6WFYashMk0iqF78nXN6KZQI5tUVAMg12RNXc0eD2Mk7Vw= 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) 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 1633622110160498.71696069219615; Thu, 7 Oct 2021 08:55:10 -0700 (PDT) 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-20-33Cu_rXcMVi5kV0Qn0H4hA-1; Thu, 07 Oct 2021 11:55:07 -0400 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 5A99192045E; Thu, 7 Oct 2021 15:42:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D07347F22D; Thu, 7 Oct 2021 15:42:10 +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 8D2F84EA2F; Thu, 7 Oct 2021 15:42:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 197FIe8e023554 for ; Thu, 7 Oct 2021 11:18:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id CAEC75D6D5; Thu, 7 Oct 2021 15:18:40 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EC4F5D6BA for ; Thu, 7 Oct 2021 15:18:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633622109; 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=8ejocDl8JtaKtX3US6XYK25zVmZGfrvjSgWetLODCTU=; b=eCbUOUE3HLGtBdZIAXL7KzdQxXzm1fXNA4TrE+su+9p7mMH/FCzZVjfNbwm+vo4YkaGOzt Lv0AAp60yJn+pLL3zAJ29kluQXJYgyQdmBcyqR14lUcsEhMZlctT7uLTvDL9u0yvoEGO0W ncPmQ2gVnaKi8za5GFFcv5t+nv6WeGU= X-MC-Unique: 33Cu_rXcMVi5kV0Qn0H4hA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 007/103] qemu: capabilities: Rename QEMU_CAPS_OBJECT_QAPIFIED to QEMU_CAPS_OBJECT_JSON Date: Thu, 7 Oct 2021 17:16:55 +0200 Message-Id: <16c212b971f6eee1691bfe83f5c77fa99ffea8bc.1633619630.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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) X-ZM-MESSAGEID: 1633622112294100001 Content-Type: text/plain; charset="utf-8" Unify it with the upcoming capabilities for -netdev and -device. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 6 +++--- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_monitor.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 82687dbf39..02f297d14f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -623,7 +623,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "vnc-power-control", /* QEMU_CAPS_VNC_POWER_CONTROL */ "audiodev", /* QEMU_CAPS_AUDIODEV */ "blockdev-backup", /* QEMU_CAPS_BLOCKDEV_BACKUP */ - "object.qapified", /* QEMU_CAPS_OBJECT_QAPIFIED */ + "object.qapified", /* QEMU_CAPS_OBJECT_JSON */ "rotation-rate", /* QEMU_CAPS_ROTATION_RATE */ /* 400 */ @@ -1580,7 +1580,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS }, { "nbd-server-add/arg-type/bitmap", QEMU_CAPS_NBD_BITMAP }, { "netdev_add/arg-type/+vhost-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA }, - { "object-add/arg-type/qom-type/^secret", QEMU_CAPS_OBJECT_QAPIFIED }, + { "object-add/arg-type/qom-type/^secret", QEMU_CAPS_OBJECT_JSON }, { "query-display-options/ret-type/+egl-headless/rendernode", QEMU_CAPS= _EGL_HEADLESS_RENDERNODE }, { "query-display-options/ret-type/+sdl", QEMU_CAPS_SDL }, { "query-display-options/ret-type/+egl-headless", QEMU_CAPS_EGL_HEADLE= SS }, @@ -5089,7 +5089,7 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemu= Caps) * method which doesn't show up in query-command-line-options. As we'l= l use * it only for development and testing purposes we can base the capabi= lity * on a not entirely related witness. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_QAPIFIED)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_COMPAT_DEPRECATED); } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2bbfc15dc4..00ea71633a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -603,7 +603,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_VNC_POWER_CONTROL, /* -vnc power-control option */ QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */ QEMU_CAPS_BLOCKDEV_BACKUP, /* qemu supports the blockdev-backup job */ - QEMU_CAPS_OBJECT_QAPIFIED, /* parameters for object-add are formally d= escribed */ + QEMU_CAPS_OBJECT_JSON, /* parameters for object-add are formally descr= ibed */ QEMU_CAPS_ROTATION_RATE, /* scsi-disk / ide-drive rotation-rate prop */ /* 400 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ae8234f88f..1a946d895d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -171,7 +171,7 @@ qemuBuildObjectCommandlineFromJSON(virCommand *cmd, return -1; } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_QAPIFIED)) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON)) { if (!(arg =3D virJSONValueToString(props, false))) return -1; } else { diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5fc23f13d3..068b7ff997 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -700,7 +700,7 @@ qemuMonitorOpenInternal(virDomainObj *vm, mon->callbackOpaque =3D opaque; if (priv) - mon->objectAddNoWrap =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_= OBJECT_QAPIFIED); + mon->objectAddNoWrap =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_= OBJECT_JSON); if (virSetCloseExec(mon->fd) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, --=20 2.31.1