From nobody Thu May 15 21:31:06 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 150531209770416.743371341697184; Wed, 13 Sep 2017 07:14:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A1FA34ACCA; Wed, 13 Sep 2017 14:14:56 +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 595C767C72; Wed, 13 Sep 2017 14:14:56 +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 9518D1806107; Wed, 13 Sep 2017 14:14:55 +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 v8DDqAsh002878 for ; Wed, 13 Sep 2017 09:52:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9245B60F87; Wed, 13 Sep 2017 13:52:10 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id E44BA60244; Wed, 13 Sep 2017 13:52:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A1FA34ACCA Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.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:02 +0200 Message-Id: <3cfdaaf81f0999f3efa2d29b745e7c361600e775.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 2/3] qemu: monitor: 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 13 Sep 2017 14:14:57 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Drop all the monitor code necessary to do the downstream block jobs. Reviewed-by: Eric Blake --- src/qemu/qemu_driver.c | 7 +++---- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 24 ++++++++++-------------- src/qemu/qemu_monitor.h | 9 +++------ src/qemu/qemu_monitor_json.c | 17 +++++++---------- src/qemu/qemu_monitor_json.h | 9 +++------ 6 files changed, 27 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c7d93dcb2..b334cf20b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16494,7 +16494,7 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver, baseSource); if (!baseSource || basePath) ret =3D qemuMonitorBlockStream(priv->mon, device, basePath, backin= gPath, - speed, true); + speed); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret =3D -1; @@ -16578,7 +16578,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, } qemuDomainObjEnterMonitor(driver, vm); - ret =3D qemuMonitorBlockJobCancel(qemuDomainGetMonitor(vm), device= , true); + ret =3D qemuMonitorBlockJobCancel(qemuDomainGetMonitor(vm), device= ); if (qemuDomainObjExitMonitor(driver, vm) < 0) { ret =3D -1; goto endjob; @@ -16798,8 +16798,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorBlockJobSetSpeed(qemuDomainGetMonitor(vm), device, - speed, - true); + speed); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret =3D -1; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 272d525f1..492815b60 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -762,7 +762,7 @@ qemuMigrationCancelOneDriveMirror(virQEMUDriverPtr driv= er, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) goto cleanup; - rv =3D qemuMonitorBlockJobCancel(priv->mon, diskAlias, true); + rv =3D qemuMonitorBlockJobCancel(priv->mon, diskAlias); if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) goto cleanup; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 19082d8bf..69f14d028 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3475,43 +3475,39 @@ qemuMonitorBlockStream(qemuMonitorPtr mon, const char *device, const char *base, const char *backingName, - unsigned long long bandwidth, - bool modern) + unsigned long long bandwidth) { - VIR_DEBUG("device=3D%s, base=3D%s, backingName=3D%s, bandwidth=3D%lluB= , modern=3D%d", - device, NULLSTR(base), NULLSTR(backingName), bandwidth, mode= rn); + VIR_DEBUG("device=3D%s, base=3D%s, backingName=3D%s, bandwidth=3D%lluB= ", + device, NULLSTR(base), NULLSTR(backingName), bandwidth); QEMU_CHECK_MONITOR_JSON(mon); - return qemuMonitorJSONBlockStream(mon, device, base, backingName, - bandwidth, modern); + return qemuMonitorJSONBlockStream(mon, device, base, backingName, band= width); } int qemuMonitorBlockJobCancel(qemuMonitorPtr mon, - const char *device, - bool modern) + const char *device) { - VIR_DEBUG("device=3D%s, modern=3D%d", device, modern); + VIR_DEBUG("device=3D%s", device); QEMU_CHECK_MONITOR_JSON(mon); - return qemuMonitorJSONBlockJobCancel(mon, device, modern); + return qemuMonitorJSONBlockJobCancel(mon, device); } int qemuMonitorBlockJobSetSpeed(qemuMonitorPtr mon, const char *device, - unsigned long long bandwidth, - bool modern) + unsigned long long bandwidth) { - VIR_DEBUG("device=3D%s, bandwidth=3D%lluB, modern=3D%d", device, bandw= idth, modern); + VIR_DEBUG("device=3D%s, bandwidth=3D%lluB", device, bandwidth); QEMU_CHECK_MONITOR_JSON(mon); - return qemuMonitorJSONBlockJobSetSpeed(mon, device, bandwidth, modern); + return qemuMonitorJSONBlockJobSetSpeed(mon, device, bandwidth); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 9805a3390..6414d2483 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -896,19 +896,16 @@ int qemuMonitorBlockStream(qemuMonitorPtr mon, const char *device, const char *base, const char *backingName, - unsigned long long bandwidth, - bool modern) + unsigned long long bandwidth) ATTRIBUTE_NONNULL(2); int qemuMonitorBlockJobCancel(qemuMonitorPtr mon, - const char *device, - bool modern) + const char *device) ATTRIBUTE_NONNULL(2); int qemuMonitorBlockJobSetSpeed(qemuMonitorPtr mon, const char *device, - unsigned long long bandwidth, - bool modern); + unsigned long long bandwidth); typedef struct _qemuMonitorBlockJobInfo qemuMonitorBlockJobInfo; typedef qemuMonitorBlockJobInfo *qemuMonitorBlockJobInfoPtr; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index df5fb7c8f..0fc5d2122 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4474,13 +4474,12 @@ qemuMonitorJSONBlockStream(qemuMonitorPtr mon, const char *device, const char *base, const char *backingName, - unsigned long long speed, - bool modern) + unsigned long long speed) { int ret =3D -1; virJSONValuePtr cmd =3D NULL; virJSONValuePtr reply =3D NULL; - const char *cmd_name =3D modern ? "block-stream" : "block_stream"; + const char *cmd_name =3D "block-stream"; if (!(cmd =3D qemuMonitorJSONMakeCommand(cmd_name, "s:device", device, @@ -4507,13 +4506,12 @@ qemuMonitorJSONBlockStream(qemuMonitorPtr mon, int qemuMonitorJSONBlockJobCancel(qemuMonitorPtr mon, - const char *device, - bool modern) + const char *device) { int ret =3D -1; virJSONValuePtr cmd =3D NULL; virJSONValuePtr reply =3D NULL; - const char *cmd_name =3D modern ? "block-job-cancel" : "block_job_canc= el"; + const char *cmd_name =3D "block-job-cancel"; if (!(cmd =3D qemuMonitorJSONMakeCommand(cmd_name, "s:device", device, @@ -4538,17 +4536,16 @@ qemuMonitorJSONBlockJobCancel(qemuMonitorPtr mon, int qemuMonitorJSONBlockJobSetSpeed(qemuMonitorPtr mon, const char *device, - unsigned long long speed, - bool modern) + unsigned long long speed) { int ret =3D -1; virJSONValuePtr cmd; virJSONValuePtr reply =3D NULL; - const char *cmd_name =3D modern ? "block-job-set-speed" : "block_job_s= et_speed"; + const char *cmd_name =3D "block-job-set-speed"; if (!(cmd =3D qemuMonitorJSONMakeCommand(cmd_name, "s:device", device, - modern ? "J:speed" : "J:value",= speed, + "J:speed", speed, NULL))) return -1; diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 7462967b5..0cdfc5ead 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -300,19 +300,16 @@ int qemuMonitorJSONBlockStream(qemuMonitorPtr mon, const char *device, const char *base, const char *backingName, - unsigned long long speed, - bool modern) + unsigned long long speed) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int qemuMonitorJSONBlockJobCancel(qemuMonitorPtr mon, - const char *device, - bool modern) + const char *device) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int qemuMonitorJSONBlockJobSetSpeed(qemuMonitorPtr mon, const char *device, - unsigned long long speed, - bool modern) + unsigned long long speed) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); virHashTablePtr qemuMonitorJSONGetAllBlockJobInfo(qemuMonitorPtr mon) --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list