[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/15] virtio-mem: Don't report errors when ram_block_discard_rang
From: |
Eduardo Habkost |
Subject: |
[PULL 06/15] virtio-mem: Don't report errors when ram_block_discard_range() fails |
Date: |
Wed, 7 Jul 2021 15:32:32 -0400 |
From: David Hildenbrand <david@redhat.com>
Any errors are unexpected and ram_block_discard_range() already properly
prints errors. Let's stop manually reporting errors.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Auger Eric <eric.auger@redhat.com>
Cc: Wei Yang <richard.weiyang@linux.alibaba.com>
Cc: teawater <teawaterz@linux.alibaba.com>
Cc: Marek Kedzierski <mkedzier@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210413095531.25603-5-david@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/virtio/virtio-mem.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 3942fd75496..a92a067b283 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -246,17 +246,14 @@ static int virtio_mem_set_block_state(VirtIOMEM *vmem,
uint64_t start_gpa,
uint64_t size, bool plug)
{
const uint64_t offset = start_gpa - vmem->addr;
- int ret;
+ RAMBlock *rb = vmem->memdev->mr.ram_block;
if (virtio_mem_is_busy()) {
return -EBUSY;
}
if (!plug) {
- ret = ram_block_discard_range(vmem->memdev->mr.ram_block, offset,
size);
- if (ret) {
- error_report("Unexpected error discarding RAM: %s",
- strerror(-ret));
+ if (ram_block_discard_range(rb, offset, size)) {
return -EBUSY;
}
}
@@ -345,15 +342,12 @@ static void virtio_mem_resize_usable_region(VirtIOMEM
*vmem,
static int virtio_mem_unplug_all(VirtIOMEM *vmem)
{
RAMBlock *rb = vmem->memdev->mr.ram_block;
- int ret;
if (virtio_mem_is_busy()) {
return -EBUSY;
}
- ret = ram_block_discard_range(rb, 0, qemu_ram_get_used_length(rb));
- if (ret) {
- error_report("Unexpected error discarding RAM: %s", strerror(-ret));
+ if (ram_block_discard_range(rb, 0, qemu_ram_get_used_length(rb))) {
return -EBUSY;
}
bitmap_clear(vmem->bitmap, 0, vmem->bitmap_size);
@@ -625,14 +619,8 @@ static int virtio_mem_discard_range_cb(const VirtIOMEM
*vmem, void *arg,
uint64_t offset, uint64_t size)
{
RAMBlock *rb = vmem->memdev->mr.ram_block;
- int ret;
- ret = ram_block_discard_range(rb, offset, size);
- if (ret) {
- error_report("Unexpected error discarding RAM: %s", strerror(-ret));
- return -EINVAL;
- }
- return 0;
+ return ram_block_discard_range(rb, offset, size) ? -EINVAL : 0;
}
static int virtio_mem_restore_unplugged(VirtIOMEM *vmem)
--
2.31.1
- [PULL 00/15] Machine queue, 2021-07-07, Eduardo Habkost, 2021/07/07
- [PULL 02/15] Deprecate pmem=on with non-DAX capable backend file, Eduardo Habkost, 2021/07/07
- [PULL 04/15] memory: Helpers to copy/free a MemoryRegionSection, Eduardo Habkost, 2021/07/07
- [PULL 03/15] memory: Introduce RamDiscardManager for RAM memory regions, Eduardo Habkost, 2021/07/07
- [PULL 01/15] vmbus: Don't make QOM property registration conditional, Eduardo Habkost, 2021/07/07
- [PULL 05/15] virtio-mem: Factor out traversing unplugged ranges, Eduardo Habkost, 2021/07/07
- [PULL 06/15] virtio-mem: Don't report errors when ram_block_discard_range() fails,
Eduardo Habkost <=
- [PULL 07/15] virtio-mem: Implement RamDiscardManager interface, Eduardo Habkost, 2021/07/07
- [PULL 09/15] vfio: Query and store the maximum number of possible DMA mappings, Eduardo Habkost, 2021/07/07
- [PULL 10/15] vfio: Sanity check maximum number of DMA mappings with RamDiscardManager, Eduardo Habkost, 2021/07/07
- [PULL 08/15] vfio: Support for RamDiscardManager in the !vIOMMU case, Eduardo Habkost, 2021/07/07
- [PULL 11/15] vfio: Support for RamDiscardManager in the vIOMMU case, Eduardo Habkost, 2021/07/07
- [PULL 12/15] softmmu/physmem: Don't use atomic operations in ram_block_discard_(disable|require), Eduardo Habkost, 2021/07/07
- [PULL 13/15] softmmu/physmem: Extend ram_block_discard_(require|disable) by two discard types, Eduardo Habkost, 2021/07/07
- [PULL 15/15] vfio: Disable only uncoordinated discards for VFIO_TYPE1 iommus, Eduardo Habkost, 2021/07/07
- [PULL 14/15] virtio-mem: Require only coordinated discards, Eduardo Habkost, 2021/07/07
- Re: [PULL 00/15] Machine queue, 2021-07-07, Peter Maydell, 2021/07/08