External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 20:02:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Use virNetSocket for tunneled migration

Browse Source
This commit is contained in:
Jiri Denemark 2011-08-12 10:54:05 +02:00
parent 52e2918ae1
commit e8989ae4e2
1 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/qemu/qemu_migration.c
View File

@ -42,6 +42,7 @@
#include "fdstream.h" #include "fdstream.h"
#include "uuid.h" #include "uuid.h"
#include "locking/domain_lock.h" #include "locking/domain_lock.h"
#include "rpc/virnetsocket.h"
#define VIR_FROM_THIS VIR_FROM_QEMU #define VIR_FROM_THIS VIR_FROM_QEMU
@ -1627,9 +1628,8 @@ static int doTunnelMigrate(struct qemud_driver *driver,
unsigned long resource) unsigned long resource)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int qemu_sock = -1;
struct sockaddr_un sa_qemu;
char *unixfile = NULL; char *unixfile = NULL;
virNetSocketPtr sock = NULL;
int ret = -1; int ret = -1;
qemuMigrationSpec spec; qemuMigrationSpec spec;
@ -1651,45 +1651,14 @@ static int doTunnelMigrate(struct qemud_driver *driver,
goto cleanup; goto cleanup;
} }
qemu_sock = socket(AF_UNIX, SOCK_STREAM, 0); if (virNetSocketNewListenUNIX(unixfile, 0700,
if (qemu_sock < 0) { driver->user, driver->group, &sock) < 0 ||
virReportSystemError(errno, "%s", virNetSocketListen(sock, 1) < 0)
_("cannot open tunnelled migration socket"));
goto cleanup; goto cleanup;
}
memset(&sa_qemu, 0, sizeof(sa_qemu));
sa_qemu.sun_family = AF_UNIX;
if (virStrcpy(sa_qemu.sun_path, unixfile,
sizeof(sa_qemu.sun_path)) == NULL) {
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("Unix socket '%s' too big for destination"),
unixfile);
goto cleanup;
}
unlink(unixfile);
if (bind(qemu_sock, (struct sockaddr *)&sa_qemu, sizeof(sa_qemu)) < 0) {
virReportSystemError(errno,
_("Cannot bind to unix socket '%s' for tunnelled migration"),
unixfile);
goto cleanup;
}
if (listen(qemu_sock, 1) < 0) {
virReportSystemError(errno,
_("Cannot listen on unix socket '%s' for tunnelled migration"),
unixfile);
goto cleanup;
}
if (chown(unixfile, driver->user, driver->group) < 0) {
virReportSystemError(errno,
_("Cannot change unix socket '%s' owner"),
unixfile);
goto cleanup;
}
spec.destType = MIGRATION_DEST_UNIX; spec.destType = MIGRATION_DEST_UNIX;
spec.dest.unix_socket.file = unixfile; spec.dest.unix_socket.file = unixfile;
spec.dest.unix_socket.sock = qemu_sock; spec.dest.unix_socket.sock = virNetSocketGetFD(sock);
spec.fwdType = MIGRATION_FWD_STREAM; spec.fwdType = MIGRATION_FWD_STREAM;
spec.fwd.stream = st; spec.fwd.stream = st;
@ -1697,11 +1666,8 @@ static int doTunnelMigrate(struct qemud_driver *driver,
cookieoutlen, flags, resource, &spec); cookieoutlen, flags, resource, &spec);
cleanup: cleanup:
VIR_FORCE_CLOSE(qemu_sock); virNetSocketFree(sock);
if (unixfile) {
unlink(unixfile);
VIR_FREE(unixfile); VIR_FREE(unixfile);
}
return ret; return ret;
} }