Commit 0e6ebd48 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert
Browse files

migration: Fix missing rcu_read_unlock 



Use the automatic rcu_read unlocker to fix a missing unlock.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Message-Id: <20191007143642.301445-3-dgilbert@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 5626f8c6

migration/ram.c

+13 −14
Original line number Diff line number Diff line
@@ -3373,23 +3373,22 @@ static int ram_save_setup(QEMUFile *f, void *opaque) 
    }

    (*rsp)->f = f;



    rcu_read_lock();



    WITH_RCU_READ_LOCK_GUARD() {

        qemu_put_be64(f, ram_bytes_total_common(true) | RAM_SAVE_FLAG_MEM_SIZE);



        RAMBLOCK_FOREACH_MIGRATABLE(block) {

            qemu_put_byte(f, strlen(block->idstr));

            qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idstr));

            qemu_put_be64(f, block->used_length);

        if (migrate_postcopy_ram() && block->page_size != qemu_host_page_size) {

            if (migrate_postcopy_ram() && block->page_size !=

                                          qemu_host_page_size) {

                qemu_put_be64(f, block->page_size);

            }

            if (migrate_ignore_shared()) {

                qemu_put_be64(f, block->mr->addr);

            }

        }



    rcu_read_unlock();

    }



    ram_control_before_iterate(f, RAM_CONTROL_SETUP);

    ram_control_after_iterate(f, RAM_CONTROL_SETUP);