mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-25 03:43:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

migration: convert tcp socket protocol to use QIOChannel

Browse Source 
Drop the current TCP socket migration driver and extend
the new generic socket driver to cope with the TCP address
format

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1461751518-12128-15-git-send-email-berrange@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-04-27 11:05:04 +01:00 committed by Amit Shah
parent 6f860ae755
commit e65c67e4da
3 changed files with 32 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration/Makefile.objs
View File

@ -1,4 +1,4 @@
common-obj-y += migration.o tcp.o socket.o
common-obj-y += migration.o socket.o
common-obj-y += vmstate.o
common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o
common-obj-y += qemu-file-channel.o

31
migration/socket.c
View File

@ -25,6 +25,23 @@
#include "trace.h"
static SocketAddress *tcp_build_address(const char *host_port, Error **errp)
{
InetSocketAddress *iaddr = inet_parse(host_port, errp);
SocketAddress *saddr;
if (!iaddr) {
return NULL;
}
saddr = g_new0(SocketAddress, 1);
saddr->type = SOCKET_ADDRESS_KIND_INET;
saddr->u.inet.data = iaddr;
return saddr;
}
static SocketAddress *unix_build_address(const char *path)
{
SocketAddress *saddr;
@ -69,6 +86,14 @@ static void socket_start_outgoing_migration(MigrationState *s,
qapi_free_SocketAddress(saddr);
}
void tcp_start_outgoing_migration(MigrationState *s,
const char *host_port,
Error **errp)
{
SocketAddress *saddr = tcp_build_address(host_port, errp);
socket_start_outgoing_migration(s, saddr, errp);
}
void unix_start_outgoing_migration(MigrationState *s,
const char *path,
Error **errp)
@ -125,6 +150,12 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
qapi_free_SocketAddress(saddr);
}
void tcp_start_incoming_migration(const char *host_port, Error **errp)
{
SocketAddress *saddr = tcp_build_address(host_port, errp);
socket_start_incoming_migration(saddr, errp);
}
void unix_start_incoming_migration(const char *path, Error **errp)
{
SocketAddress *saddr = unix_build_address(path);

102
migration/tcp.c
View File

@ -1,102 +0,0 @@
/*
* QEMU live migration
*
* Copyright IBM, Corp. 2008
*
* Authors:
* Anthony Liguori <aliguori@us.ibm.com>
*
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/sockets.h"
#include "migration/migration.h"
#include "migration/qemu-file.h"
#include "block/block.h"
#include "qemu/main-loop.h"
//#define DEBUG_MIGRATION_TCP
#ifdef DEBUG_MIGRATION_TCP
#define DPRINTF(fmt, ...) \
do { printf("migration-tcp: " fmt, ## __VA_ARGS__); } while (0)
#else
#define DPRINTF(fmt, ...) \
do { } while (0)
#endif
static void tcp_wait_for_connect(int fd, Error *err, void *opaque)
{
MigrationState *s = opaque;
if (fd < 0) {
DPRINTF("migrate connect error: %s\n", error_get_pretty(err));
s->to_dst_file = NULL;
migrate_fd_error(s, err);
} else {
DPRINTF("migrate connect success\n");
s->to_dst_file = qemu_fopen_socket(fd, "wb");
migrate_fd_connect(s);
}
}
void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp)
{
inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, errp);
}
static void tcp_accept_incoming_migration(void *opaque)
{
struct sockaddr_in addr;
socklen_t addrlen = sizeof(addr);
int s = (intptr_t)opaque;
QEMUFile *f;
int c;
do {
c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
} while (c < 0 && errno == EINTR);
qemu_set_fd_handler(s, NULL, NULL, NULL);
closesocket(s);
DPRINTF("accepted migration\n");
if (c < 0) {
error_report("could not accept migration connection (%s)",
strerror(errno));
return;
}
f = qemu_fopen_socket(c, "rb");
if (f == NULL) {
error_report("could not qemu_fopen socket");
goto out;
}
process_incoming_migration(f);
return;
out:
closesocket(c);
}
void tcp_start_incoming_migration(const char *host_port, Error **errp)
{
int s;
s = inet_listen(host_port, NULL, 256, SOCK_STREAM, 0, errp);
if (s < 0) {
return;
}
qemu_set_fd_handler(s, tcp_accept_incoming_migration, NULL,
(void *)(intptr_t)s);
}