NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemuDomainMigrateGraphicsRelocate: Use then new virSocketAddrIsWildcard

Browse Source 
Since we have the new internal API to check for wildcard address,
we can use it instead of parsing and formatting.
This commit is contained in:
Michal Privoznik 2013-06-06 16:04:42 +02:00
parent 688994364f
commit b72ba1da36
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_migration.c
View File

@ -1740,7 +1740,6 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver,
int ret; int ret;
char *listenAddress; char *listenAddress;
virSocketAddr addr; virSocketAddr addr;
bool reformatted = false;
if (!cookie) if (!cookie)
return 0; return 0;
@ -1756,23 +1755,10 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver,
listenAddress = cookie->graphics->listen; listenAddress = cookie->graphics->listen;
/* Okay, here's the magic: some mgmt applications set bare '0' as listen
* address. On the other hand, it's a valid IPv4 address. This means, we
* need to reformat the address so the if statement below can check just
* for two ANYCAST addresses and not all their variants. */
if (listenAddress &&
virSocketAddrParse(&addr, listenAddress, AF_UNSPEC) > 0) {
listenAddress = virSocketAddrFormat(&addr);
reformatted = true;
}
if (!listenAddress || if (!listenAddress ||
STREQ(listenAddress, "0.0.0.0") || (virSocketAddrParse(&addr, listenAddress, AF_UNSPEC) > 0 &&
STREQ(listenAddress, "::")) { virSocketAddrIsWildcard(&addr)))
if (reformatted)
VIR_FREE(listenAddress);
listenAddress = cookie->remoteHostname; listenAddress = cookie->remoteHostname;
}
ret = qemuDomainObjEnterMonitorAsync(driver, vm, ret = qemuDomainObjEnterMonitorAsync(driver, vm,
QEMU_ASYNC_JOB_MIGRATION_OUT); QEMU_ASYNC_JOB_MIGRATION_OUT);