From nobody Mon Feb 9 10:27:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1585646329; cv=none; d=zohomail.com; s=zohoarc; b=Tyr0B0pAB32BLe9HaBYXyOY0JE167PuchhzW378jt0Wen48PN33dm1OhREEYZ8D9+hueATM5Uf8h/OSFKY8s6MNI090wl8FAdEkpGYjYw5UiSTIrMr/aS/5SfrpDZ8yqEOLS0WKfN6jBIIxU9B/D/1U6NC9m7PHxPdNprm5ZIm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585646329; 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=wXRADFluN0HUKtEDQwxMJuCa9vnrNSPlxpUfcSDruLQ=; b=e/AB0+avjWclB8um1/YZTYerdPxlwJsuMTXekN+eAFQdHl8daCQQcETVxj1mlgeVb33htbxLK37INDqgz27ue9j6+Ge/W8UQmgDlB0fbj5Fn3fE7FU8y2N42F9nImQX3lqI/mwDjWL/jHd7iCOF7PyUxfJPKQd5xm5YL1HFSbhc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1585646329013924.2018040655188; Tue, 31 Mar 2020 02:18:49 -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-320-R-h-VlFKPw-u5Mio_lEHQg-1; Tue, 31 Mar 2020 05:18:45 -0400 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 5B8668017CE; Tue, 31 Mar 2020 09:18:40 +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 D3ED560BE0; Tue, 31 Mar 2020 09:18:39 +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 5D58B18095FF; Tue, 31 Mar 2020 09:18:38 +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 02V9Iara024665 for ; Tue, 31 Mar 2020 05:18:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7976D953D6; Tue, 31 Mar 2020 09:18:36 +0000 (UTC) Received: from ibm-p8-15-fsp.mgmt.pnr.lab.eng.rdu2.redhat.com (unknown [10.40.195.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC4316EF9F; Tue, 31 Mar 2020 09:18:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585646327; 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=wXRADFluN0HUKtEDQwxMJuCa9vnrNSPlxpUfcSDruLQ=; b=fqTVH/ggNEAax2Qy5l0q19Cb6bCniOgAx+knJ10Go5f61nrt33zWYXrDUkYzopD/bq5y/J RThB+OnR7oaco2xuhm7o0iYRU/NoPu8qSWrIkGQe8wMhdeZf2FSBvSWoJZnIEx3uu9izKT EvCA6+z1o18T/Y8KIH5330k278S0ZD4= X-MC-Unique: R-h-VlFKPw-u5Mio_lEHQg-1 From: Pavel Mores To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] qemu: block: factor implementation out of qemuDomainBlockCommit() Date: Tue, 31 Mar 2020 11:18:27 +0200 Message-Id: <20200331091829.521427-2-pmores@redhat.com> In-Reply-To: <20200331091829.521427-1-pmores@redhat.com> References: <20200331091829.521427-1-pmores@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Pavel Mores 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 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" The idea is to make block commit callable from within the QEMU driver. Signed-off-by: Pavel Mores --- src/qemu/qemu_driver.c | 84 +++++++++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e9a62684f0..f94636f651 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -154,6 +154,15 @@ static int qemuOpenFileAs(uid_t fallback_uid, gid_t fa= llback_gid, =20 static virQEMUDriverPtr qemu_driver; =20 +static int +qemuDomainBlockCommitImpl(virDomainObjPtr vm, + virQEMUDriverPtr driver, + const char *path, + const char *base, + const char *top, + unsigned long bandwidth, + unsigned int flags); + /* Looks up the domain object from snapshot and unlocks the * driver. The returned domain object is locked and ref'd and the * caller must call virDomainObjEndAPI() on it. */ @@ -18314,18 +18323,16 @@ qemuDomainBlockPull(virDomainPtr dom, const char = *path, unsigned long bandwidth, return qemuDomainBlockPullCommon(vm, path, NULL, bandwidth, flags); } =20 - static int -qemuDomainBlockCommit(virDomainPtr dom, - const char *path, - const char *base, - const char *top, - unsigned long bandwidth, - unsigned int flags) +qemuDomainBlockCommitImpl(virDomainObjPtr vm, + virQEMUDriverPtr driver, + const char *path, + const char *base, + const char *top, + unsigned long bandwidth, + unsigned int flags) { - virQEMUDriverPtr driver =3D dom->conn->privateData; - qemuDomainObjPrivatePtr priv; - virDomainObjPtr vm =3D NULL; + qemuDomainObjPrivatePtr priv =3D vm->privateData; const char *device =3D NULL; const char *jobname =3D NULL; int ret =3D -1; @@ -18347,25 +18354,6 @@ qemuDomainBlockCommit(virDomainPtr dom, bool persistjob =3D false; bool blockdev =3D false; =20 - virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW | - VIR_DOMAIN_BLOCK_COMMIT_ACTIVE | - VIR_DOMAIN_BLOCK_COMMIT_RELATIVE | - VIR_DOMAIN_BLOCK_COMMIT_DELETE | - VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES, -1); - - if (!(vm =3D qemuDomainObjFromDomain(dom))) - goto cleanup; - priv =3D vm->privateData; - - if (virDomainBlockCommitEnsureACL(dom->conn, vm->def) < 0) - goto cleanup; - - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) - goto cleanup; - - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - if (virDomainObjCheckActive(vm) < 0) goto endjob; =20 @@ -18558,6 +18546,43 @@ qemuDomainBlockCommit(virDomainPtr dom, virErrorRestore(&orig_err); } qemuBlockJobStartupFinalize(vm, job); + + return ret; +} + + +static int +qemuDomainBlockCommit(virDomainPtr dom, + const char *path, + const char *base, + const char *top, + unsigned long bandwidth, + unsigned int flags) +{ + virQEMUDriverPtr driver =3D dom->conn->privateData; + virDomainObjPtr vm =3D NULL; + int ret =3D -1; + + virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW | + VIR_DOMAIN_BLOCK_COMMIT_ACTIVE | + VIR_DOMAIN_BLOCK_COMMIT_RELATIVE | + VIR_DOMAIN_BLOCK_COMMIT_DELETE | + VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES, -1); + + if (!(vm =3D qemuDomainObjFromDomain(dom))) + goto cleanup; + + if (virDomainBlockCommitEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) + goto cleanup; + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + ret =3D qemuDomainBlockCommitImpl(vm, driver, path, base, top, bandwid= th, flags); + qemuDomainObjEndJob(driver, vm); =20 cleanup: @@ -18565,6 +18590,7 @@ qemuDomainBlockCommit(virDomainPtr dom, return ret; } =20 + static int qemuDomainOpenGraphics(virDomainPtr dom, unsigned int idx, --=20 2.24.1