xen/arm: Remove devices used by Xen from dom0 device tree

Devices used by Xen should not be pass-through to dom0. If the device is really
usefull for dom0 (for instance the timer and the GIC), it will recreate the
node.

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 300a64da49c092fad863e0c03f8a2f3df7bf80ad..82003c19fe7b85eafcd6c19d3a600948f05fb712 100644 (file)
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -677,7 +677,8 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
 
     /* Skip theses nodes and the sub-nodes */
     if ( dt_match_node(skip_matches, np ) ||
-         platform_device_is_blacklisted(np) )
+         platform_device_is_blacklisted(np) ||
+         dt_device_used_by(np) == DOMID_XEN )
     {
         DPRINT("  Skip it!\n");
         return 0;
@@ -685,15 +686,13 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
 
     /*
      * Some device doesn't need to be mapped in Xen:
-     *  - Device used by Xen: Obviously dom0 can't use them
      *  - Memory: the guest will see a different view of memory. It will
      *  be allocated later.
      *  - Disabled device: Linux is able to cope with status="disabled"
      *  property. Therefore these device doesn't need to be mapped. This
      *  solution can be use later for pass through.
      */
-    if ( dt_device_used_by(np) != DOMID_XEN &&
-         !dt_device_type_is_equal(np, "memory") &&
+    if ( !dt_device_type_is_equal(np, "memory") &&
          dt_device_is_available(np) )
     {
         res = map_device(d, np);