From nobody Thu May 15 09:57:21 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 1509719542973773.0180791444407; Fri, 3 Nov 2017 07:32:22 -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 53CB385A02; Fri, 3 Nov 2017 14:32:21 +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 E57E05C899; Fri, 3 Nov 2017 14:32:20 +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 A908F1800BD3; Fri, 3 Nov 2017 14:32:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vA3ETvm5028766 for ; Fri, 3 Nov 2017 10:29:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id A8B7260636; Fri, 3 Nov 2017 14:29:57 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EAD660633 for ; Fri, 3 Nov 2017 14:29:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 53CB385A02 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 3 Nov 2017 15:29:25 +0100 Message-Id: <23e63c1cd2703f2ed0d2726429be61bb5d52740f.1509719227.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/12] qemu: block: Add JSON props generator for RBD storage backing 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.26]); Fri, 03 Nov 2017 14:32:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" --- src/qemu/qemu_block.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 74 insertions(+) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 451d04694..8a1ce8262 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -593,6 +593,47 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virSt= orageNetHostDefPtr host) } +/** + * qemuBlockStorageSourceBuildHostsJSONInetSocketAddress: + * @src: disk storage source + * + * Formats src->hosts into a json object conforming to the 'InetSocketAddr= ess' + * type in qemu. + */ +static virJSONValuePtr +qemuBlockStorageSourceBuildHostsJSONInetSocketAddress(virStorageSourcePtr = src) +{ + virJSONValuePtr servers =3D NULL; + virJSONValuePtr server =3D NULL; + virJSONValuePtr ret =3D NULL; + virStorageNetHostDefPtr host; + size_t i; + + if (!(servers =3D virJSONValueNewArray())) + goto cleanup; + + for (i =3D 0; i < src->nhosts; i++) { + host =3D src->hosts + i; + + if (!(server =3D qemuBlockStorageSourceBuildJSONInetSocketAddress(= host))) + goto cleanup; + + if (virJSONValueArrayAppend(servers, server) < 0) + goto cleanup; + + server =3D NULL; + } + + VIR_STEAL_PTR(ret, servers); + + cleanup: + virJSONValueFree(servers); + virJSONValueFree(server); + + return ret; +} + + static virJSONValuePtr qemuBlockStorageSourceGetGlusterProps(virStorageSourcePtr src) { @@ -795,6 +836,35 @@ qemuBlockStorageSourceGetNBDProps(virStorageSourcePtr = src) } +static virJSONValuePtr +qemuBlockStorageSourceGetRBDProps(virStorageSourcePtr src) +{ + qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOUR= CE_PRIVATE(src); + virJSONValuePtr servers =3D NULL; + virJSONValuePtr ret =3D NULL; + const char *username =3D NULL; + + if (src->nhosts > 0 && + !(servers =3D qemuBlockStorageSourceBuildHostsJSONInetSocketAddres= s(src))) + return NULL; + + if (src->auth) + username =3D srcPriv->secinfo->s.aes.username; + + ignore_value(virJSONValueObjectCreate(&ret, + "s:driver", "rbd", + "s:pool", src->volume, + "s:image", src->path, + "S:snapshot", src->snapshot, + "S:conf", src->configFile, + "A:server", servers, + "S:user", username, + NULL)); + + return ret; +} + + /** * qemuBlockStorageSourceGetBackendProps: * @src: disk source @@ -855,6 +925,10 @@ qemuBlockStorageSourceGetBackendProps(virStorageSource= Ptr src) break; case VIR_STORAGE_NET_PROTOCOL_RBD: + if (!(fileprops =3D qemuBlockStorageSourceGetRBDProps(src))) + return NULL; + break; + case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_NONE: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list