From b7fac9f77ff3ba3554b5e2f3f149421af4ff2ea7 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 7 Jan 2016 11:39:45 +0100 Subject: [PATCH] virDomainMigrateUnmanagedParams: Don't blindly dereference @dconnuri This function may be called with @dconnuri == NULL, e.g. from virDomainMigrateToURI3() if the flags are missing VIR_MIGRATE_PEER2PEER flag. Moreover, all later functions called from here do wrap it into NULLSTR() so why not do the same here? Signed-off-by: Michal Privoznik --- src/libvirt-domain.c | 2 +- src/qemu/qemu_migration.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 72908926ef..677a9ad8de 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3428,7 +3428,7 @@ virDomainMigrateUnmanagedParams(virDomainPtr domain, unsigned int flags) { VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparams=%d, flags=%x", - dconnuri, params, nparams, flags); + NULLSTR(dconnuri), params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); if ((flags & VIR_MIGRATE_PEER2PEER) && diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a07a316159..51e7125280 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5661,7 +5661,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, cookieout, cookieoutlen, flags, resource); } else { - return qemuMigrationPerformJob(driver, conn, vm, xmlin, dconnuri, + return qemuMigrationPerformJob(driver, conn, vm, xmlin, NULL, uri, graphicsuri, listenAddress, nmigrate_disks, migrate_disks, cookiein, cookieinlen,