[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GIT PULL 15/18] virtio-mem: Update state to match bitmap as soon as it'
From: |
David Hildenbrand |
Subject: |
[GIT PULL 15/18] virtio-mem: Update state to match bitmap as soon as it's been migrated |
Date: |
Thu, 12 Oct 2023 16:36:52 +0200 |
It's cleaner and future-proof to just have other state that depends on the
bitmap state to be updated as soon as possible when restoring the bitmap.
So factor out informing RamDiscardListener into a functon and call it in
case of early migration right after we restored the bitmap.
Message-ID: <20230926185738.277351-16-david@redhat.com>
Reviewed-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/virtio/virtio-mem.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 0b0e6c5090..0cf47df9cf 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -984,9 +984,8 @@ static int virtio_mem_restore_unplugged(VirtIOMEM *vmem)
virtio_mem_discard_range_cb);
}
-static int virtio_mem_post_load(void *opaque, int version_id)
+static int virtio_mem_post_load_bitmap(VirtIOMEM *vmem)
{
- VirtIOMEM *vmem = VIRTIO_MEM(opaque);
RamDiscardListener *rdl;
int ret;
@@ -1001,6 +1000,20 @@ static int virtio_mem_post_load(void *opaque, int
version_id)
return ret;
}
}
+ return 0;
+}
+
+static int virtio_mem_post_load(void *opaque, int version_id)
+{
+ VirtIOMEM *vmem = VIRTIO_MEM(opaque);
+ int ret;
+
+ if (!vmem->early_migration) {
+ ret = virtio_mem_post_load_bitmap(vmem);
+ if (ret) {
+ return ret;
+ }
+ }
/*
* If shared RAM is migrated using the file content and not using QEMU,
@@ -1043,7 +1056,7 @@ static int virtio_mem_post_load_early(void *opaque, int
version_id)
int ret;
if (!vmem->prealloc) {
- return 0;
+ goto post_load_bitmap;
}
/*
@@ -1051,7 +1064,7 @@ static int virtio_mem_post_load_early(void *opaque, int
version_id)
* don't mess with preallocation and postcopy.
*/
if (migrate_ram_is_ignored(rb)) {
- return 0;
+ goto post_load_bitmap;
}
/*
@@ -1084,7 +1097,10 @@ static int virtio_mem_post_load_early(void *opaque, int
version_id)
return -EBUSY;
}
}
- return 0;
+
+post_load_bitmap:
+ /* Finally, update any other state to be consistent with the new bitmap. */
+ return virtio_mem_post_load_bitmap(vmem);
}
typedef struct VirtIOMEMMigSanityChecks {
--
2.41.0
- [GIT PULL 00/18] Host Memory Backends and Memory devices queue 2023-10-12, David Hildenbrand, 2023/10/12
- [GIT PULL 07/18] stubs: Rename qmp_memory_device.c to memory_device.c, David Hildenbrand, 2023/10/12
- [GIT PULL 03/18] softmmu/physmem: Fixup qemu_ram_block_from_host() documentation, David Hildenbrand, 2023/10/12
- [GIT PULL 05/18] vhost: Return number of free memslots, David Hildenbrand, 2023/10/12
- [GIT PULL 06/18] memory-device: Support memory devices with multiple memslots, David Hildenbrand, 2023/10/12
- [GIT PULL 08/18] memory-device: Track required and actually used memslots in DeviceMemoryState, David Hildenbrand, 2023/10/12
- [GIT PULL 09/18] memory-device, vhost: Support memory devices that dynamically consume memslots, David Hildenbrand, 2023/10/12
- [GIT PULL 11/18] vhost: Add vhost_get_max_memslots(), David Hildenbrand, 2023/10/12
- [GIT PULL 02/18] vhost: Remove vhost_backend_can_merge() callback, David Hildenbrand, 2023/10/12
- [GIT PULL 01/18] vhost: Rework memslot filtering and fix "used_memslot" tracking, David Hildenbrand, 2023/10/12
- [GIT PULL 15/18] virtio-mem: Update state to match bitmap as soon as it's been migrated,
David Hildenbrand <=
- [GIT PULL 14/18] virtio-mem: Pass non-const VirtIOMEM via virtio_mem_range_cb, David Hildenbrand, 2023/10/12
- [GIT PULL 04/18] kvm: Return number of free memslots, David Hildenbrand, 2023/10/12
- [GIT PULL 18/18] virtio-mem: Mark memslot alias memory regions unmergeable, David Hildenbrand, 2023/10/12
- [GIT PULL 17/18] memory, vhost: Allow for marking memory device memory regions unmergeable, David Hildenbrand, 2023/10/12
- [GIT PULL 16/18] virtio-mem: Expose device memory dynamically via multiple memslots if enabled, David Hildenbrand, 2023/10/12
- [GIT PULL 10/18] kvm: Add stub for kvm_get_max_memslots(), David Hildenbrand, 2023/10/12
- [GIT PULL 12/18] memory-device, vhost: Support automatic decision on the number of memslots, David Hildenbrand, 2023/10/12
- [GIT PULL 13/18] memory: Clarify mapping requirements for RamDiscardManager, David Hildenbrand, 2023/10/12
- Re: [GIT PULL 00/18] Host Memory Backends and Memory devices queue 2023-10-12, Stefan Hajnoczi, 2023/10/16