From nobody Mon Feb 9 06:26:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1583342820; cv=none; d=zohomail.com; s=zohoarc; b=hqYBMkM2MRopAS1HrUqWozxlnvIH7X7kK9esg1trN3SAIWaPBhsPh/y1aQhjFXlM86LuDNgsWoGJBjAdqZbn3v0UCsals9Lbx9M+bpDvJ+LYxRY/ty0D+Ck36tpMelhdFazK0W7yGzvu1479B7g6u092Wv5gzXqssJKQDEXRaZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583342820; h=Content-Type:Content-Transfer-Encoding:Cc: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=xrm2/Uq+i2/MPosidON/+nPvu/uG26FjXtpYhcsHdqg=; b=Fiqq6JnyVdHZ3WzMDHYA2GA3sb0UxK8VMut0pvywfH7UG8z0DmJ1I/GWHc6qyOmr+uOtesEoeviJg5QtVWw8pf5H4DYtxlSi7t4F5OY+2KJWAwj9JxdQ4y/M+SKMk9f3LW06rNsH3L+PNrFHsvt7+v9CStLeqU2qCCqirVr3GcY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1583342820331275.41619447441303; Wed, 4 Mar 2020 09:27:00 -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-400-mE-TtmHvOxScOzetW9l0Mg-1; Wed, 04 Mar 2020 12:26:57 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E51D6DB25; Wed, 4 Mar 2020 17:26:50 +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 EDA4A8B56A; Wed, 4 Mar 2020 17:26:49 +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 D0D5618034E9; Wed, 4 Mar 2020 17:26:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 024HQlcU027286 for ; Wed, 4 Mar 2020 12:26:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 37B318D55E; Wed, 4 Mar 2020 17:26:47 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8ACF08B777; Wed, 4 Mar 2020 17:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583342819; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=xrm2/Uq+i2/MPosidON/+nPvu/uG26FjXtpYhcsHdqg=; b=FXs6IIQnqsk7TMdscAdgJJc8dDTHDjFPw5e22LiKkr22oe/AMgSauN9I1QXkclIvszxWqg n1LJxLVRDNPhqFbiwOa38GDHZvvrh9s+QqtvURkwvs0o9usJ8HdF/F3o/DHGXx5cPZgKfl /cGHlYQWW7dW+8Ssib6ctsehawZcGNk= X-MC-Unique: mE-TtmHvOxScOzetW9l0Mg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/13] qemu: domain: Extract formatting of 'commit' blockjob data into a function Date: Wed, 4 Mar 2020 18:26:29 +0100 Message-Id: <685dbc1cb83253463b11ce4b0af335928dd4d6c4.1583342236.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Peter Krempa 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.11 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" I'll be adding more fields to care about so splitting the code out will be better long-term. Signed-off-by: Peter Krempa Reviewed-by: Pavel Mores --- src/qemu/qemu_domain.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 33c2158eb5..71d0a400cc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2530,6 +2530,24 @@ qemuDomainObjPrivateXMLFormatBlockjobFormatSource(vi= rBufferPtr buf, } +static void +qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job, + virBufferPtr buf) +{ + if (job->data.commit.base) + virBufferAsprintf(buf, "\n", job->data.commit.b= ase->nodeformat); + + if (job->data.commit.top) + virBufferAsprintf(buf, "\n", job->data.commit.to= p->nodeformat); + + if (job->data.commit.topparent) + virBufferAsprintf(buf, "\n", job->data.com= mit.topparent->nodeformat); + + if (job->data.commit.deleteCommittedImages) + virBufferAddLit(buf, "\n"); +} + + static int qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload, const void *name G_GNUC_UNUS= ED, @@ -2589,14 +2607,7 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *= payload, case QEMU_BLOCKJOB_TYPE_COMMIT: case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT: - if (job->data.commit.base) - virBufferAsprintf(&childBuf, "\n", job-= >data.commit.base->nodeformat); - if (job->data.commit.top) - virBufferAsprintf(&childBuf, "\n", job->= data.commit.top->nodeformat); - if (job->data.commit.topparent) - virBufferAsprintf(&childBuf, "\n",= job->data.commit.topparent->nodeformat); - if (job->data.commit.deleteCommittedImages) - virBufferAddLit(&childBuf, "\n"); + qemuDomainPrivateBlockJobFormatCommit(job, &childBuf); break; case QEMU_BLOCKJOB_TYPE_CREATE: --=20 2.24.1