The last patch fixes a bug where we'd fail to detect capacity of disks on migration source due to changes in disk topology related to blockdev. The rest of the series makes the function at least somewhat sane. Peter Krempa (10): util: hash: Use g_new0 for allocating hash internals conf: domain: Remove checking of return value of virHashCreateFull Remove checking of return value of virHashNew qemuMigrationCookieAddNBD: Exit early if there are no disks qemuMigrationCookieNBD: Extract embedded struct qemuMigrationCookieAddNBD: Use glib memory allocators qemuMigrationCookieAddNBD: Move monitor call out of the loop qemuMigrationCookieAddNBD: Use virHashNew and automatic freeing of virHashTablePtr qemuMigrationCookieAddNBD: Remove 'ret' variable and 'cleanup' label qemuMigrationCookieAddNBD: Fix filling of 'capacity' when blockdev is used src/conf/backup_conf.c | 6 +--- src/conf/domain_addr.c | 32 +++++++----------- src/qemu/qemu_migration_cookie.c | 58 +++++++++++++++----------------- src/qemu/qemu_migration_cookie.h | 10 +++--- src/qemu/qemu_monitor_json.c | 3 +- src/util/virhash.c | 14 +++----- 6 files changed, 54 insertions(+), 69 deletions(-) -- 2.24.1