diff options
| author | Jan Beulich <jbeulich@novell.com> | 2011-07-16 09:33:46 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@novell.com> | 2011-07-16 09:33:46 +0100 |
| commit | 2284d10d58526f115f274f895c683217eb7f608a (patch) | |
| tree | 57f2ef6baafa2b5f21366e2107162a53b5e88c2b | |
| parent | b877dbb2dfcc4886294cf37092559666201c8c3b (diff) | |
| download | xen-2284d10d58526f115f274f895c683217eb7f608a.tar.gz xen-2284d10d58526f115f274f895c683217eb7f608a.tar.bz2 xen-2284d10d58526f115f274f895c683217eb7f608a.zip | |
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>
xen-unstable changeset: 23706:3dd399873c9e
xen-unstable date: Sat Jul 16 09:18:21 2011 +0100
| -rw-r--r-- | xen/arch/x86/mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c995c177ba..fd37a6aa7e 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4782,7 +4782,7 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) .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; |