diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-24 09:28:11 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-24 09:28:11 +0000 |
| commit | c2533bd68dbc7f00ec0d8ba5eb0bee57dfc2ebeb (patch) | |
| tree | 7df92171737e5d1a56139035174ef846719f4fbd | |
| parent | b8cb514f93ee4a77c86514831e84b0d0f9cc299f (diff) | |
| download | xen-c2533bd68dbc7f00ec0d8ba5eb0bee57dfc2ebeb.tar.gz xen-c2533bd68dbc7f00ec0d8ba5eb0bee57dfc2ebeb.tar.bz2 xen-c2533bd68dbc7f00ec0d8ba5eb0bee57dfc2ebeb.zip | |
bitkeeper revision 1.1748.1.2 (42bbd22bGsDJd8zBp_EBCg97pPrPqA)
With the patch attached, we can bring up x86_64 domU to the point where
it tries to mount the root fs (see the log below). We are looking at
problems around blkif_connect at this point.
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Xin B Li <xin.b.li@intel.com>
| -rw-r--r-- | linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S | 2 | ||||
| -rw-r--r-- | tools/libxc/xc_linux_build.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S index 8a9caf951a..d7000838d8 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S @@ -16,7 +16,7 @@ #include <linux/linkage.h> .section __xen_guest - .ascii "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xffffffff80100000" + .ascii "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xffffffff80000000" .ascii ",LOADER=generic" /* .ascii ",PT_MODE_WRITABLE" */ .byte 0 diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c index 3692dbd5e5..dc92fff3f6 100644 --- a/tools/libxc/xc_linux_build.c +++ b/tools/libxc/xc_linux_build.c @@ -81,8 +81,8 @@ static int setup_guest(int xc_handle, int rc; unsigned long nr_pt_pages; - unsigned long ppt_alloc; - unsigned long *physmap, *physmap_e, physmap_pfn; + unsigned long ppt_alloc, physmap_pfn; + u32 *physmap, *physmap_e; struct load_funcs load_funcs; struct domain_setup_info dsi; |