On Fri, Feb 16, 2018 at 05:02:34PM -0500, John Ferlan wrote:
On 02/16/2018 06:22 AM, Daniel P. Berrangé wrote:
The qemuMigrationPrecreateStorage method needs a connection to access the storage driver. Instead of passing it around, open it at time of use.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/qemu/qemu_driver.c | 16 +++++++-------- src/qemu/qemu_migration.c | 51 ++++++++++++++++++++++------------------------- src/qemu/qemu_migration.h | 4 +--- 3 files changed, 33 insertions(+), 38 deletions(-)
[...]
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 312d717617..6edadac719 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c
[...]
static int doPeer2PeerMigrate2(virQEMUDriverPtr driver, - virConnectPtr sconn ATTRIBUTE_UNUSED, + virConnectPtr sconn,
I know this has an impact in later patches too, but @sconn is only used for (duplicated) debug prints...
virConnectPtr dconn, virDomainObjPtr vm, const char *dconnuri, @@ -4654,7 +4651,7 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver,
Same here it seems. Removing affects the calling stack a bit, but I think would be the right thing to do.
I did look at removing them, however, I feel they are useful debug statements - understanding migration is already very difficult so I think it is worth it. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|