[Xen-changelog] Merge bk://xen.bkbits.net/xeno-unstable.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1275, 2005/04/05 09:27:02-07:00, xen-ia64.adm@xxxxxxxxxx

        Merge bk://xen.bkbits.net/xeno-unstable.bk
        into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk



 arch/ia64/domain.c  |   12 +-----------
 include/xen/sched.h |   10 ++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)


diff -Nru a/xen/arch/ia64/domain.c b/xen/arch/ia64/domain.c
--- a/xen/arch/ia64/domain.c    2005-04-06 09:03:28 -04:00
+++ b/xen/arch/ia64/domain.c    2005-04-06 09:03:28 -04:00
@@ -139,16 +139,6 @@
        continue_cpu_idle_loop();
 }
 
-struct domain *arch_alloc_domain_struct(void)
-{
-       return xmalloc(struct domain);
-}
-
-void arch_free_domain_struct(struct domain *d)
-{
-       xfree(d);
-}
-
 struct exec_domain *arch_alloc_exec_domain_struct(void)
 {
        /* Per-vp stack is used here. So we need keep exec_domain
@@ -221,7 +211,7 @@
        return 1;
 }
 
-void domain_relinquish_memory(struct domain *d)
+void domain_relinquish_resources(struct domain *d)
 {
        dummy();
 }
diff -Nru a/xen/include/xen/sched.h b/xen/include/xen/sched.h
--- a/xen/include/xen/sched.h   2005-04-06 09:03:28 -04:00
+++ b/xen/include/xen/sched.h   2005-04-06 09:03:28 -04:00
@@ -104,6 +104,7 @@
     struct list_head xenpage_list;    /* linked list, of size xenheap_pages */
     unsigned int     tot_pages;       /* number of pages currently possesed */
     unsigned int     max_pages;       /* maximum value for tot_pages        */
+    unsigned int     next_io_page;    /* next io pfn to give to domain      */
     unsigned int     xenheap_pages;   /* # pages allocated from Xen heap    */
 
     /* Scheduling. */
@@ -147,10 +148,19 @@
 
 struct domain_setup_info
 {
+    /* Initialised by caller. */
+    unsigned long image_addr;
+    unsigned long image_len;
+    /* Initialised by loader: Public. */
     unsigned long v_start;
+    unsigned long v_end;
     unsigned long v_kernstart;
     unsigned long v_kernend;
     unsigned long v_kernentry;
+    /* Initialised by loader: Private. */
+    unsigned int  load_symtab;
+    unsigned long symtab_addr;
+    unsigned long symtab_len;
 };
 
 #include <asm/uaccess.h> /* for KERNEL_DS */

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