[v6,11/12] virtio-mem: Require only coordinated discards

Commit Message

David Hildenbrand Feb. 22, 2021, 11:57 a.m. UTC

We implement the RamDiscardMgr interface and only require coordinated
discarding of RAM to work.

Reviewed-by: Dr. David Alan Gilbert <[e-mail]>
Reviewed-by: Pankaj Gupta <[e-mail]>
Acked-by: Michael S. Tsirkin <[e-mail]>
Reviewed-by: Michael S. Tsirkin <[e-mail]>
Cc: Paolo Bonzini <[e-mail]>
Cc: "Michael S. Tsirkin" <[e-mail]>
Cc: Alex Williamson <[e-mail]>
Cc: Dr. David Alan Gilbert <[e-mail]>
Cc: Igor Mammedov <[e-mail]>
Cc: Pankaj Gupta <[e-mail]>
Cc: Peter Xu <[e-mail]>
Cc: Auger Eric <[e-mail]>
Cc: Wei Yang <[e-mail]>
Cc: teawater <[e-mail]>
Cc: Marek Kedzierski <[e-mail]>
Signed-off-by: David Hildenbrand <[e-mail]>
---
 hw/virtio/virtio-mem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 194fb56a9a..9c36e7f96d 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -676,7 +676,7 @@  static void virtio_mem_device_realize(DeviceState *dev, Error **errp)
         return;
     }
 
-    if (ram_block_discard_require(true)) {
+    if (ram_block_coordinated_discard_require(true)) {
         error_setg(errp, "Discarding RAM is disabled");
         return;
     }
@@ -684,7 +684,7 @@  static void virtio_mem_device_realize(DeviceState *dev, Error **errp)
     ret = ram_block_discard_range(rb, 0, qemu_ram_get_used_length(rb));
     if (ret) {
         error_setg_errno(errp, -ret, "Unexpected error discarding RAM");
-        ram_block_discard_require(false);
+        ram_block_coordinated_discard_require(false);
         return;
     }
 
@@ -727,7 +727,7 @@  static void virtio_mem_device_unrealize(DeviceState *dev)
     virtio_del_queue(vdev, 0);
     virtio_cleanup(vdev);
     g_free(vmem->bitmap);
-    ram_block_discard_require(false);
+    ram_block_coordinated_discard_require(false);
 }
 
 static int virtio_mem_discard_range_cb(const VirtIOMEM *vmem, void *arg,