1.1 --- a/tools/python/xen/xend/XendConfig.py	Tue Dec 19 12:41:30 2006 -0700
     1.2 +++ b/tools/python/xen/xend/XendConfig.py	Tue Dec 19 13:31:48 2006 -0700
     1.3 @@ -85,6 +85,7 @@ def scrub_password(data):
     1.4  XENAPI_CFG_TO_LEGACY_CFG = {
     1.5      'uuid': 'uuid',
     1.6      'vcpus_number': 'vcpus',
     1.7 +    'cpus': 'cpus',
     1.8      'memory_static_min': 'memory',
     1.9      'memory_static_max': 'maxmem',
    1.10      'name_label': 'name',

     2.1 --- a/xen/common/page_alloc.c	Tue Dec 19 12:41:30 2006 -0700
     2.2 +++ b/xen/common/page_alloc.c	Tue Dec 19 13:31:48 2006 -0700
     2.3 @@ -490,16 +490,16 @@ void scrub_heap_pages(void)
     2.4  
     2.5      for ( mfn = first_valid_mfn; mfn < max_page; mfn++ )
     2.6      {
     2.7 -        /* Every 100MB, print a progress dot. */
     2.8 -        if ( (mfn % ((100*1024*1024)/PAGE_SIZE)) == 0 )
     2.9 -            printk(".");
    2.10 -
    2.11          process_pending_timers();
    2.12  
    2.13          /* Quick lock-free check. */
    2.14          if ( allocated_in_map(mfn) )
    2.15              continue;
    2.16  
    2.17 +        /* Every 100MB, print a progress dot. */
    2.18 +        if ( (mfn % ((100*1024*1024)/PAGE_SIZE)) == 0 )
    2.19 +            printk(".");
    2.20 +
    2.21          spin_lock_irq(&heap_lock);
    2.22  
    2.23          /* Re-check page status with lock held. */

     3.1 --- a/xen/common/xenoprof.c	Tue Dec 19 12:41:30 2006 -0700
     3.2 +++ b/xen/common/xenoprof.c	Tue Dec 19 13:31:48 2006 -0700
     3.3 @@ -384,7 +384,7 @@ static int add_passive_list(XEN_GUEST_HA
     3.4      d->xenoprof->domain_type = XENOPROF_DOMAIN_PASSIVE;
     3.5      passive.nbuf = d->xenoprof->nbuf;
     3.6      passive.bufsize = d->xenoprof->bufsize;
     3.7 -    if ( !shadow_mode_translate(d) )
     3.8 +    if ( !shadow_mode_translate(current->domain) )
     3.9          passive.buf_gmaddr = __pa(d->xenoprof->rawbuf);
    3.10      else
    3.11          xenoprof_shared_gmfn_with_guest(

     4.1 --- a/xen/include/xen/elfcore.h	Tue Dec 19 12:41:30 2006 -0700
     4.2 +++ b/xen/include/xen/elfcore.h	Tue Dec 19 13:31:48 2006 -0700
     4.3 @@ -87,7 +87,7 @@ typedef struct
     4.4              desctype desc;                      \
     4.5              PAD32(sizeof(desctype));            \
     4.6          } desc;                                 \
     4.7 -    } type
     4.8 +    } __attribute__ ((packed)) type
     4.9  
    4.10  #define CORE_STR                "CORE"
    4.11  #define CORE_STR_LEN            5 /* including terminating zero */
    4.12 @@ -119,7 +119,7 @@ typedef struct {
    4.13      crash_note_core_t core;
    4.14      crash_note_xen_core_t xen_regs;
    4.15      crash_note_xen_info_t xen_info;
    4.16 -} crash_note_t;
    4.17 +} __attribute__ ((packed)) crash_note_t;
    4.18  
    4.19  #define setup_crash_note(np, member, str, str_len, id) \
    4.20    np->member.note.note.note.namesz = str_len; \