Skip to contentSkip to conversation

virtio-mem: Fix the iterator variable in a vmem->rdl_list loop

PATCH In review Chenyi Qiang 3 participants 3 messages Dec 28, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 virtio-mem: Fix the iterator variable in a vmem->rdl_list loop

It should be the variable rdl2 to revert the already-notified listeners.

Fixes 2044969f0b ("virtio-mem: Implement RamDiscardManager interface")
---
 hw/virtio/virtio-mem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/virtio/virtio-mem.c +1 -1
index d96bde1fab..88c9c10318 100644
@@ -341,7 +341,7 @@ static int virtio_mem_notify_plug(VirtIOMEM *vmem, uint64_t offset,
     if (ret) {
         /* Notify all already-notified listeners. */
         QLIST_FOREACH(rdl2, &vmem->rdl_list, next) {
-            MemoryRegionSection tmp = *rdl->section;
+            MemoryRegionSection tmp = *rdl2->section;
 
             if (rdl2 == rdl) {
                 break;
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Chenyi Qiang

It should be the variable rdl2 to revert the already-notified listeners.

Fixes 2044969f0b ("virtio-mem: Implement RamDiscardManager interface")
---
  hw/virtio/virtio-mem.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
hw/virtio/virtio-mem.c +0 -0
index d96bde1fab..88c9c10318 100644

hw/virtio/virtio-mem.c static int virtio_mem_notify_plug(VirtIOMEM *vmem, uint64_t offset, · line 347

Quoted 8 lines
hw/virtio/virtio-mem.c +1 -1
@@ -341,7 +341,7 @@ static int virtio_mem_notify_plug(VirtIOMEM *vmem, uint64_t offset,
      if (ret) {
          /* Notify all already-notified listeners. */
          QLIST_FOREACH(rdl2, &vmem->rdl_list, next) {
-            MemoryRegionSection tmp = *rdl->section;
+            MemoryRegionSection tmp = *rdl2->section;
 
              if (rdl2 == rdl) {
                  break;
#2 lore raw
In reply to Chenyi Qiang
Quoted 13 lines · Chenyi Qiang

It should be the variable rdl2 to revert the already-notified listeners.

Fixes 2044969f0b ("virtio-mem: Implement RamDiscardManager interface")
---
  hw/virtio/virtio-mem.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
hw/virtio/virtio-mem.c +0 -0
index d96bde1fab..88c9c10318 100644

hw/virtio/virtio-mem.c static int virtio_mem_notify_plug(VirtIOMEM *vmem, uint64_t offset, · line 347

Quoted 8 lines
hw/virtio/virtio-mem.c +1 -1
@@ -341,7 +341,7 @@ static int virtio_mem_notify_plug(VirtIOMEM *vmem, uint64_t offset,
      if (ret) {
          /* Notify all already-notified listeners. */
          QLIST_FOREACH(rdl2, &vmem->rdl_list, next) {
-            MemoryRegionSection tmp = *rdl->section;
+            MemoryRegionSection tmp = *rdl2->section;
 
              if (rdl2 == rdl) {
                  break;

Indeed, most probably we barely hit that error path in practice. Thanks!

I really have to find a way to simulate a sparse bitmap easily, and to inject errors to better test these paths.

https://github.com/davidhildenbrand/qemu.git mem-next

Signature · 3 lines
Thanks,

David / dhildenb