29 lines
1003 B
Diff
29 lines
1003 B
Diff
|
# HG changeset patch
|
||
|
|
# User Jan Beulich <jbeulich@novell.com>
|
||
|
|
# Date 1310804301 -3600
|
||
|
|
# Node ID 3dd399873c9ef7762f4353f3259e502394f56a34
|
||
|
|
# Parent 24e9ca968a2bc09d1aac927fcdbb7b769901d067
|
||
|
|
x86: fix guest migration after c/s 20892:d311d1efc25e
|
||
|
|
|
||
|
|
Guests would not manage to run successfully after being migrated to a
|
||
|
|
host having sufficiently much more memory than the host they were
|
||
|
|
originally started on.
|
||
|
|
|
||
|
|
Subsequently the plan is to re-enable the changes behavior under the
|
||
|
|
control of a guest kernel announced feature flag.
|
||
|
|
|
||
|
|
Signed-off-by: Jan Beulich <jbeulich@novell.com>
|
||
|
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/mm.c
|
||
|
|
+++ b/xen/arch/x86/mm.c
|
||
|
|
@@ -4791,7 +4791,7 @@ long arch_memory_op(int op, XEN_GUEST_HA
|
||
|
|
.max_mfn = MACH2PHYS_NR_ENTRIES - 1
|
||
|
|
};
|
||
|
|
|
||
|
|
- if ( !mem_hotplug )
|
||
|
|
+ if ( !mem_hotplug && current->domain == dom0 )
|
||
|
|
mapping.max_mfn = max_page - 1;
|
||
|
|
if ( copy_to_guest(arg, &mapping, 1) )
|
||
|
|
return -EFAULT;
|