[Xen-changelog] [xen-unstable] xen: arm: do not pass a machine ID to dom0

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1360935128 0
# Node ID 6faadc52a04628c44d54d6886f13a04211022827
# Parent  1761a53cb7468fbd3fc5f928ef4ad17e2df2dc1e
xen: arm: do not pass a machine ID to dom0

Xen relies on DTB and we pass in a suitable device-tree so we don't
need to (and shouldn't) pretend to be a Versatile Express here.

We already don't pass a machine ID to domU in the same way.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 1761a53cb746 -r 6faadc52a046 xen/arch/arm/domain_build.c
--- a/xen/arch/arm/domain_build.c       Fri Feb 15 13:32:08 2013 +0000
+++ b/xen/arch/arm/domain_build.c       Fri Feb 15 13:32:08 2013 +0000
@@ -349,7 +349,7 @@ int construct_dom0(struct domain *d)
  */
 
     regs->r0 = 0; /* SBZ */
-    regs->r1 = 2272; /* Machine NR: Versatile Express */
+    regs->r1 = 0xffffffff; /* We use DTB therefore no machine id */
     regs->r2 = kinfo.dtb_paddr;
 
     WRITE_CP32(SCTLR_BASE, SCTLR);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog