From 7c6d462aae9d94aec39face7329ceead9d5a92bd Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 13 Apr 2021 16:16:44 +0200 Subject: [PATCH] qemuMigrationCookieNBDXMLFormat: Format empty element Commit 518be41aaa3 refactored qemuMigrationCookieNBDXMLFormat to use virXMLFormatElement which in comparison to the previous code doesn't format the element if it's empty. Unfortunately some crusty bits of our migration code use questionable logic to assert use of the old-style storage migration parameters which breaks if no disks are being migrated and the element is not present. While later patches will fix the code, re-instate formatting of empty for increased compatibility. Signed-off-by: Peter Krempa Reviewed-by: Andrea Bolognani Tested-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/qemu/qemu_migration_cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 41533e4549..52998ddd1b 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -790,7 +790,7 @@ qemuMigrationCookieNBDXMLFormat(qemuMigrationCookieNBD *nbd, virBufferAsprintf(&childBuf, " capacity='%llu'/>\n", nbd->disks[i].capacity); } - virXMLFormatElement(buf, "nbd", &attrBuf, &childBuf); + virXMLFormatElementEmpty(buf, "nbd", &attrBuf, &childBuf); }