External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemuMigrationSrcNBDStorageCopyBlockdev: Remove some arguments

Browse Source 
We no longer need the arguments which were conditionally filled based on
presence of the QEMU_CAPS_BLOCKDEV feature.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-19 18:06:01 +02:00
parent 6111b23522
commit 9f15b8fb18
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_migration.c
View File

@ -1017,9 +1017,6 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(virDomainDiskDef *disk,
static int static int
qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *vm, qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *vm,
virDomainDiskDef *disk, virDomainDiskDef *disk,
const char *jobname,
const char *sourcename,
bool persistjob,
const char *host, const char *host,
int port, int port,
const char *socket, const char *socket,
@ -1033,6 +1030,10 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *vm,
qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
int mon_ret = 0; int mon_ret = 0;
g_autoptr(virStorageSource) copysrc = NULL; g_autoptr(virStorageSource) copysrc = NULL;
g_autofree char *diskAlias = qemuAliasDiskDriveFromDisk(disk);
if (!diskAlias)
return -1;
VIR_DEBUG("starting blockdev mirror for disk=%s to host=%s", disk->dst, host); VIR_DEBUG("starting blockdev mirror for disk=%s to host=%s", disk->dst, host);
@ -1053,8 +1054,9 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *vm,
mon_ret = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), data); mon_ret = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), data);
if (mon_ret == 0) if (mon_ret == 0)
mon_ret = qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), jobname, persistjob, mon_ret = qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), diskAlias, true,
sourcename, copysrc->nodeformat, qemuDomainDiskGetTopNodename(disk),
copysrc->nodeformat,
mirror_speed, 0, 0, mirror_shallow, mirror_speed, 0, 0, mirror_shallow,
syncWrites); syncWrites);
@ -1099,9 +1101,7 @@ qemuMigrationSrcNBDStorageCopyOne(virDomainObj *vm,
qemuBlockJobSyncBegin(job); qemuBlockJobSyncBegin(job);
rc = qemuMigrationSrcNBDStorageCopyBlockdev(vm, rc = qemuMigrationSrcNBDStorageCopyBlockdev(vm,
disk, diskAlias, disk,
qemuDomainDiskGetTopNodename(disk),
true,
host, port, socket, host, port, socket,
mirror_speed, mirror_speed,
mirror_shallow, mirror_shallow,