[Xen-changelog] Merge 2.0-testing change:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1439, 2005/04/02 22:35:56+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        Merge 2.0-testing change:
          From: YAMAMOTO Takashi <yamt@xxxxxxxxxxxxxxxxx>
          Add support to domain0 builder to load a (Net)BSD symtab for domain0.
        
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 domain_build.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)


diff -Nru a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c       2005-04-03 05:03:40 -04:00
+++ b/xen/arch/x86/domain_build.c       2005-04-03 05:03:40 -04:00
@@ -129,6 +129,9 @@
     if ( rc != 0 )
         return rc;
 
+    if (dsi.load_bsd_symtab)
+        loadelfsymtab(image_start, 0, &dsi);
+
     /* Align load address to 4MB boundary. */
     dsi.v_start &= ~((1UL<<22)-1);
 
@@ -139,7 +142,7 @@
      * read-only). We have a pair of simultaneous equations in two unknowns, 
      * which we solve by exhaustive search.
      */
-    vinitrd_start    = round_pgup(dsi.v_kernend);
+    vinitrd_start    = round_pgup(dsi.v_end);
     vinitrd_end      = vinitrd_start + initrd_len;
     vphysmap_start   = round_pgup(vinitrd_end);
     vphysmap_end     = vphysmap_start + (nr_pages * sizeof(u32));
@@ -422,6 +425,10 @@
 
     /* Copy the OS image and free temporary buffer. */
     (void)loadelfimage(image_start);
+
+    if (dsi.load_bsd_symtab)
+        loadelfsymtab(image_start, 1, &dsi);
+
     init_domheap_pages(
         _image_start, (_image_start+image_len+PAGE_SIZE-1) & PAGE_MASK);
 

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