From nobody Thu May 15 21:31:07 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1505312239052171.73415390578202; Wed, 13 Sep 2017 07:17:19 -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 121A4A795; Wed, 13 Sep 2017 14:17:18 +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 E4B9661789; Wed, 13 Sep 2017 14:17:17 +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 A66F01806107; Wed, 13 Sep 2017 14:17:17 +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 v8DDq8XV002858 for ; Wed, 13 Sep 2017 09:52:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 59DA360F87; Wed, 13 Sep 2017 13:52:08 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB08A61981; Wed, 13 Sep 2017 13:52:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 121A4A795 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 13 Sep 2017 15:52:01 +0200 Message-Id: <30f02741e074e403b6b91402d84a2576ce2d8877.1505310678.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 1/3] qemu: Remove support for legacy block jobs 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.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.29]); Wed, 13 Sep 2017 14:17:18 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Block job QMP commands with underscores rather than dashes were never released in upstream qemu, (they were added, but modified in the same release [1]), but a certain distro managed to backport the version in the middle. The change also slightly modified semantics for the abort command, which made us have a lot of code which was only ever present in certain downstream distros. Clean the upstream code from the legacy cruft and support only the upstream implementations. [1] See qemu commit v1.0-2176-gdb58f9c060 Reviewed-by: Eric Blake --- src/qemu/qemu_domain.c | 13 +++-------- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 60 +++++++++++++---------------------------------= ---- 3 files changed, 19 insertions(+), 56 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 664366b9d..05f8e9488 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6434,29 +6434,22 @@ qemuDomainGetMonitor(virDomainObjPtr vm) /** * qemuDomainSupportsBlockJobs: * @vm: domain object - * @modern: pointer to bool that returns whether modern block jobs are sup= ported * * Returns -1 in case when qemu does not support block jobs at all. Otherw= ise - * returns 0 and optionally fills @modern to denote that modern (async) bl= ock - * jobs are supported. + * returns 0. */ int -qemuDomainSupportsBlockJobs(virDomainObjPtr vm, - bool *modern) +qemuDomainSupportsBlockJobs(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; bool asynchronous =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJO= B_ASYNC); - bool synchronous =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB= _SYNC); - if (!synchronous && !asynchronous) { + if (!asynchronous) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("block jobs not supported with this QEMU binary")= ); return -1; } - if (modern) - *modern =3D asynchronous; - return 0; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 468308e4b..b291dc308 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -715,7 +715,7 @@ int qemuDomainJobInfoToParams(qemuDomainJobInfoPtr jobI= nfo, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -int qemuDomainSupportsBlockJobs(virDomainObjPtr vm, bool *modern) +int qemuDomainSupportsBlockJobs(virDomainObjPtr vm) ATTRIBUTE_NONNULL(1); bool qemuDomainDiskBlockJobIsActive(virDomainDiskDefPtr disk); bool qemuDomainHasBlockjob(virDomainObjPtr vm, bool copy_only) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e95683965..c7d93dcb2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16413,7 +16413,6 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; char *device =3D NULL; - bool modern; virDomainDiskDefPtr disk; virStorageSourcePtr baseSource =3D NULL; unsigned int baseIndex =3D 0; @@ -16438,25 +16437,9 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver, goto endjob; } - if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + if (qemuDomainSupportsBlockJobs(vm) < 0) goto endjob; - if (!modern) { - if (base) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("partial block pull not supported with this " - "QEMU binary")); - goto endjob; - } - - if (bandwidth) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("setting bandwidth at start of block pull not= " - "supported with this QEMU binary")); - goto endjob; - } - } - if (!(disk =3D qemuDomainDiskByName(vm->def, path))) goto endjob; @@ -16511,7 +16494,7 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver, baseSource); if (!baseSource || basePath) ret =3D qemuMonitorBlockStream(priv->mon, device, basePath, backin= gPath, - speed, modern); + speed, true); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret =3D -1; @@ -16542,7 +16525,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, virDomainDiskDefPtr disk =3D NULL; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); bool save =3D false; - bool modern; bool pivot =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT); bool async =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC); virDomainObjPtr vm; @@ -16566,7 +16548,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, goto endjob; } - if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + if (qemuDomainSupportsBlockJobs(vm) < 0) goto endjob; if (!(disk =3D qemuDomainDiskByName(vm->def, path))) @@ -16583,7 +16565,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, goto endjob; } - if (modern && !async) + if (!async) qemuBlockJobSyncBegin(disk); if (pivot) { @@ -16596,7 +16578,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, } qemuDomainObjEnterMonitor(driver, vm); - ret =3D qemuMonitorBlockJobCancel(qemuDomainGetMonitor(vm), device= , modern); + ret =3D qemuMonitorBlockJobCancel(qemuDomainGetMonitor(vm), device= , true); if (qemuDomainObjExitMonitor(driver, vm) < 0) { ret =3D -1; goto endjob; @@ -16623,25 +16605,14 @@ qemuDomainBlockJobAbort(virDomainPtr dom, * while still holding the VM job, to prevent newly scheduled * block jobs from confusing us. */ if (!async) { - if (!modern) { - /* Older qemu that lacked async reporting also lacked - * blockcopy and active commit, so we can hardcode the - * event to pull and let qemuBlockJobEventProcess() handle - * the rest as usual */ - qemuBlockJobEventProcess(driver, vm, disk, - QEMU_ASYNC_JOB_NONE, - VIR_DOMAIN_BLOCK_JOB_TYPE_PULL, - VIR_DOMAIN_BLOCK_JOB_CANCELED); - } else { - qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE= (disk); - qemuBlockJobUpdate(driver, vm, QEMU_ASYNC_JOB_NONE, disk); - while (diskPriv->blockjob) { - if (virDomainObjWait(vm) < 0) { - ret =3D -1; - goto endjob; - } - qemuBlockJobUpdate(driver, vm, QEMU_ASYNC_JOB_NONE, disk); + qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); + qemuBlockJobUpdate(driver, vm, QEMU_ASYNC_JOB_NONE, disk); + while (diskPriv->blockjob) { + if (virDomainObjWait(vm) < 0) { + ret =3D -1; + goto endjob; } + qemuBlockJobUpdate(driver, vm, QEMU_ASYNC_JOB_NONE, disk); } } @@ -16728,7 +16699,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, goto endjob; } - if (qemuDomainSupportsBlockJobs(vm, NULL) < 0) + if (qemuDomainSupportsBlockJobs(vm) < 0) goto endjob; if (!(disk =3D virDomainDiskByName(vm->def, path, true))) { @@ -16784,7 +16755,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, virDomainDiskDefPtr disk; int ret =3D -1; virDomainObjPtr vm; - bool modern; const char *device; unsigned long long speed =3D bandwidth; @@ -16816,7 +16786,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, goto endjob; } - if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + if (qemuDomainSupportsBlockJobs(vm) < 0) goto endjob; if (!(disk =3D qemuDomainDiskByName(vm->def, path))) @@ -16829,7 +16799,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, ret =3D qemuMonitorBlockJobSetSpeed(qemuDomainGetMonitor(vm), device, speed, - modern); + true); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret =3D -1; --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list