External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 01:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainMigrateUnmanagedParams: Don't blindly dereference @dconnuri

Browse Source 
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 <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-01-07 11:39:45 +01:00
parent 8156493d8d
commit b7fac9f77f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt-domain.c
View File

@ -3428,7 +3428,7 @@ virDomainMigrateUnmanagedParams(virDomainPtr domain,
unsigned int flags) unsigned int flags)
{ {
VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparams=%d, flags=%x", 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); VIR_TYPED_PARAMS_DEBUG(params, nparams);
if ((flags & VIR_MIGRATE_PEER2PEER) && if ((flags & VIR_MIGRATE_PEER2PEER) &&

2
src/qemu/qemu_migration.c
View File

@ -5661,7 +5661,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver,
cookieout, cookieoutlen, cookieout, cookieoutlen,
flags, resource); flags, resource);
} else { } else {
return qemuMigrationPerformJob(driver, conn, vm, xmlin, dconnuri, return qemuMigrationPerformJob(driver, conn, vm, xmlin, NULL,
uri, graphicsuri, listenAddress, uri, graphicsuri, listenAddress,
nmigrate_disks, migrate_disks, nmigrate_disks, migrate_disks,
cookiein, cookieinlen, cookiein, cookieinlen,