From nobody Sun Feb 8 17:41:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636986181; cv=none; d=zohomail.com; s=zohoarc; b=DBZtM+4yrdEFmGR239EOE80q1zL3E39kb2UlIXMww47I0nP3e5KOYMeC+SSGLwpkYbkQZWjz64VEiI4tvDxHJro5ts5yGpHIEm9YdI1tFM8PUZ8d0hXc37m/B89djKtsNJJj0zpfZPoPcrKAYb8tq+Fn+UhAAP+Od1RCjUca1LU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986181; 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=Ttt6jn2A1tNBoYpe5FTgSqf8J6fp5DWa4ypm0P4lqxE=; b=eFkerSg2L2ggLaRlv+P50uUNj+pgGrQ38ThdDERmrBxC9j+pLo4IXAZL5vlF0A1jyK1Jq//8Vn5/uubhVdBJz4KML62VlEFg+n7zPULzgKwr0M79zPG+7cf845tP2KZ2U6My8x89RylxdQHZaFKKJgN89jov4TBEFjIabkwoOa8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636986181746440.45395778735394; Mon, 15 Nov 2021 06:23:01 -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-409-7EAtX77mM26cjiYY2LagxA-1; Mon, 15 Nov 2021 09:22:58 -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 4FA5719200C0; Mon, 15 Nov 2021 14:22:52 +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 330785C1BB; Mon, 15 Nov 2021 14:22:52 +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 D0E374EA39; Mon, 15 Nov 2021 14:22:51 +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 1AFEMS2w009739 for ; Mon, 15 Nov 2021 09:22:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3376076E36; Mon, 15 Nov 2021 14:22:28 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D06778B37 for ; Mon, 15 Nov 2021 14:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986180; 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=Ttt6jn2A1tNBoYpe5FTgSqf8J6fp5DWa4ypm0P4lqxE=; b=KM+ZN+DIQZWCVNA6PSCi/Y6wNbP/0ABVUdJYZzChme//+tl5IuvmldiPZOaMY68olaAW1l +3LUxPQxArAJBhPEaxPJjdRa1Mcng+bQMAr8xoKfM63SpqDi6IOIHCD9uUeafLs1qW0gfU n/ST9d5cJ7D73+MbqZ3Y2JDedEHHitQ= X-MC-Unique: 7EAtX77mM26cjiYY2LagxA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/18] qemu: migration_cookie: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:07 +0100 Message-Id: <3b39bb40ccdf6fc861971d1da6f8b448cbd2f905.1636986086.git.pkrempa@redhat.com> 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: 1636986264436100003 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_migration_cookie.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index cc4cc39b32..eaf360932d 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1623,16 +1623,17 @@ qemuMigrationCookieBlockDirtyBitmapsToParams(GSList= *disks, bitmapname =3D bitmap->bitmapname; if (bitmap->persistent =3D=3D VIR_TRISTATE_BOOL_YES) { - if (virJSONValueObjectCreate(&transform, - "b:persistent", true, NULL) <= 0) + if (virJSONValueObjectAdd(&transform, + "b:persistent", true, + NULL) < 0) return -1; } - if (virJSONValueObjectCreate(&jsonbitmap, - "s:name", bitmapname, - "s:alias", bitmap->alias, - "A:transform", &transform, - NULL) < 0) + if (virJSONValueObjectAdd(&jsonbitmap, + "s:name", bitmapname, + "s:alias", bitmap->alias, + "A:transform", &transform, + NULL) < 0) return -1; if (virJSONValueArrayAppend(jsonbitmaps, &jsonbitmap) < 0) @@ -1644,11 +1645,11 @@ qemuMigrationCookieBlockDirtyBitmapsToParams(GSList= *disks, if (!hasBitmaps) continue; - if (virJSONValueObjectCreate(&jsondisk, - "s:node-name", disk->nodename, - "s:alias", disk->target, - "a:bitmaps", &jsonbitmaps, - NULL) < 0) + if (virJSONValueObjectAdd(&jsondisk, + "s:node-name", disk->nodename, + "s:alias", disk->target, + "a:bitmaps", &jsonbitmaps, + NULL) < 0) return -1; if (virJSONValueArrayAppend(map, &jsondisk) < 0) --=20 2.31.1