ia64/xen-unstable

changeset 3281:eb8866af6c4b

bitkeeper revision 1.1159.1.478 (41bf2310-KrE0bKwjD6bmOJbDtrm4A)

sync w/ head.
author cl349@arcadians.cl.cam.ac.uk
date Tue Dec 14 17:29:52 2004 +0000 (2004-12-14)
parents dda5ab69e74a
children a5b20d4d45b1
files xen/arch/x86/domain.c xen/include/asm-x86/processor.h
line diff
     1.1 --- a/xen/arch/x86/domain.c	Tue Dec 14 17:20:18 2004 +0000
     1.2 +++ b/xen/arch/x86/domain.c	Tue Dec 14 17:29:52 2004 +0000
     1.3 @@ -197,29 +197,30 @@ void free_perdomain_pt(struct domain *d)
     1.4      free_xenheap_page((unsigned long)d->mm_perdomain_pt);
     1.5  }
     1.6  
     1.7 -static void continue_idle_task(struct domain *d)
     1.8 +static void continue_idle_task(struct exec_domain *ed)
     1.9  {
    1.10      reset_stack_and_jump(idle_loop);
    1.11  }
    1.12  
    1.13 -static void continue_nonidle_task(struct domain *d)
    1.14 +static void continue_nonidle_task(struct exec_domain *ed)
    1.15  {
    1.16      reset_stack_and_jump(ret_from_intr);
    1.17  }
    1.18  
    1.19 +void arch_do_createdomain(struct exec_domain *ed)
    1.20  {
    1.21      struct domain *d = ed->domain;
    1.22  #ifdef ARCH_HAS_FAST_TRAP
    1.23 -    SET_DEFAULT_FAST_TRAP(&d->thread);
    1.24 +    SET_DEFAULT_FAST_TRAP(&ed->thread);
    1.25  #endif
    1.26  
    1.27      if ( d->id == IDLE_DOMAIN_ID )
    1.28      {
    1.29 -        d->thread.schedule_tail = continue_idle_task;
    1.30 +        ed->thread.schedule_tail = continue_idle_task;
    1.31      }
    1.32      else
    1.33      {
    1.34 -        d->thread.schedule_tail = continue_nonidle_task;
    1.35 +        ed->thread.schedule_tail = continue_nonidle_task;
    1.36  
    1.37          d->shared_info = (void *)alloc_xenheap_page();
    1.38          memset(d->shared_info, 0, PAGE_SIZE);
    1.39 @@ -234,6 +235,7 @@ static void continue_nonidle_task(struct
    1.40          memset(d->mm_perdomain_pt, 0, PAGE_SIZE);
    1.41          machine_to_phys_mapping[virt_to_phys(d->mm_perdomain_pt) >> 
    1.42                                 PAGE_SHIFT] = INVALID_P2M_ENTRY;
    1.43 +    }
    1.44  }
    1.45  
    1.46  int arch_final_setup_guestos(struct exec_domain *d, full_execution_context_t *c)
     2.1 --- a/xen/include/asm-x86/processor.h	Tue Dec 14 17:20:18 2004 +0000
     2.2 +++ b/xen/include/asm-x86/processor.h	Tue Dec 14 17:29:52 2004 +0000
     2.3 @@ -400,7 +400,7 @@ struct thread_struct {
     2.4      /* general user-visible register state */
     2.5      execution_context_t user_ctxt;
     2.6  
     2.7 -    void (*schedule_tail) (struct domain *);
     2.8 +    void (*schedule_tail) (struct exec_domain *);
     2.9  
    2.10      /*
    2.11       * Return vectors pushed to us by guest OS.