From patchwork Fri Oct 19 13:31:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 192712 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C83CB2C0090 for ; Sat, 20 Oct 2012 01:04:40 +1100 (EST) Received: from localhost ([::1]:37767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPChe-00065M-9H for incoming@patchwork.ozlabs.org; Fri, 19 Oct 2012 09:33:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPChF-0005Ef-D2 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:33:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPChD-0006R1-Sv for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:33:05 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:36749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPChD-0006Qo-Jc for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:33:03 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so437208pbb.4 for ; Fri, 19 Oct 2012 06:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=Jvps7Dqz0rBwHIM55zykIz6vJdacU6tA4vWSxQ2m6Fc=; b=GAZbHTR3h9wxdy4yzJVcgC8y2vtErlwotrsiDW9mz9pOR/ssdeXwSir6Z9GmmzeB2T vi676JHFas+628FN8fWgh09lx6fSJsVj73AyrpRwir8pAmGouFgU8/wbGwnzNLyObc5V HTOLCe7puWUedD7YRcKSj4HmZck4qKSx681NstpFwm3Qz7c8285nc+Z9ariEfPvjXhdN PKE3vXY1xO4/+O764BN/l6LzusjhuRIQzulzAdC1pABbDuJ7tBGCMUDZIXTWfU1/udA6 rt1B2iH0gcLJadaeyFgQajSm73zsMO0F+8YSWboRwQbnVNomJbIgxMj9eLenqA/4SsCU mMAg== Received: by 10.68.196.170 with SMTP id in10mr6068216pbc.0.1350653582838; Fri, 19 Oct 2012 06:33:02 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id kr4sm1240726pbc.76.2012.10.19.06.32.58 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 06:33:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 19 Oct 2012 15:31:46 +0200 Message-Id: <1350653528-5834-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1350653528-5834-1-git-send-email-pbonzini@redhat.com> References: <1350653528-5834-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Subject: [Qemu-devel] [PATCH 07/29] migration: use qemu-sockets to establish Unix sockets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This makes migration-unix.c again a cut-and-paste job from migration-tcp.c, exactly as it was in the beginning. :) Signed-off-by: Paolo Bonzini --- migration-unix.c | 94 ++++++++++---------------------------------------------- migration.c | 4 +-- migration.h | 4 +-- 3 file modificati, 21 inserzioni(+), 81 rimozioni(-) diff --git a/migration-unix.c b/migration-unix.c index d349662..5387c21 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -53,67 +53,34 @@ static int unix_close(MigrationState *s) return r; } -static void unix_wait_for_connect(void *opaque) +static void unix_wait_for_connect(int fd, void *opaque) { MigrationState *s = opaque; - int val, ret; - socklen_t valsize = sizeof(val); - DPRINTF("connect completed\n"); - do { - ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *) &val, &valsize); - } while (ret == -1 && errno == EINTR); - - if (ret < 0) { + if (fd < 0) { + DPRINTF("migrate connect error\n"); + s->fd = -1; migrate_fd_error(s); - return; - } - - qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); - - if (val == 0) + } else { + DPRINTF("migrate connect success\n"); + s->fd = fd; migrate_fd_connect(s); - else { - DPRINTF("error connecting %d\n", val); - migrate_fd_error(s); } } -int unix_start_outgoing_migration(MigrationState *s, const char *path) +int unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp) { - struct sockaddr_un addr; - int ret; + Error *local_err = NULL; - addr.sun_family = AF_UNIX; - snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", path); s->get_error = unix_errno; s->write = unix_write; s->close = unix_close; - s->fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0); - if (s->fd == -1) { - DPRINTF("Unable to open socket"); - return -errno; - } - - socket_set_nonblock(s->fd); - - do { - ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); - if (ret == -1) { - ret = -errno; - } - if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) { - qemu_set_fd_handler2(s->fd, NULL, NULL, unix_wait_for_connect, s); - return 0; - } - } while (ret == -EINTR); - - if (ret < 0) { - DPRINTF("connect failed\n"); - return ret; + s->fd = unix_nonblocking_connect(path, unix_wait_for_connect, s, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return -1; } - migrate_fd_connect(s); return 0; } @@ -151,43 +118,16 @@ out2: close(s); } -int unix_start_incoming_migration(const char *path) +int unix_start_incoming_migration(const char *path, Error **errp) { - struct sockaddr_un addr; int s; - int ret; - - DPRINTF("Attempting to start an incoming migration\n"); - - s = qemu_socket(PF_UNIX, SOCK_STREAM, 0); - if (s == -1) { - fprintf(stderr, "Could not open unix socket: %s\n", strerror(errno)); - return -errno; - } - - memset(&addr, 0, sizeof(addr)); - addr.sun_family = AF_UNIX; - snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", path); - unlink(addr.sun_path); - if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - ret = -errno; - fprintf(stderr, "bind(unix:%s): %s\n", addr.sun_path, strerror(errno)); - goto err; - } - if (listen(s, 1) == -1) { - fprintf(stderr, "listen(unix:%s): %s\n", addr.sun_path, - strerror(errno)); - ret = -errno; - goto err; + s = unix_listen(path, NULL, 0, errp); + if (s < 0) { + return -1; } qemu_set_fd_handler2(s, NULL, unix_accept_incoming_migration, NULL, (void *)(intptr_t)s); - return 0; - -err: - close(s); - return ret; } diff --git a/migration.c b/migration.c index a56358e..767e297 100644 --- a/migration.c +++ b/migration.c @@ -75,7 +75,7 @@ int qemu_start_incoming_migration(const char *uri, Error **errp) else if (strstart(uri, "exec:", &p)) ret = exec_start_incoming_migration(p); else if (strstart(uri, "unix:", &p)) - ret = unix_start_incoming_migration(p); + ret = unix_start_incoming_migration(p, errp); else if (strstart(uri, "fd:", &p)) ret = fd_start_incoming_migration(p); #endif @@ -512,7 +512,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, } else if (strstart(uri, "exec:", &p)) { ret = exec_start_outgoing_migration(s, p); } else if (strstart(uri, "unix:", &p)) { - ret = unix_start_outgoing_migration(s, p); + ret = unix_start_outgoing_migration(s, p, &local_err); } else if (strstart(uri, "fd:", &p)) { ret = fd_start_outgoing_migration(s, p); #endif diff --git a/migration.h b/migration.h index a9852fc..e0612a3 100644 --- a/migration.h +++ b/migration.h @@ -63,9 +63,9 @@ int tcp_start_incoming_migration(const char *host_port, Error **errp); int tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp); -int unix_start_incoming_migration(const char *path); +int unix_start_incoming_migration(const char *path, Error **errp); -int unix_start_outgoing_migration(MigrationState *s, const char *path); +int unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp); int fd_start_incoming_migration(const char *path);