# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1166560308 25200
# Node ID c3b455c4676c6446cd541d4c67a521609d046ddb
# Parent 1f811fe10d0a9515290bd4c785a7aed9cfec0e28
# Parent 057f7c4dbed1c75a3fbe446d346cee04cff31497
merge with xen-unstable.hg
---
tools/python/xen/xend/XendConfig.py | 1 +
xen/common/page_alloc.c | 12 ++++++------
xen/common/xenoprof.c | 2 +-
xen/include/xen/elfcore.h | 4 ++--
4 files changed, 10 insertions(+), 9 deletions(-)
diff -r 1f811fe10d0a -r c3b455c4676c tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py Tue Dec 19 12:41:30 2006 -0700
+++ b/tools/python/xen/xend/XendConfig.py Tue Dec 19 13:31:48 2006 -0700
@@ -85,6 +85,7 @@ XENAPI_CFG_TO_LEGACY_CFG = {
XENAPI_CFG_TO_LEGACY_CFG = {
'uuid': 'uuid',
'vcpus_number': 'vcpus',
+ 'cpus': 'cpus',
'memory_static_min': 'memory',
'memory_static_max': 'maxmem',
'name_label': 'name',
diff -r 1f811fe10d0a -r c3b455c4676c xen/common/page_alloc.c
--- a/xen/common/page_alloc.c Tue Dec 19 12:41:30 2006 -0700
+++ b/xen/common/page_alloc.c Tue Dec 19 13:31:48 2006 -0700
@@ -490,15 +490,15 @@ void scrub_heap_pages(void)
for ( mfn = first_valid_mfn; mfn < max_page; mfn++ )
{
+ process_pending_timers();
+
+ /* Quick lock-free check. */
+ if ( allocated_in_map(mfn) )
+ continue;
+
/* Every 100MB, print a progress dot. */
if ( (mfn % ((100*1024*1024)/PAGE_SIZE)) == 0 )
printk(".");
-
- process_pending_timers();
-
- /* Quick lock-free check. */
- if ( allocated_in_map(mfn) )
- continue;
spin_lock_irq(&heap_lock);
diff -r 1f811fe10d0a -r c3b455c4676c xen/common/xenoprof.c
--- a/xen/common/xenoprof.c Tue Dec 19 12:41:30 2006 -0700
+++ b/xen/common/xenoprof.c Tue Dec 19 13:31:48 2006 -0700
@@ -384,7 +384,7 @@ static int add_passive_list(XEN_GUEST_HA
d->xenoprof->domain_type = XENOPROF_DOMAIN_PASSIVE;
passive.nbuf = d->xenoprof->nbuf;
passive.bufsize = d->xenoprof->bufsize;
- if ( !shadow_mode_translate(d) )
+ if ( !shadow_mode_translate(current->domain) )
passive.buf_gmaddr = __pa(d->xenoprof->rawbuf);
else
xenoprof_shared_gmfn_with_guest(
diff -r 1f811fe10d0a -r c3b455c4676c xen/include/xen/elfcore.h
--- a/xen/include/xen/elfcore.h Tue Dec 19 12:41:30 2006 -0700
+++ b/xen/include/xen/elfcore.h Tue Dec 19 13:31:48 2006 -0700
@@ -87,7 +87,7 @@ typedef struct
desctype desc; \
PAD32(sizeof(desctype)); \
} desc; \
- } type
+ } __attribute__ ((packed)) type
#define CORE_STR "CORE"
#define CORE_STR_LEN 5 /* including terminating zero */
@@ -119,7 +119,7 @@ typedef struct {
crash_note_core_t core;
crash_note_xen_core_t xen_regs;
crash_note_xen_info_t xen_info;
-} crash_note_t;
+} __attribute__ ((packed)) crash_note_t;
#define setup_crash_note(np, member, str, str_len, id) \
np->member.note.note.note.namesz = str_len; \
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home