Re: [Xen-devel] [PATCH] xen: don't compile pv-specific parts if XEN_PV isn't configured

[Tycho Andersen <tycho@xxxxxxxxxx>]

Hi Juergen,

On Thu, Sep 14, 2017 at 02:38:58PM +0200, Juergen Gross wrote:
> xenbus_client.c contains some functions specific for pv guests.
> Enclose them with #ifdef CONFIG_XEN_PV to avoid compiling them when
> they are not needed (e.g. on ARM).
> 
> Signed-off-by: Juergen Gross <jgross@xxxxxxxx>

Thanks for this! I think we also need to drop the old definition,
something like the below. Can you fold this in or should I send it
separately?

Cheers,

Tycho

From 410a0c15c354f1ba387bdac6837d0a2031744c56 Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho@xxxxxxxxxx>
Date: Thu, 14 Sep 2017 08:57:30 -0700
Subject: [PATCH] xen, arm64: drop dummy lookup_address()

This is unused, and conflicts with the definition that we'll add for XPFO.

Signed-off-by: Tycho Andersen <tycho@xxxxxxxxxx>
---
 include/xen/arm/page.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/include/xen/arm/page.h b/include/xen/arm/page.h
index 415dbc6e43fd..6adc2a955340 100644
--- a/include/xen/arm/page.h
+++ b/include/xen/arm/page.h
@@ -84,16 +84,6 @@ static inline xmaddr_t arbitrary_virt_to_machine(void *vaddr)
        BUG();
 }
 
-/* TODO: this shouldn't be here but it is because the frontend drivers
- * are using it (its rolled in headers) even though we won't hit the code path.
- * So for right now just punt with this.
- */
-static inline pte_t *lookup_address(unsigned long address, unsigned int *level)
-{
-       BUG();
-       return NULL;
-}
-
 extern int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,
                                   struct gnttab_map_grant_ref *kmap_ops,
                                   struct page **pages, unsigned int count);
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel