From nobody Wed May 14 09:38:39 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1524651654400399.1033052262525; Wed, 25 Apr 2018 03:20:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BCEC21109; Wed, 25 Apr 2018 10:20:52 +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 7E1341BCE5; Wed, 25 Apr 2018 10:20:52 +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 24CF74CAA1; Wed, 25 Apr 2018 10:20:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3PAKZGT004945 for ; Wed, 25 Apr 2018 06:20:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4D8E0215CDC8; Wed, 25 Apr 2018 10:20:35 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5BD32166BC6 for ; Wed, 25 Apr 2018 10:20:34 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Wed, 25 Apr 2018 12:20:19 +0200 Message-Id: <20180425102030.31145-5-kkoukiou@redhat.com> In-Reply-To: <20180425102030.31145-1-kkoukiou@redhat.com> References: <20180425102030.31145-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 04/15] Implement GetBlockJobInfo method for Domain Interface 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.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 25 Apr 2018 10:20:53 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- data/org.libvirt.Domain.xml | 7 +++++++ src/domain.c | 47 +++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 54 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 6f80cc7..c640bcb 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -178,6 +178,13 @@ + + + + + + diff --git a/src/domain.c b/src/domain.c index b4bdd34..75d29c4 100644 --- a/src/domain.c +++ b/src/domain.c @@ -3,6 +3,15 @@ =20 #include =20 +VIRT_DBUS_ENUM_DECL(virtDBusDomainBlockJob) +VIRT_DBUS_ENUM_IMPL(virtDBusDomainBlockJob, + VIR_DOMAIN_BLOCK_JOB_TYPE_LAST, + "unknown", + "pull", + "copy", + "commit", + "active-commit") + VIRT_DBUS_ENUM_DECL(virtDBusDomainControlErrorReason) VIRT_DBUS_ENUM_IMPL(virtDBusDomainControlErrorReason, VIR_DOMAIN_CONTROL_ERROR_REASON_LAST, @@ -905,6 +914,43 @@ virtDBusDomainGetBlockIoTune(GVariant *inArgs, *outArgs =3D g_variant_new_tuple(&grecords, 1); } =20 +static void +virtDBusDomainGetBlockJobInfo(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virDomain) domain =3D NULL; + virDomainBlockJobInfo info; + const gchar *disk; + guint flags; + const gchar *blockJobTypeStr; + + g_variant_get(inArgs, "(&su)", &disk, &flags); + + domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainGetBlockJobInfo(domain, disk, &info, flags) < 0) + return virtDBusUtilSetLastVirtError(error); + + blockJobTypeStr =3D virtDBusDomainBlockJobTypeToString(info.type); + if (!blockJobTypeStr) { + g_set_error(error, VIRT_DBUS_ERROR, VIRT_DBUS_ERROR_LIBVIRT, + "Can't format virDomainBlockJobType '%d' to string.", + info.type); + return; + } + + *outArgs =3D g_variant_new("((sttt))", blockJobTypeStr, info.bandwidth, + info.cur, info.end); +} + static void virtDBusDomainGetControlInfo(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2026,6 +2072,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodT= able[] =3D { { "FSTrim", virtDBusDomainFSTrim }, { "GetBlkioParameters", virtDBusDomainGetBlkioParameters }, { "GetBlockIoTune", virtDBusDomainGetBlockIoTune }, + { "GetBlockJobInfo", virtDBusDomainGetBlockJobInfo }, { "GetControlInfo", virtDBusDomainGetControlInfo }, { "GetJobInfo", virtDBusDomainGetJobInfo }, { "GetMemoryParameters", virtDBusDomainGetMemoryParameters }, --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list