From: Lei Li <lilei@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aarcange@redhat.com, Lei Li <lilei@linux.vnet.ibm.com>,
quintela@redhat.com, mdroth@linux.vnet.ibm.com,
mrhines@linux.vnet.ibm.com, aliguori@amazon.com,
lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 04/17] migration-local: add QEMUFileLocal with socket based QEMUFile
Date: Thu, 21 Nov 2013 17:11:27 +0800 [thread overview]
Message-ID: <1385025100-3191-5-git-send-email-lilei@linux.vnet.ibm.com> (raw)
In-Reply-To: <1385025100-3191-1-git-send-email-lilei@linux.vnet.ibm.com>
This patch adds QEMUFileLocal with copy of socket based QEMUFile, will
be used as the basis code for Unix socket protocol migration and page
flipping migration.
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
Makefile.target | 1 +
migration-local.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 122 insertions(+), 0 deletions(-)
create mode 100644 migration-local.c
diff --git a/Makefile.target b/Makefile.target
index af6ac7e..aa09960 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -117,6 +117,7 @@ obj-$(CONFIG_KVM) += kvm-all.o
obj-y += memory.o savevm.o cputlb.o
obj-y += memory_mapping.o
obj-y += dump.o
+obj-y += migration-local.o
LIBS+=$(libs_softmmu)
# xen support
diff --git a/migration-local.c b/migration-local.c
new file mode 100644
index 0000000..8b9e10e
--- /dev/null
+++ b/migration-local.c
@@ -0,0 +1,121 @@
+/*
+ * QEMU localhost migration with page flipping
+ *
+ * Copyright IBM, Corp. 2013
+ *
+ * Authors:
+ * Lei Li <lilei@linux.vnet.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#include "config-host.h"
+#include "qemu-common.h"
+#include "migration/migration.h"
+#include "exec/cpu-common.h"
+#include "config.h"
+#include "exec/cpu-all.h"
+#include "exec/memory.h"
+#include "exec/memory-internal.h"
+#include "monitor/monitor.h"
+#include "migration/qemu-file.h"
+#include "qemu/iov.h"
+#include "sysemu/arch_init.h"
+#include "sysemu/sysemu.h"
+#include "block/block.h"
+#include "qemu/sockets.h"
+#include "migration/block.h"
+#include "qemu/thread.h"
+#include "qmp-commands.h"
+#include "trace.h"
+#include "qemu/osdep.h"
+
+//#define DEBUG_MIGRATION_LOCAL
+
+#ifdef DEBUG_MIGRATION_LOCAL
+#define DPRINTF(fmt, ...) \
+ do { printf("migration-local: " fmt, ## __VA_ARGS__); } while (0)
+#else
+#define DPRINTF(fmt, ...) \
+ do { } while (0)
+#endif
+
+
+typedef struct QEMUFileLocal {
+ QEMUFile *file;
+ int sockfd;
+ int pipefd[2];
+ bool unix_page_flipping;
+} QEMUFileLocal;
+
+static int qemu_local_get_sockfd(void *opaque)
+{
+ QEMUFileLocal *s = opaque;
+
+ return s->sockfd;
+}
+
+static int qemu_local_get_buffer(void *opaque, uint8_t *buf,
+ int64_t pos, int size)
+{
+ QEMUFileLocal *s = opaque;
+ ssize_t len;
+
+ for (;;) {
+ len = qemu_recv(s->sockfd, buf, size, 0);
+ if (len != -1) {
+ break;
+ }
+
+ if (socket_error() == EAGAIN) {
+ yield_until_fd_readable(s->sockfd);
+ } else if (socket_error() != EINTR) {
+ break;
+ }
+ }
+
+ if (len == -1) {
+ len = -socket_error();
+ }
+
+ return len;
+}
+
+static ssize_t qemu_local_writev_buffer(void *opaque, struct iovec *iov,
+ int iovcnt, int64_t pos)
+{
+ QEMUFileLocal *s = opaque;
+ ssize_t len;
+ ssize_t size = iov_size(iov, iovcnt);
+
+ len = iov_send(s->sockfd, iov, iovcnt, 0, size);
+ if (len < size) {
+ len = -socket_error();
+ }
+
+ return len;
+}
+
+static int qemu_local_close(void *opaque)
+{
+ QEMUFileLocal *s = opaque;
+
+ closesocket(s->sockfd);
+ g_free(s);
+
+ return 0;
+}
+
+static const QEMUFileOps pipe_read_ops = {
+ .get_fd = qemu_local_get_sockfd,
+ .get_buffer = qemu_local_get_buffer,
+ .close = qemu_local_close,
+};
+
+static const QEMUFileOps pipe_write_ops = {
+ .get_fd = qemu_local_get_sockfd,
+ .writev_buffer = qemu_local_writev_buffer,
+ .close = qemu_local_close,
+};
--
1.7.7.6
next prev parent reply other threads:[~2013-11-21 9:12 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-21 9:11 [Qemu-devel] [PATCH 0/17 v3] Localhost migration with side channel for ram Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 01/17] QAPI: introduce migration capability unix_page_flipping Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 02/17] migration: add migrate_unix_page_flipping() Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 03/17] qmp-command.hx: add missing docs for migration capabilites Lei Li
2013-11-21 9:11 ` Lei Li [this message]
2013-11-21 9:11 ` [Qemu-devel] [PATCH 05/17] migration-local: introduce qemu_fopen_socket_local() Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 06/17] migration-local: add send_pipefd() Lei Li
2013-11-26 11:26 ` Paolo Bonzini
2013-11-21 9:11 ` [Qemu-devel] [PATCH 07/17] migration-local: override before_ram_iterate to send pipefd Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 08/17] add unix_msgfd_lookup() to callback get_buffer Lei Li
2013-11-26 11:30 ` Lei Li
2013-11-26 11:31 ` Paolo Bonzini
2013-11-26 14:00 ` Lei Li
2013-11-26 14:14 ` Paolo Bonzini
2013-11-21 9:11 ` [Qemu-devel] [PATCH 09/17] save_page: replace block_offset with a MemoryRegion Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 10/17] migration-local: override save_page for page transmit Lei Li
2013-11-26 11:22 ` Paolo Bonzini
2013-11-26 12:10 ` Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 11/17] savevm: adjust ram_control_save_page for page flipping Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 12/17] migration-local: override hook_ram_load Lei Li
2013-11-26 11:25 ` Paolo Bonzini
2013-11-26 12:11 ` Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_MEMORY_STALE Lei Li
2013-11-26 12:28 ` Paolo Bonzini
2013-11-26 14:02 ` Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 15/17] migration-unix: page flipping support on unix outgoing Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 16/17] migration: adjust migration_thread() process for page flipping Lei Li
2013-11-26 11:32 ` Paolo Bonzini
2013-11-26 12:03 ` Lei Li
2013-11-26 12:54 ` Paolo Bonzini
2013-11-26 13:53 ` Lei Li
2013-11-26 14:11 ` Paolo Bonzini
2013-11-28 8:19 ` Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 17/17] hmp: better format for info migrate_capabilities Lei Li
2013-11-21 10:19 ` [Qemu-devel] [PATCH 0/17 v3] Localhost migration with side channel for ram Daniel P. Berrange
2013-11-22 11:29 ` Lei Li
2013-11-22 11:36 ` Paolo Bonzini
2013-11-25 7:29 ` Lei Li
2013-11-25 9:48 ` Paolo Bonzini
2013-11-26 11:07 ` Lei Li
2013-11-26 11:17 ` Paolo Bonzini
2013-11-27 16:48 ` Andrea Arcangeli
2013-11-22 11:36 ` Daniel P. Berrange
-- strict thread matches above, loose matches on Subject: below --
2013-11-29 10:06 [Qemu-devel] [PATCH 0/17 v4] " Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 04/17] migration-local: add QEMUFileLocal with socket based QEMUFile Lei Li
2013-12-02 9:19 [Qemu-devel] [PATCH 0/17 v5] Localhost migration with side channel for ram Lei Li
2013-12-02 9:19 ` [Qemu-devel] [PATCH 04/17] migration-local: add QEMUFileLocal with socket based QEMUFile Lei Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1385025100-3191-5-git-send-email-lilei@linux.vnet.ibm.com \
--to=lilei@linux.vnet.ibm.com \
--cc=aarcange@redhat.com \
--cc=aliguori@amazon.com \
--cc=lagarcia@br.ibm.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mrhines@linux.vnet.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rcj@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).