From nobody Mon Feb 9 00:56:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1569513099; cv=none; d=zoho.com; s=zohoarc; b=gMfJCQUWqiX5R6tmIDbqT13vKjoYjvrGp0ZZqtmannIObQLiXu09Y+YuUeknbWZ8XygGAomnRgXtTdA1hsb6hNpQyRMQ/M0grJttIrVRT5+8IbuVFTUF75HG2/bZj742H+Kfr/4WOuR0PMM1swjRP28UuNeET6l/wjk275AnqnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569513099; 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:ARC-Authentication-Results; bh=+Wztouh0nMEmL3wiTSJP5AlynFnc2DGHyi9u84x5oAw=; b=VTLZBt5kRvyWKnnPder7lM42njHc80w3y4tzz9XxAPsLIcT0MVkvszVHuGjRkOhs0IwyRsCgW2uQwionJc8UPrjrcwHOBK0hxJQqwalrTFwfQQNNcxN1g0QuTqt2Da5Hj+0kunqPQEjlBoqn92e28FyiMPHP/I2HeHORdG3NY6M= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1569513099558653.2953809211842; Thu, 26 Sep 2019 08:51:39 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id F17C4300BEAE; Thu, 26 Sep 2019 15:51:36 +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 C70EC5C21A; Thu, 26 Sep 2019 15:51:36 +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 880831803B49; Thu, 26 Sep 2019 15:51:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8QFpLsK000788 for ; Thu, 26 Sep 2019 11:51:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id B5B3E60C5D; Thu, 26 Sep 2019 15:51:21 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D38E60E1C for ; Thu, 26 Sep 2019 15:51:20 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 26 Sep 2019 17:51:07 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/8] qemu: Simplify argument list of qemuDomainBlockPullCommon 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 26 Sep 2019 15:51:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Drop the 'driver' argument since it can be extracted from private data to shorten the argument list. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5852df2a53..71503898e4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17534,14 +17534,14 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, /* bandwidth in MiB/s per public API. Caller must lock vm beforehand, * and not access it afterwards. */ static int -qemuDomainBlockPullCommon(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuDomainBlockPullCommon(virDomainObjPtr vm, const char *path, const char *base, unsigned long bandwidth, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; const char *device =3D NULL; const char *jobname =3D NULL; virDomainDiskDefPtr disk; @@ -18355,7 +18355,6 @@ static int qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base, unsigned long bandwidth, unsigned int flags) { - virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; int ret =3D -1; unsigned long long speed =3D bandwidth; @@ -18384,7 +18383,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char = *path, const char *base, /* For normal rebase (enhanced blockpull), the common code handles * everything, including vm cleanup. */ if (!(flags & VIR_DOMAIN_BLOCK_REBASE_COPY)) - return qemuDomainBlockPullCommon(driver, vm, path, base, bandwidth= , flags); + return qemuDomainBlockPullCommon(vm, path, base, bandwidth, flags); /* If we got here, we are doing a block copy rebase. */ if (!(dest =3D virStorageSourceNew())) @@ -18540,8 +18539,7 @@ qemuDomainBlockPull(virDomainPtr dom, const char *p= ath, unsigned long bandwidth, return -1; } - return qemuDomainBlockPullCommon(dom->conn->privateData, - vm, path, NULL, bandwidth, flags); + return qemuDomainBlockPullCommon(vm, path, NULL, bandwidth, flags); } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list