diff mbox series

[v4,14/18] virtio-mem: Pass non-const VirtIOMEM via virtio_mem_range_cb

Message ID 20230926185738.277351-15-david@redhat.com
State New
Headers show
Series virtio-mem: Expose device memory through multiple memslots | expand

Commit Message

David Hildenbrand Sept. 26, 2023, 6:57 p.m. UTC 
Let's prepare for a user that has to modify the VirtIOMEM device state.

Signed-off-by: David Hildenbrand <david@redhat.com>
---
 hw/virtio/virtio-mem.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Maciej S. Szmigiero Sept. 28, 2023, 5:41 p.m. UTC | #1 
On 26.09.2023 20:57, David Hildenbrand wrote:
> Let's prepare for a user that has to modify the VirtIOMEM device state.
> 
> 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;

Reviewed-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>

Thanks,
Maciej
diff mbox series

Patch

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;