From 20b21cb1e1141d5dcfbc0a0c911cec72194ecc4a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 30 Nov 2011 07:08:53 -0800 Subject: mem_event: move mem_event_domain out of struct domain An upcoming change may increase the size of mem_event_domain. The result is a build failure because struct domain gets larger than a page. Allocate the room for the three mem_event_domain members at runtime. v2: - remove mem_ prefix from members of new struct Signed-off-by: Olaf Hering Committed-by: Keir Fraser --- xen/include/xen/sched.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'xen/include/xen/sched.h') diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index e12293cafc..39ed2c061b 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -194,6 +194,16 @@ struct mem_event_domain int xen_port; }; +struct mem_event_per_domain +{ + /* Memory sharing support */ + struct mem_event_domain share; + /* Memory paging support */ + struct mem_event_domain paging; + /* Memory access support */ + struct mem_event_domain access; +}; + struct domain { domid_t domain_id; @@ -318,12 +328,8 @@ struct domain /* Non-migratable and non-restoreable? */ bool_t disable_migrate; - /* Memory sharing support */ - struct mem_event_domain mem_share; - /* Memory paging support */ - struct mem_event_domain mem_paging; - /* Memory access support */ - struct mem_event_domain mem_access; + /* Various mem_events */ + struct mem_event_per_domain *mem_event; /* Currently computed from union of all vcpu cpu-affinity masks. */ nodemask_t node_affinity; -- cgit v1.2.3