[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GIT PULL 14/18] virtio-mem: Pass non-const VirtIOMEM via virtio_mem_ran
From: |
David Hildenbrand |
Subject: |
[GIT PULL 14/18] virtio-mem: Pass non-const VirtIOMEM via virtio_mem_range_cb |
Date: |
Thu, 12 Oct 2023 16:36:51 +0200 |
Let's prepare for a user that has to modify the VirtIOMEM device state.
Message-ID: <20230926185738.277351-15-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 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index da5b09cefc..0b0e6c5090 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -177,10 +177,10 @@ static bool virtio_mem_is_busy(void)
return migration_in_incoming_postcopy() || !migration_is_idle();
}
-typedef int (*virtio_mem_range_cb)(const VirtIOMEM *vmem, void *arg,
+typedef int (*virtio_mem_range_cb)(VirtIOMEM *vmem, void *arg,
uint64_t offset, uint64_t size);
-static int virtio_mem_for_each_unplugged_range(const VirtIOMEM *vmem, void
*arg,
+static int virtio_mem_for_each_unplugged_range(VirtIOMEM *vmem, void *arg,
virtio_mem_range_cb cb)
{
unsigned long first_zero_bit, last_zero_bit;
@@ -204,7 +204,7 @@ static int virtio_mem_for_each_unplugged_range(const
VirtIOMEM *vmem, void *arg,
return ret;
}
-static int virtio_mem_for_each_plugged_range(const VirtIOMEM *vmem, void *arg,
+static int virtio_mem_for_each_plugged_range(VirtIOMEM *vmem, void *arg,
virtio_mem_range_cb cb)
{
unsigned long first_bit, last_bit;
@@ -969,7 +969,7 @@ static void virtio_mem_device_unrealize(DeviceState *dev)
ram_block_coordinated_discard_require(false);
}
-static int virtio_mem_discard_range_cb(const VirtIOMEM *vmem, void *arg,
+static int virtio_mem_discard_range_cb(VirtIOMEM *vmem, void *arg,
uint64_t offset, uint64_t size)
{
RAMBlock *rb = vmem->memdev->mr.ram_block;
@@ -1021,7 +1021,7 @@ static int virtio_mem_post_load(void *opaque, int
version_id)
return virtio_mem_restore_unplugged(vmem);
}
-static int virtio_mem_prealloc_range_cb(const VirtIOMEM *vmem, void *arg,
+static int virtio_mem_prealloc_range_cb(VirtIOMEM *vmem, void *arg,
uint64_t offset, uint64_t size)
{
void *area = memory_region_get_ram_ptr(&vmem->memdev->mr) + offset;
--
2.41.0
- [GIT PULL 07/18] stubs: Rename qmp_memory_device.c to memory_device.c, (continued)
- [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, 2023/10/12
- [GIT PULL 14/18] virtio-mem: Pass non-const VirtIOMEM via virtio_mem_range_cb,
David Hildenbrand <=
- [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