From nobody Sat May 4 02:20:51 2024 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1525962821829288.7833134957169; Thu, 10 May 2018 07:33:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E47D7C0587ED; Thu, 10 May 2018 14:33:39 +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 E73E8201A9A0; Thu, 10 May 2018 14:33:38 +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 D48CF4BB79; Thu, 10 May 2018 14:33:37 +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 w4AEGroo023349 for ; Thu, 10 May 2018 10:16:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id C08716017D; Thu, 10 May 2018 14:16:53 +0000 (UTC) Received: from mx1.redhat.com (ext-mx17.extmail.prod.ext.phx2.redhat.com [10.5.110.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 877B76016F; Thu, 10 May 2018 14:16:49 +0000 (UTC) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7319C30C4CCC; Thu, 10 May 2018 14:16:38 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id j5-v6so4667548wme.5; Thu, 10 May 2018 07:16:38 -0700 (PDT) Received: from rolandPC.redhat.com ([213.175.37.12]) by smtp.gmail.com with ESMTPSA id m64-v6sm1981323wmb.12.2018.05.10.07.16.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 May 2018 07:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=63Lg+Q2RnIKW3JoYaxAAQUV+WNznw3NbA0MUWM10GUk=; b=DqXkQxLEg7wk4oxj+vBMk5TRkIgLN4w8RipKvPwRgswCyPkN8hE2CXP+qvh49007He N7ysHBfQ80KCT9iwkLkhKRritMxXMIXqv3tEokANlpYVBVHjSBHoy720c8wOeG3VQ9gX 4Z1o9LIdTMi6VFZfmuGc53bPsuwpL1Rr8zIWrZTjvYDMC+S2FudDFLEByufXdAHhyEHF 7xv8UQliXTKpS/AQOZXilAoVJVmoJKLAdWwsSPfWtVn0Zkw+Td4wSJSHhTg6fmoR3Pu3 r+RIe5JIo4IX2mIGUMgQpTvbGKzBbyBMvhHvcuVC4wAozFxMXLlu6ocssRPUILzjzl5w Wpqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=63Lg+Q2RnIKW3JoYaxAAQUV+WNznw3NbA0MUWM10GUk=; b=nvvyqG8p2KFy3KCy5Qe04+hZGb2nhZio5yBboV4tH+1jJycEeeq/M/+IX9Nq/KEZHE xrlK1HQ4r1GS8EE02Wij69Ma7sOoA/SNrSMYl+6cC/+C0HB4k9cwGrd2SKin/iIlPbFo UcZmKgg0xvQke0PuJIO3gN9HQv/c58cJL+R0gUbO+blofa3u8Uga3OjBVT0fLvY1e4uV 1Zxy3Zg+b9M4j12kKNIirbuUWRomDYCYazTBTI2/JxNydtubOQyCkQ6f7nIr9H1bzhOm iFku85cbhOaL8oJ6qQ1SYMWkKDAOKYOpW++QUrleJOdJqhs/Px9O9eRbSYE1lkVufTw+ Z0IQ== X-Gm-Message-State: ALKqPwdax+w2X8Qiw1e2St0YRv2aePAvOTfIY8fsvf5je1dFM7lzUm3J Ef/dIV4tDZC88lePonGKRkksew== X-Google-Smtp-Source: AB8JxZpoOls3pxBUNkW/MBq4OWi5guRnCRINfVTLd+eUmHALF/zeVVyrAmglz9NXBns4uJdnkILMIQ== X-Received: by 2002:a1c:8d90:: with SMTP id p138-v6mr1433821wmd.153.1525961796792; Thu, 10 May 2018 07:16:36 -0700 (PDT) From: Roland Schulz To: libvir-list@redhat.com, mprivozn@redhat.com Date: Thu, 10 May 2018 16:16:30 +0200 Message-Id: <20180510141630.27704-1-schullzroll@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 10 May 2018 14:16:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 10 May 2018 14:16:38 +0000 (UTC) for IP:'74.125.82.44' DOMAIN:'mail-wm0-f44.google.com' HELO:'mail-wm0-f44.google.com' FROM:'schullzroll@gmail.com' RCPT:'' X-RedHat-Spam-Score: 1.281 * (DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, NML_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS, T_DKIM_INVALID) 74.125.82.44 mail-wm0-f44.google.com 74.125.82.44 mail-wm0-f44.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.46 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Thu, 10 May 2018 10:33:35 -0400 Subject: [libvirt] [PATCH] qemu: Remove parameter 'driver' from qemuBlockJobUpdate 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 10 May 2018 14:33:40 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The pointer to the qemu driver is already included in domain object's private data, so does not need to be passed as yet another parameter when the domain object is already passed. Also removes parameter 'driver' from functions which had it just because of qemuBlockJobUpdate. Signed-off-by: Roland Schulz Reviewed-by: J=EF=BF=BDn Tomko --- Follow up on BiteSizeTask https://wiki.libvirt.org/page/BiteSizedTasks#Clean_up_virQEMUDriverPtr_para= meters src/qemu/qemu_blockjob.c | 13 +++++-------- src/qemu/qemu_blockjob.h | 6 ++---- src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_migration.c | 29 +++++++++++++---------------- 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 617e4ee56..e0dfb88c1 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -44,7 +44,6 @@ VIR_LOG_INIT("qemu.qemu_blockjob"); =20 /** * qemuBlockJobUpdate: - * @driver: qemu driver * @vm: domain * @disk: domain disk * @error: error (output parameter) @@ -55,20 +54,20 @@ VIR_LOG_INIT("qemu.qemu_blockjob"); * Returns the block job event processed or -1 if there was no pending eve= nt. */ int -qemuBlockJobUpdate(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockJobUpdate(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virDomainDiskDefPtr disk, char **error) { qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); + qemuDomainObjPrivatePtr priv =3D vm->privateData; int status =3D diskPriv->blockJobStatus; =20 if (error) *error =3D NULL; =20 if (status !=3D -1) { - qemuBlockJobEventProcess(driver, vm, disk, asyncJob, + qemuBlockJobEventProcess(priv->driver, vm, disk, asyncJob, diskPriv->blockJobType, diskPriv->blockJobStatus); diskPriv->blockJobStatus =3D -1; @@ -244,7 +243,6 @@ qemuBlockJobSyncBegin(virDomainDiskDefPtr disk) =20 /** * qemuBlockJobSyncEnd: - * @driver: qemu driver * @vm: domain * @disk: domain disk * @@ -252,12 +250,11 @@ qemuBlockJobSyncBegin(virDomainDiskDefPtr disk) * for the disk is processed. */ void -qemuBlockJobSyncEnd(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockJobSyncEnd(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virDomainDiskDefPtr disk) { VIR_DEBUG("disk=3D%s", disk->dst); - qemuBlockJobUpdate(driver, vm, asyncJob, disk, NULL); + qemuBlockJobUpdate(vm, asyncJob, disk, NULL); QEMU_DOMAIN_DISK_PRIVATE(disk)->blockJobSync =3D false; } diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index e71d691c9..cee3ee21c 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -26,8 +26,7 @@ # include "qemu_conf.h" # include "qemu_domain.h" =20 -int qemuBlockJobUpdate(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuBlockJobUpdate(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virDomainDiskDefPtr disk, char **error); @@ -39,8 +38,7 @@ void qemuBlockJobEventProcess(virQEMUDriverPtr driver, int status); =20 void qemuBlockJobSyncBegin(virDomainDiskDefPtr disk); -void qemuBlockJobSyncEnd(virQEMUDriverPtr driver, - virDomainObjPtr vm, +void qemuBlockJobSyncEnd(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virDomainDiskDefPtr disk); =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c129321a5..b03eb3042 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16934,19 +16934,19 @@ qemuDomainBlockJobAbort(virDomainPtr dom, * block jobs from confusing us. */ if (!async) { qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); - qemuBlockJobUpdate(driver, vm, QEMU_ASYNC_JOB_NONE, disk, NULL); + qemuBlockJobUpdate(vm, QEMU_ASYNC_JOB_NONE, disk, NULL); while (diskPriv->blockjob) { if (virDomainObjWait(vm) < 0) { ret =3D -1; goto endjob; } - qemuBlockJobUpdate(driver, vm, QEMU_ASYNC_JOB_NONE, disk, NULL= ); + qemuBlockJobUpdate(vm, QEMU_ASYNC_JOB_NONE, disk, NULL); } } =20 endjob: if (disk) - qemuBlockJobSyncEnd(driver, vm, QEMU_ASYNC_JOB_NONE, disk); + qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_NONE, disk); qemuDomainObjEndJob(driver, vm); =20 cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7602a304c..f01bb64f6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -464,7 +464,6 @@ qemuMigrationDstStopNBDServer(virQEMUDriverPtr driver, =20 /** * qemuMigrationSrcDriveMirrorReady: - * @driver: qemu driver * @vm: domain * * Check the status of all drive-mirrors started by @@ -476,8 +475,7 @@ qemuMigrationDstStopNBDServer(virQEMUDriverPtr driver, * -1 on error. */ static int -qemuMigrationSrcDriveMirrorReady(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuMigrationSrcDriveMirrorReady(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob) { size_t i; @@ -492,7 +490,7 @@ qemuMigrationSrcDriveMirrorReady(virQEMUDriverPtr drive= r, if (!diskPriv->migrating) continue; =20 - status =3D qemuBlockJobUpdate(driver, vm, asyncJob, disk, &error); + status =3D qemuBlockJobUpdate(vm, asyncJob, disk, &error); if (status =3D=3D VIR_DOMAIN_BLOCK_JOB_FAILED) { if (error) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -532,8 +530,7 @@ qemuMigrationSrcDriveMirrorReady(virQEMUDriverPtr drive= r, * -2 all mirrors are gone but some of them failed. */ static int -qemuMigrationDriveMirrorCancelled(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuMigrationDriveMirrorCancelled(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, bool check) { @@ -552,7 +549,7 @@ qemuMigrationDriveMirrorCancelled(virQEMUDriverPtr driv= er, if (!diskPriv->migrating) continue; =20 - status =3D qemuBlockJobUpdate(driver, vm, asyncJob, disk, &error); + status =3D qemuBlockJobUpdate(vm, asyncJob, disk, &error); switch (status) { case VIR_DOMAIN_BLOCK_JOB_FAILED: if (check) { @@ -569,7 +566,7 @@ qemuMigrationDriveMirrorCancelled(virQEMUDriverPtr driv= er, ATTRIBUTE_FALLTHROUGH; case VIR_DOMAIN_BLOCK_JOB_CANCELED: case VIR_DOMAIN_BLOCK_JOB_COMPLETED: - qemuBlockJobSyncEnd(driver, vm, asyncJob, disk); + qemuBlockJobSyncEnd(vm, asyncJob, disk); diskPriv->migrating =3D false; break; =20 @@ -633,7 +630,7 @@ qemuMigrationSrcCancelOneDriveMirror(virQEMUDriverPtr d= river, int status; int rv; =20 - status =3D qemuBlockJobUpdate(driver, vm, asyncJob, disk, &error); + status =3D qemuBlockJobUpdate(vm, asyncJob, disk, &error); switch (status) { case VIR_DOMAIN_BLOCK_JOB_FAILED: case VIR_DOMAIN_BLOCK_JOB_CANCELED: @@ -716,12 +713,12 @@ qemuMigrationSrcCancelDriveMirror(virQEMUDriverPtr dr= iver, err =3D virSaveLastError(); failed =3D true; } - qemuBlockJobSyncEnd(driver, vm, asyncJob, disk); + qemuBlockJobSyncEnd(vm, asyncJob, disk); diskPriv->migrating =3D false; } } =20 - while ((rv =3D qemuMigrationDriveMirrorCancelled(driver, vm, asyncJob, + while ((rv =3D qemuMigrationDriveMirrorCancelled(vm, asyncJob, check)) !=3D 1) { if (check && !failed && dconn && virConnectIsAlive(dconn) <=3D 0) { @@ -848,7 +845,7 @@ qemuMigrationSrcDriveMirror(virQEMUDriverPtr driver, VIR_FREE(nbd_dest); =20 if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) { - qemuBlockJobSyncEnd(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, = disk); + qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_MIGRATION_OUT, disk); goto cleanup; } diskPriv->migrating =3D true; @@ -859,7 +856,7 @@ qemuMigrationSrcDriveMirror(virQEMUDriverPtr driver, } } =20 - while ((rv =3D qemuMigrationSrcDriveMirrorReady(driver, vm, + while ((rv =3D qemuMigrationSrcDriveMirrorReady(vm, QEMU_ASYNC_JOB_MIGRATION= _OUT)) !=3D 1) { if (rv < 0) goto cleanup; @@ -1366,7 +1363,7 @@ qemuMigrationAnyCompleted(virQEMUDriverPtr driver, =20 /* This flag should only be set when run on src host */ if (flags & QEMU_MIGRATION_COMPLETED_CHECK_STORAGE && - qemuMigrationSrcDriveMirrorReady(driver, vm, asyncJob) < 0) + qemuMigrationSrcDriveMirrorReady(vm, asyncJob) < 0) goto error; =20 if (flags & QEMU_MIGRATION_COMPLETED_ABORT_ON_ERROR && @@ -5273,7 +5270,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, VIR_DEBUG("Drive mirror on disk %s is still running", disk->ds= t); } else { VIR_DEBUG("Drive mirror on disk %s is gone", disk->dst); - qemuBlockJobSyncEnd(driver, vm, QEMU_ASYNC_JOB_NONE, disk); + qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_NONE, disk); diskPriv->migrating =3D false; } } @@ -5295,7 +5292,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE= (disk); =20 if (diskPriv->migrating) { - qemuBlockJobSyncEnd(driver, vm, QEMU_ASYNC_JOB_NONE, disk); + qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_NONE, disk); diskPriv->migrating =3D false; } } --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list