From nobody Fri May 16 12:09:27 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.zoho.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 1497627013134112.2735350635046; Fri, 16 Jun 2017 08:30:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0B43E1C13CB; Fri, 16 Jun 2017 15:30:11 +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 CF62A91285; Fri, 16 Jun 2017 15:30:10 +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 7868D180BAFD; Fri, 16 Jun 2017 15:30:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5GFTrTv013476 for ; Fri, 16 Jun 2017 11:29:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1A35C7D4AB; Fri, 16 Jun 2017 15:29:53 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E4AB1714F; Fri, 16 Jun 2017 15:29:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0B43E1C13CB 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=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0B43E1C13CB From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 16 Jun 2017 17:29:40 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 03/10] util: storage: make virStorageSourceParseBackingJSONGlusterHost universal 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 16 Jun 2017 15:30:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The same json strucutre is used for NBD and sheepdog volumes for specifying of the host. Rename the function and fix up error messages to be more universal. --- src/util/virstoragefile.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 6b0af521f..92bc561a2 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2795,8 +2795,8 @@ virStorageSourceParseBackingJSONUri(virStorageSourceP= tr src, static int -virStorageSourceParseBackingJSONGlusterHost(virStorageNetHostDefPtr host, - virJSONValuePtr json) +virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host, + virJSONValuePtr json) { const char *type =3D virJSONValueObjectGetString(json, "type"); const char *hostname =3D virJSONValueObjectGetString(json, "host"); @@ -2817,7 +2817,7 @@ virStorageSourceParseBackingJSONGlusterHost(virStorag= eNetHostDefPtr host, if (!hostname) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("missing hostname for tcp backing server in " - "JSON backing definition for gluster volume")= ); + "JSON backing volume definition")); return -1; } @@ -2830,7 +2830,7 @@ virStorageSourceParseBackingJSONGlusterHost(virStorag= eNetHostDefPtr host, if (!socket) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("missing socket path for udp backing server i= n " - "JSON backing definition for gluster volume")= ); + "JSON backing volume definition")); return -1; } @@ -2897,8 +2897,8 @@ virStorageSourceParseBackingJSONGluster(virStorageSou= rcePtr src, src->nhosts =3D nservers; for (i =3D 0; i < nservers; i++) { - if (virStorageSourceParseBackingJSONGlusterHost(src->hosts + i, - virJSONValueArrayG= et(server, i)) < 0) + if (virStorageSourceParseBackingJSONSocketAddress(src->hosts + i, + virJSONValueArra= yGet(server, i)) < 0) return -1; } --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list