From mboxrd@z Thu Jan  1 00:00:00 1970
From: Olaf Hering <olaf@aepfle.de>
Subject: Re: [PATCH v7 3/5] libxl: add support for vscsi
Date: Fri, 5 Feb 2016 11:26:12 +0100
Message-ID: <20160205102612.GA24678@aepfle.de>
References: <1454667175-24282-1-git-send-email-olaf@aepfle.de>
	<1454667175-24282-4-git-send-email-olaf@aepfle.de>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Content-Disposition: inline
In-Reply-To: <1454667175-24282-4-git-send-email-olaf@aepfle.de>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>, Ian Jackson <ian.jackson@eu.citrix.com>, Ian Campbell <ian.campbell@citrix.com>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

On Fri, Feb 05, Olaf Hering wrote:

> @@ -6799,6 +7375,8 @@ int libxl_retrieve_domain_configuration(libxl_ctx *ctx, uint32_t domid,
>  
>      MERGE(nic, nics, COMPARE_DEVID, {});
>  
> +    MERGE(vscsictrl, vscsictrls, COMPARE_VSCSI, {});

I think the actual "merge" should be like this, to copy the data
gathered from xenstore into the d_config which was built from JSON.
{
libxl_device_vscsictrl_dispose(dst);
libxl_device_vscsictrl_copy(CTX, dst, src);
}

Olaf