From nobody Sat Apr 27 16:18:47 2024 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 1505242226703237.93309831317436; Tue, 12 Sep 2017 11:50:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2ECD6267F6; Tue, 12 Sep 2017 18:50:23 +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 AE19860BEC; Tue, 12 Sep 2017 18:50:22 +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 7A7E4180610F; Tue, 12 Sep 2017 18:50:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v8CIe1IV017036 for ; Tue, 12 Sep 2017 14:40:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 452FD60461; Tue, 12 Sep 2017 18:40:01 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-114.phx2.redhat.com [10.3.117.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BA23600CD for ; Tue, 12 Sep 2017 18:39:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2ECD6267F6 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: John Ferlan To: libvir-list@redhat.com Date: Tue, 12 Sep 2017 14:39:58 -0400 Message-Id: <20170912183958.12676-1-jferlan@redhat.com> In-Reply-To: <20170901170955.20281-7-jferlan@redhat.com> References: <20170901170955.20281-1-jferlan@redhat.com>, <20170901170955.20281-7-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v7 06.5/11] merge with previous... 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 12 Sep 2017 18:50:23 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch would be merged with the existing 06/11 patch for the following changes: 1. Use qemuBlockStorageSourceBuildJSONSocketAddress to build a single server address 2. Alter the output file to remove the server index "0." values 3. Alter the commit message appropriately as well. NB: If it's really desired I could resend the series, but I do ask that someone else officially ACK's patch 1 since it's so large. I believe it has to be moderated in... Although I could take Ashish's 1-6 testing as as "good enough". Thanks - John --- src/qemu/qemu_block.c | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index a1867aa8f..ca6e213b4 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -529,7 +529,7 @@ qemuBlockStorageSourceGetVxHSProps(virStorageSourcePtr = src) return NULL; } =20 - if (!(server =3D qemuBlockStorageSourceBuildHostsJSONSocketAddress(src= , true))) + if (!(server =3D qemuBlockStorageSourceBuildJSONSocketAddress(src->hos= ts, true))) return NULL; =20 /* VxHS disk specification example: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.ar= gs b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args index 86da1af47..b62ace3de 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args @@ -21,7 +21,7 @@ server,nowait \ -boot c \ -usb \ -drive file.driver=3Dvxhs,file.vdisk-id=3Deb90327c-8302-4725-9e1b-4e85ed4d= c251,\ -file.server.0.type=3Dtcp,file.server.0.host=3D192.168.0.1,file.server.0.po= rt=3D9999,\ +file.server.type=3Dtcp,file.server.host=3D192.168.0.1,file.server.port=3D9= 999,\ format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0,cache=3Dnone \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk0,\ id=3Dvirtio-disk0 --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list