From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH] libxc: remove most of
 tools/libxc/xc_dom_compat_linux.c
Date: Thu, 22 Oct 2015 16:38:07 +0100
Message-ID: <1445528287.2374.15.camel@citrix.com>
References: <1444131327-22000-1-git-send-email-jgross@suse.com>
	<5613C400.4040209@citrix.com>
	<20151006125858.GB29124@zion.uk.xensource.com>
	<5613C773.5030901@citrix.com>	<1444137461.5302.167.camel@citrix.com>
	<5624C7C3.2030007@suse.com>
	<22056.65314.301337.452773@mariner.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <22056.65314.301337.452773@mariner.uk.xensource.com>
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: Ian Jackson <Ian.Jackson@eu.citrix.com>, Juergen Gross <jgross@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>, xen-devel@lists.xen.org, Wei Liu <wei.liu2@citrix.com>, stefano.stabellini@eu.citrix.com
List-Id: xen-devel@lists.xenproject.org

On Thu, 2015-10-22 at 16:22 +0100, Ian Jackson wrote:
> Juergen Gross writes ("Re: [Xen-devel] [PATCH] libxc: remove most of
> tools/libxc/xc_dom_compat_linux.c"):
> > On 10/06/2015 03:17 PM, Ian Campbell wrote:
> > > xc_dom_linux_build is implemented in terms of the non-compat xc_dom_*
> > > functions, so it should be possible to do what you want with out
> > > using the
> > > compat wrapper.
> > > 
> > > If there is some obscure reason this isn't the case then we should
> > > fix
> > > that, not carry around the compat options for ever as a workaround
> > > (fixes
> > > include but are not limited to promoting xc_dom_linux_build into a
> > > non
> > > -compat helper).
> 
> I agree with this approach.
> 
> > Any further comments?
> > 
> > Andrew, are you okay with Ian's statement?
> > 
> > Ian, does this mean you are Ack-ing the patch?
> 
> Accordingly, in the absence of renewed objections, or alternative
> proposals, the original patch is:
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

There was a conflict with "libxc: unify xc_dom_p2m_{host/guest}", where
xc_dom_p2m_host became xc_dom_p2m. I tried to resolve in what I thought was
the obvious way, but then I got many instances of:

    In file included from libxl.c:19:0:
    libxl_internal.h:1612:43: error: 'struct xc_dom_image' declared inside parameter list [-Werror]
                                        struct xc_dom_image *dom);
                                               ^
    libxl_internal.h:1612:43: error: its scope is only this definition or declaration, which is probably not what you want [-Werror]

Not sure if the original patch was wrong, has bit-rotted, or I messed up
the conflict resolution. This happens on all arches.

Actually, looking back at it, the added "struct xc_dom_image" in
libxl_arch.h is surely wrong, the right answer would be to include xc_dom.h
somewhere appropriate it might be tolerable to just leave it in xenguest.h.

Juergen, please investigate the build failure, fix the above and resubmit.

Ian.