From nobody Thu May 15 13:24:57 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 1508326179915912.2560114086908; Wed, 18 Oct 2017 04:29:39 -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 AA11213AAE; Wed, 18 Oct 2017 11:29:38 +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 8B5A56D814; Wed, 18 Oct 2017 11:29: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 536FB180BACC; Wed, 18 Oct 2017 11:29:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9IBTWHh018781 for ; Wed, 18 Oct 2017 07:29:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8BF936D805; Wed, 18 Oct 2017 11:29:32 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.105]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3AFC06D815 for ; Wed, 18 Oct 2017 11:29:29 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id AA7251020BD; Wed, 18 Oct 2017 13:29:28 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AA11213AAE 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: Jiri Denemark To: libvir-list@redhat.com Date: Wed, 18 Oct 2017 13:29:25 +0200 Message-Id: <6e1cf2108058ae310be1d98d0236c6ff751bf7b1.1508325942.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/5] qemu: Drop qemuMonitorGetMigrationCapability 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.29]); Wed, 18 Oct 2017 11:29:39 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The only remaining user of qemuMonitorGetMigrationCapability is our test suite. Let's replace qemuMonitorGetMigrationCapability with qemuMonitorGetMigrationCapabilities there and drop the unused function. Signed-off-by: Jiri Denemark Reviewed-by: John Ferlan --- src/qemu/qemu_monitor.c | 19 ------------------- src/qemu/qemu_monitor.h | 2 -- src/qemu/qemu_monitor_json.c | 18 ------------------ src/qemu/qemu_monitor_json.h | 2 -- tests/qemumonitorjsontest.c | 16 ++++++++++------ 5 files changed, 10 insertions(+), 47 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 8ffce5a35d..55b123e5f5 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3938,25 +3938,6 @@ qemuMonitorGetMigrationCapabilities(qemuMonitorPtr m= on, } =20 =20 -/** - * Returns 1 if @capability is supported, 0 if it's not, or -1 on error. - */ -int -qemuMonitorGetMigrationCapability(qemuMonitorPtr mon, - qemuMonitorMigrationCaps capability) -{ - VIR_DEBUG("capability=3D%d", capability); - - QEMU_CHECK_MONITOR(mon); - - /* No capability is supported without JSON monitor */ - if (!mon->json) - return 0; - - return qemuMonitorJSONGetMigrationCapability(mon, capability); -} - - int qemuMonitorSetMigrationCapability(qemuMonitorPtr mon, qemuMonitorMigrationCaps capability, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 57893c61c6..0365b0f397 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -714,8 +714,6 @@ VIR_ENUM_DECL(qemuMonitorMigrationCaps); =20 int qemuMonitorGetMigrationCapabilities(qemuMonitorPtr mon, char ***capabilities); -int qemuMonitorGetMigrationCapability(qemuMonitorPtr mon, - qemuMonitorMigrationCaps capability); int qemuMonitorSetMigrationCapability(qemuMonitorPtr mon, qemuMonitorMigrationCaps capability, bool state); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 663fce3c3c..f7567eb771 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6068,24 +6068,6 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorP= tr mon, } =20 =20 -int -qemuMonitorJSONGetMigrationCapability(qemuMonitorPtr mon, - qemuMonitorMigrationCaps capability) -{ - int ret; - char **capsList =3D NULL; - const char *cap =3D qemuMonitorMigrationCapsTypeToString(capability); - - if (qemuMonitorJSONGetMigrationCapabilities(mon, &capsList) < 0) - return -1; - - ret =3D virStringListHasString((const char **) capsList, cap); - - virStringListFree(capsList); - return ret; -} - - int qemuMonitorJSONSetMigrationCapability(qemuMonitorPtr mon, qemuMonitorMigrationCaps capability, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 7c45be6725..b17348a119 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -146,8 +146,6 @@ int qemuMonitorJSONGetMigrationStats(qemuMonitorPtr mon, =20 int qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, char ***capabilities); -int qemuMonitorJSONGetMigrationCapability(qemuMonitorPtr mon, - qemuMonitorMigrationCaps capabil= ity); int qemuMonitorJSONSetMigrationCapability(qemuMonitorPtr mon, qemuMonitorMigrationCaps capabil= ity, bool state); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 475fd270e1..4d3b738e52 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2214,7 +2214,8 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabil= ity(const void *data) virDomainXMLOptionPtr xmlopt =3D (virDomainXMLOptionPtr)data; qemuMonitorTestPtr test =3D qemuMonitorTestNewSimple(true, xmlopt); int ret =3D -1; - int cap; + const char *cap; + char **caps =3D NULL; const char *reply =3D "{" " \"return\": [" @@ -2234,12 +2235,14 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapab= ility(const void *data) "{\"return\":{}}") < 0) goto cleanup; =20 - cap =3D qemuMonitorJSONGetMigrationCapability(qemuMonitorTestGetMonito= r(test), - QEMU_MONITOR_MIGRATION_CAPS_= XBZRLE); - if (cap !=3D 1) { + if (qemuMonitorGetMigrationCapabilities(qemuMonitorTestGetMonitor(test= ), + &caps) < 0) + goto cleanup; + + cap =3D qemuMonitorMigrationCapsTypeToString(QEMU_MONITOR_MIGRATION_CA= PS_XBZRLE); + if (!virStringListHasString((const char **) caps, cap)) { virReportError(VIR_ERR_INTERNAL_ERROR, - "Unexpected capability: %d, expecting 1", - cap); + "Expected capability %s is missing", cap); goto cleanup; } =20 @@ -2251,6 +2254,7 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabil= ity(const void *data) ret =3D 0; cleanup: qemuMonitorTestFree(test); + virStringListFree(caps); return ret; } =20 --=20 2.14.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list