[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/27] migration: only check page size match if RAM postcopy is en
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 27/27] migration: only check page size match if RAM postcopy is enabled |
Date: |
Mon, 8 Feb 2021 11:29:18 +0000 |
From: Stefan Reiter <s.reiter@proxmox.com>
Postcopy may also be advised for dirty-bitmap migration only, in which
case the remote page size will not be available and we'll instead read
bogus data, blocking migration with a mismatch error if the VM uses
hugepages.
Fixes: 58110f0acb ("migration: split common postcopy out of ram postcopy")
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
Message-Id: <20210204163522.13291-1-s.reiter@proxmox.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/ram.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/migration/ram.c b/migration/ram.c
index 46e9d4d145..72143da0ac 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3808,7 +3808,7 @@ static int ram_load_precopy(QEMUFile *f)
}
}
/* For postcopy we need to check hugepage sizes match */
- if (postcopy_advised &&
+ if (postcopy_advised && migrate_postcopy_ram() &&
block->page_size != qemu_host_page_size) {
uint64_t remote_page_size = qemu_get_be64(f);
if (remote_page_size != block->page_size) {
--
2.29.2
- [PULL 16/27] migration: Make save_snapshot() return bool, not 0/-1, (continued)
- [PULL 16/27] migration: Make save_snapshot() return bool, not 0/-1, Dr. David Alan Gilbert (git), 2021/02/08
- [PULL 18/27] block: add ability to specify list of blockdevs during snapshot, Dr. David Alan Gilbert (git), 2021/02/08
- [PULL 21/27] migration: control whether snapshots are ovewritten, Dr. David Alan Gilbert (git), 2021/02/08
- [PULL 25/27] iotests: fix loading of common.config from tests/ subdir, Dr. David Alan Gilbert (git), 2021/02/08
- [PULL 24/27] iotests: add support for capturing and matching QMP events, Dr. David Alan Gilbert (git), 2021/02/08
- [PULL 15/27] block: push error reporting into bdrv_all_*_snapshot functions, Dr. David Alan Gilbert (git), 2021/02/08
- [PULL 19/27] block: allow specifying name of block device for vmstate storage, Dr. David Alan Gilbert (git), 2021/02/08
- [PULL 22/27] migration: wire up support for snapshot device selection, Dr. David Alan Gilbert (git), 2021/02/08
- [PULL 23/27] migration: introduce a delete_snapshot wrapper, Dr. David Alan Gilbert (git), 2021/02/08
- [PULL 26/27] migration: introduce snapshot-{save, load, delete} QMP commands, Dr. David Alan Gilbert (git), 2021/02/08
- [PULL 27/27] migration: only check page size match if RAM postcopy is enabled,
Dr. David Alan Gilbert (git) <=
- Re: [PULL 00/27] migration queue, Peter Maydell, 2021/02/08