From: Peter Krempa <pkrempa@redhat.com> The only caller doesn't use it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0e097f25b1..fec808ccfb 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -7219,7 +7219,7 @@ qemuMigrationSrcToSparseFile(virDomainObj *vm, if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) return -1; - ret = qemuMonitorMigrateToFdSet(vm, 0, fd, &directFd); + ret = qemuMonitorMigrateToFdSet(vm, fd, &directFd); qemuDomainObjExitMonitor(vm); return ret; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 958cd3a247..05334fabd5 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2275,7 +2275,6 @@ qemuMonitorMigrateToFd(qemuMonitor *mon, int qemuMonitorMigrateToFdSet(virDomainObj *vm, - unsigned int flags, int *fd, int *directFd) { @@ -2284,9 +2283,10 @@ qemuMonitorMigrateToFdSet(virDomainObj *vm, off_t offset; g_autoptr(qemuFDPass) fdPassMigrate = NULL; g_autofree char *uri = NULL; + unsigned int migrateFlags = 0; /* currently no flags are passed to the 'migrate' command */ int ret; - VIR_DEBUG("fd=%d directFd=%d flags=0x%x", *fd, *directFd, flags); + VIR_DEBUG("fd=%d directFd=%d", *fd, *directFd); QEMU_CHECK_MONITOR(mon); @@ -2304,7 +2304,7 @@ qemuMonitorMigrateToFdSet(virDomainObj *vm, uri = g_strdup_printf("file:%s,offset=%#jx", qemuFDPassGetPath(fdPassMigrate), (uintmax_t)offset); - ret = qemuMonitorJSONMigrate(mon, flags, uri); + ret = qemuMonitorJSONMigrate(mon, migrateFlags, uri); return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index ddbf3371ca..d3611d9713 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1090,7 +1090,6 @@ qemuMonitorMigrateToFd(qemuMonitor *mon, int qemuMonitorMigrateToFdSet(virDomainObj *vm, - unsigned int flags, int *fd, int *directFd); -- 2.53.0