External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 14:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: fix NBD migration to hosts with IPv6 enabled

Browse Source 
Since f03dcc5 we use [::] as the listening address both on qemu
command line in -incoming and in nbd-server-start QMP command.
However the latter requires just :: without the braces.
(cherry picked from commit 2326006410)
This commit is contained in:
Ján Tomko 2013-05-23 15:51:05 +02:00 committed by Cole Robinson
parent b4541a2f3d
commit 3accd7eb25
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_migration.c
View File

@ -1114,6 +1114,12 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver,
unsigned short port = 0; unsigned short port = 0;
char *diskAlias = NULL; char *diskAlias = NULL;
size_t i; size_t i;
const char *host;
if (STREQ(listenAddr, "[::]"))
host = "::";
else
host = listenAddr;
for (i = 0; i < vm->def->ndisks; i++) { for (i = 0; i < vm->def->ndisks; i++) {
virDomainDiskDefPtr disk = vm->def->disks[i]; virDomainDiskDefPtr disk = vm->def->disks[i];
@ -1135,7 +1141,7 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver,
if (!port && if (!port &&
((virPortAllocatorAcquire(driver->remotePorts, &port) < 0) || ((virPortAllocatorAcquire(driver->remotePorts, &port) < 0) ||
(qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0))) { (qemuMonitorNBDServerStart(priv->mon, host, port) < 0))) {
qemuDomainObjExitMonitor(driver, vm); qemuDomainObjExitMonitor(driver, vm);
goto cleanup; goto cleanup;
} }