]>
Commit | Line | Data |
---|---|---|
817b7667 SR |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: Stefan Reiter <s.reiter@proxmox.com> | |
3 | Date: Thu, 4 Feb 2021 17:06:19 +0100 | |
4 | Subject: [PATCH] migration: only check page size match if RAM postcopy is | |
5 | enabled | |
6 | ||
7 | Postcopy may also be advised for dirty-bitmap migration only, in which | |
8 | case the remote page size will not be available and we'll instead read | |
9 | bogus data, blocking migration with a mismatch error if the VM uses | |
10 | hugepages. | |
11 | ||
12 | Fixes: 58110f0acb ("migration: split common postcopy out of ram postcopy") | |
13 | Signed-off-by: Stefan Reiter <s.reiter@proxmox.com> | |
14 | Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> | |
15 | --- | |
16 | migration/ram.c | 2 +- | |
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
18 | ||
19 | diff --git a/migration/ram.c b/migration/ram.c | |
20 | index 7811cde643..6ace15261c 100644 | |
21 | --- a/migration/ram.c | |
22 | +++ b/migration/ram.c | |
23 | @@ -3521,7 +3521,7 @@ static int ram_load_precopy(QEMUFile *f) | |
24 | } | |
25 | } | |
26 | /* For postcopy we need to check hugepage sizes match */ | |
27 | - if (postcopy_advised && | |
28 | + if (postcopy_advised && migrate_postcopy_ram() && | |
29 | block->page_size != qemu_host_page_size) { | |
30 | uint64_t remote_page_size = qemu_get_be64(f); | |
31 | if (remote_page_size != block->page_size) { |