From mboxrd@z Thu Jan  1 00:00:00 1970
From: George Dunlap <george.dunlap@citrix.com>
Subject: Re: [PATCH 02/10] x86/mm: override stored file names
 for multiply built sources
Date: Tue, 20 Oct 2015 11:43:13 +0100
Message-ID: <56261AC1.6090406@citrix.com>
References: <5626340902000078000ACB1F@prv-mh.provo.novell.com>
	<562635FC02000078000ACB35@prv-mh.provo.novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta14.messagelabs.com ([193.109.254.103])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=7285ab901=George.Dunlap@citrix.com>)
	id 1ZoUNz-0001Em-78
	for xen-devel@lists.xenproject.org; Tue, 20 Oct 2015 10:43:19 +0000
In-Reply-To: <562635FC02000078000ACB35@prv-mh.provo.novell.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: Jan Beulich <JBeulich@suse.com>, xen-devel <xen-devel@lists.xenproject.org>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>, Andrew Cooper <andrew.cooper3@citrix.com>, Keir Fraser <keir@xen.org>, Tim Deegan <tim@xen.org>
List-Id: xen-devel@lists.xenproject.org

On 20/10/15 11:39, Jan Beulich wrote:
> To make it possible to tell apart the static symbols therein, use their
> object file names instead of their source ones.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

I have no idea if the runes are correct, but the idea sounds great:

Acked-by: George Dunlap <george.dunlap@citrix.com>

> 
> --- a/xen/arch/x86/mm/guest_walk.c
> +++ b/xen/arch/x86/mm/guest_walk.c
> @@ -29,6 +29,8 @@
>  #include <asm/page.h>
>  #include <asm/guest_pt.h>
>  
> +/* Allow uniquely identifying static symbols in the 3 generated objects. */
> +asm(".file \"guest_walk_" __stringify(GUEST_PAGING_LEVELS) ".o\"");
>  
>  /* Flags that are needed in a pagetable entry, with the sense of NX inverted */
>  static uint32_t mandatory_flags(struct vcpu *v, uint32_t pfec) 
> --- a/xen/arch/x86/mm/hap/guest_walk.c
> +++ b/xen/arch/x86/mm/hap/guest_walk.c
> @@ -38,6 +38,9 @@
>  #include <asm/guest_pt.h>
>  #include <asm/p2m.h>
>  
> +/* Allow uniquely identifying static symbols in the 3 generated objects. */
> +asm(".file \"guest_walk_" __stringify(GUEST_PAGING_LEVELS) "level.o\"");
> +
>  unsigned long hap_gva_to_gfn(GUEST_PAGING_LEVELS)(
>      struct vcpu *v, struct p2m_domain *p2m, unsigned long gva, uint32_t *pfec)
>  {
> --- a/xen/arch/x86/mm/shadow/multi.c
> +++ b/xen/arch/x86/mm/shadow/multi.c
> @@ -41,6 +41,9 @@
>  #include "private.h"
>  #include "types.h"
>  
> +/* Allow uniquely identifying static symbols in the 3 generated objects. */
> +asm(".file \"guest_" __stringify(GUEST_PAGING_LEVELS) ".o\"");
> +
>  /* THINGS TO DO LATER:
>   *
>   * TEARDOWN HEURISTICS
> 
> 
>