From patchwork Wed Apr 21 05:57:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 93816 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3L62Lml005310 for ; Wed, 21 Apr 2010 06:02:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752490Ab0DUGCf (ORCPT ); Wed, 21 Apr 2010 02:02:35 -0400 Received: from sh.osrg.net ([192.16.179.4]:58784 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752068Ab0DUGCC (ORCPT ); Wed, 21 Apr 2010 02:02:02 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o3L61Qhb004086; Wed, 21 Apr 2010 15:01:26 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 3106D3E02F6; Wed, 21 Apr 2010 15:01:25 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: avi@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ohmura.kei@lab.ntt.co.jp, yoshikawa.takuya@oss.ntt.co.jp, Yoshiaki Tamura Subject: [RFC PATCH 09/20] Introduce writev and read to FdMigrationState. Date: Wed, 21 Apr 2010 14:57:14 +0900 Message-Id: <1271829445-5328-10-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 114 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 21 Apr 2010 06:02:43 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 21 Apr 2010 15:01:26 +0900 (JST) X-Virus-Scanned: clamav-milter 0.95.3 at sh X-Virus-Status: Clean Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/migration-tcp.c b/migration-tcp.c index e7f307c..56e1a3b 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -39,6 +39,24 @@ static int socket_write(FdMigrationState *s, const void * buf, size_t size) return send(s->fd, buf, size, 0); } +static int socket_read(FdMigrationState *s, const void * buf, size_t size) +{ + ssize_t len; + + do { + len = recv(s->fd, (void *)buf, size, 0); + } while (len == -1 && socket_error() == EINTR); + if (len == -1) + len = -socket_error(); + + return len; +} + +static int socket_writev(FdMigrationState *s, const struct iovec *v, int count) +{ + return writev(s->fd, v, count); +} + static int tcp_close(FdMigrationState *s) { DPRINTF("tcp_close\n"); @@ -94,6 +112,8 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, s->get_error = socket_errno; s->write = socket_write; + s->writev = socket_writev; + s->read = socket_read; s->close = tcp_close; s->mig_state.cancel = migrate_fd_cancel; s->mig_state.get_status = migrate_fd_get_status; diff --git a/migration.c b/migration.c index 05f6cc5..5d238f5 100644 --- a/migration.c +++ b/migration.c @@ -337,6 +337,33 @@ ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size) return ret; } +int migrate_fd_get_buffer(void *opaque, uint8_t *data, int64_t pos, int size) +{ + FdMigrationState *s = opaque; + ssize_t ret; + ret = s->read(s, data, size); + + if (ret == -1) + ret = -(s->get_error(s)); + + return ret; +} + +ssize_t migrate_fd_put_vector(void *opaque, const struct iovec *vector, int count) +{ + FdMigrationState *s = opaque; + ssize_t ret; + + do { + ret = s->writev(s, vector, count); + } while (ret == -1 && ((s->get_error(s)) == EINTR)); + + if (ret == -1) + ret = -(s->get_error(s)); + + return ret; +} + void migrate_fd_connect(FdMigrationState *s) { int ret; diff --git a/migration.h b/migration.h index 385423f..ddc1d42 100644 --- a/migration.h +++ b/migration.h @@ -47,6 +47,8 @@ struct FdMigrationState int (*get_error)(struct FdMigrationState*); int (*close)(struct FdMigrationState*); int (*write)(struct FdMigrationState*, const void *, size_t); + int (*writev)(struct FdMigrationState*, const struct iovec *, int); + int (*read)(struct FdMigrationState *, const void *, size_t); void *opaque; }; @@ -113,6 +115,10 @@ void migrate_fd_put_notify(void *opaque); ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size); +ssize_t migrate_fd_put_vector(void *opaque, const struct iovec *iov, int count); + +int migrate_fd_get_buffer(void *opaque, uint8_t *data, int64_t pos, int size); + void migrate_fd_connect(FdMigrationState *s); void migrate_fd_put_ready(void *opaque);