From nobody Mon Feb 9 09:15:45 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=1636986184; cv=none; d=zohomail.com; s=zohoarc; b=PAPf2AIJTMq9wyk4ixLNU2JO0qD2rDVcxep5DfLyadC9e8NcPyUBupssO+ZLC6VcWFqps7RqYa33dMZi3NxEFHG6xbqM7aY1yYiavuypFYM4uBVK7EzmoRd5QjBlXV4WfaxCl6K5OCA4jceIOgjx7U1XnAzJWISDciOtMeSvzRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986184; 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=OO+LRkC4wA4CATLqjR+oEyaue3PeDw0A85jZ+hrTBkY=; b=iB15Y/5gsv7nd7g8GMszjvMMjEuKOLkfRMV/VL1jQf3XYP4gKPBWLCFJ3ygi2CbPTtL0GkyS4tbwP6J6KnMkP9wzk6jVWBt5apIK9K/HcV1pm3v6sa6U2FtvoKbfAfdr+dfLddVIwSum1l01bC7NvZxenHZD9VO+ccgKdx0d3m0= 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 1636986184144559.1962053143434; Mon, 15 Nov 2021 06:23:04 -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-435-x2PQeuNSMrmBrnUO_TfmlQ-1; Mon, 15 Nov 2021 09:22:51 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6FEED19200C0; Mon, 15 Nov 2021 14:22:45 +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 4FC7A5C1BB; Mon, 15 Nov 2021 14:22:45 +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 B39C14EA31; Mon, 15 Nov 2021 14:22:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AFEMQok009715 for ; Mon, 15 Nov 2021 09:22:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id F3C8C22719; Mon, 15 Nov 2021 14:22:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F8065BAE5 for ; Mon, 15 Nov 2021 14:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986183; 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=OO+LRkC4wA4CATLqjR+oEyaue3PeDw0A85jZ+hrTBkY=; b=JrN7Wl0bW0br5iaolkwdMEfFWu19smUIc/ReBWPbANVw4bPqZ71w6Xs+MLj2x11uZuVUlP JH0xOjzfvOKbfnXVP3KzNkRibsX3z7Dlwk9WTfWvlN3pmwtVW4o3Ci4XD5u/ZFtFfcqLc4 A8xvdEY3olUhORSqMANKIBk0Auw2Bfk= X-MC-Unique: x2PQeuNSMrmBrnUO_TfmlQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/18] qemu: monitor_json: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:05 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.16 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: 1636986265605100005 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor_json.c | 41 ++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8105b40ffb..24b6c29aca 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -511,9 +511,9 @@ qemuMonitorJSONTransactionAdd(virJSONValue *actions, va_end(args); - if (virJSONValueObjectCreate(&entry, - "s:type", cmdname, - "A:data", &data, NULL) < 0) + if (virJSONValueObjectAdd(&entry, + "s:type", cmdname, + "A:data", &data, NULL) < 0) return -1; if (virJSONValueArrayAppend(actions, &entry) < 0) @@ -538,9 +538,9 @@ qemuMonitorJSONMakeCommandInternal(const char *cmdname, { virJSONValue *ret =3D NULL; - ignore_value(virJSONValueObjectCreate(&ret, - "s:execute", cmdname, - "A:arguments", arguments, NULL)); + ignore_value(virJSONValueObjectAdd(&ret, + "s:execute", cmdname, + "A:arguments", arguments, NULL)); return ret; } @@ -3608,7 +3608,7 @@ int qemuMonitorJSONAddFileHandleToSet(qemuMonitor *mo= n, g_autoptr(virJSONValue) reply =3D NULL; g_autoptr(virJSONValue) cmd =3D NULL; - if (virJSONValueObjectCreate(&args, "S:opaque", opaque, NULL) < 0) + if (virJSONValueObjectAdd(&args, "S:opaque", opaque, NULL) < 0) return -1; if (fdset >=3D 0 && @@ -6418,12 +6418,16 @@ qemuMonitorJSONBuildInetSocketAddress(const char *h= ost, g_autoptr(virJSONValue) addr =3D NULL; g_autoptr(virJSONValue) data =3D NULL; - if (virJSONValueObjectCreate(&data, "s:host", host, - "s:port", port, NULL) < 0) + if (virJSONValueObjectAdd(&data, + "s:host", host, + "s:port", port, + NULL) < 0) return NULL; - if (virJSONValueObjectCreate(&addr, "s:type", "inet", - "a:data", &data, NULL) < 0) + if (virJSONValueObjectAdd(&addr, + "s:type", "inet", + "a:data", &data, + NULL) < 0) return NULL; return g_steal_pointer(&addr); @@ -6435,11 +6439,12 @@ qemuMonitorJSONBuildUnixSocketAddress(const char *p= ath) g_autoptr(virJSONValue) addr =3D NULL; g_autoptr(virJSONValue) data =3D NULL; - if (virJSONValueObjectCreate(&data, "s:path", path, NULL) < 0) + if (virJSONValueObjectAdd(&data, "s:path", path, NULL) < 0) return NULL; - if (virJSONValueObjectCreate(&addr, "s:type", "unix", - "a:data", &data, NULL) < 0) + if (virJSONValueObjectAdd(&addr, + "s:type", "unix", + "a:data", &data, NULL) < 0) return NULL; return g_steal_pointer(&addr); @@ -8340,10 +8345,10 @@ qemuMonitorJSONTransactionBitmapMergeSourceAddBitma= p(virJSONValue *sources, { g_autoptr(virJSONValue) sourceobj =3D NULL; - if (virJSONValueObjectCreate(&sourceobj, - "s:node", sourcenode, - "s:name", sourcebitmap, - NULL) < 0) + if (virJSONValueObjectAdd(&sourceobj, + "s:node", sourcenode, + "s:name", sourcebitmap, + NULL) < 0) return -1; if (virJSONValueArrayAppend(sources, &sourceobj) < 0) --=20 2.31.1