External/libvirt
1
0
Fork 0
Code

qemu: Convert migration setup code to use 'format' layer node name accessors

Browse Source 
The blockjob, NBD export and setup of the cookie data all care about the
effective nodename.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-10-16 16:42:16 +02:00
parent 1baf16fe04
commit 032edf2f11
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_block.c
View File

@ -3406,11 +3406,11 @@ qemuBlockExportAddNBD(virDomainObj *vm,
const char *bitmaps[2] = { bitmap, NULL }; const char *bitmaps[2] = { bitmap, NULL };
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_EXPORT_ADD)) if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_EXPORT_ADD))
return qemuMonitorNBDServerAdd(priv->mon, src->nodeformat, return qemuMonitorNBDServerAdd(priv->mon, qemuBlockStorageSourceGetEffectiveNodename(src),
exportname, writable, bitmap); exportname, writable, bitmap);
if (!(nbdprops = qemuBlockExportGetNBDProps(src->nodeformat, exportname, if (!(nbdprops = qemuBlockExportGetNBDProps(qemuBlockStorageSourceGetEffectiveNodename(src),
writable, bitmaps))) exportname, writable, bitmaps)))
return -1; return -1;
return qemuMonitorBlockExportAdd(priv->mon, &nbdprops); return qemuMonitorBlockExportAdd(priv->mon, &nbdprops);

4
src/qemu/qemu_migration.c
View File

@ -1012,7 +1012,7 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(virDomainDiskDef *disk,
copysrc->tlsHostname = g_strdup(tlsHostname); copysrc->tlsHostname = g_strdup(tlsHostname);
qemuBlockStorageSourceSetStorageNodename(copysrc, g_strdup_printf("migration-%s-storage", disk->dst)); qemuBlockStorageSourceSetStorageNodename(copysrc, g_strdup_printf("migration-%s-storage", disk->dst));
copysrc->nodeformat = g_strdup_printf("migration-%s-format", disk->dst); qemuBlockStorageSourceSetFormatNodename(copysrc, g_strdup_printf("migration-%s-format", disk->dst));
return g_steal_pointer(&copysrc); return g_steal_pointer(&copysrc);
} }
@ -1060,7 +1060,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *vm,
if (mon_ret == 0) if (mon_ret == 0)
mon_ret = qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), diskAlias, true, mon_ret = qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), diskAlias, true,
qemuDomainDiskGetTopNodename(disk), qemuDomainDiskGetTopNodename(disk),
copysrc->nodeformat, qemuBlockStorageSourceGetEffectiveNodename(copysrc),
mirror_speed, 0, 0, mirror_shallow, mirror_speed, 0, 0, mirror_shallow,
syncWrites); syncWrites);

3
src/qemu/qemu_migration_cookie.c
View File

@ -31,6 +31,7 @@
#include "qemu_domain.h" #include "qemu_domain.h"
#include "qemu_migration_cookie.h" #include "qemu_migration_cookie.h"
#include "qemu_migration_params.h" #include "qemu_migration_params.h"
#include "qemu_block.h"
#define VIR_FROM_THIS VIR_FROM_QEMU #define VIR_FROM_THIS VIR_FROM_QEMU
@ -507,7 +508,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig,
virDomainDiskDef *disk = vm->def->disks[i]; virDomainDiskDef *disk = vm->def->disks[i];
qemuBlockStats *entry; qemuBlockStats *entry;
if (!(entry = virHashLookup(stats, disk->src->nodeformat))) if (!(entry = virHashLookup(stats, qemuBlockStorageSourceGetEffectiveNodename(disk->src))))
continue; continue;
mig->nbd->disks[mig->nbd->ndisks].target = g_strdup(disk->dst); mig->nbd->disks[mig->nbd->ndisks].target = g_strdup(disk->dst);