From: "Michael R. Hines" <mrhines@linux.vnet.ibm.com>
To: Lei Li <lilei@linux.vnet.ibm.com>
Cc: aarcange@redhat.com, aliguori@us.ibm.com, quintela@redhat.com,
qemu-devel@nongnu.org, lagarcia@br.ibm.com, pbonzini@redhat.com,
rcj@linux.vnet.ibm.com
Subject: Re: [Qemu-devel] [PATCH 10/18] migration-local: implementation of outgoing part
Date: Thu, 22 Aug 2013 16:49:40 -0400 [thread overview]
Message-ID: <52167964.8030901@linux.vnet.ibm.com> (raw)
In-Reply-To: <1377069536-12658-11-git-send-email-lilei@linux.vnet.ibm.com>
On 08/21/2013 03:18 AM, Lei Li wrote:
> Implementation of outgoing part for localhost migration.
> The integration of migration thread and corresponding
> adjustment will be in coming patches.
>
> Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
> ---
> include/migration/migration.h | 2 +
> migration-local.c | 85 +++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 87 insertions(+), 0 deletions(-)
>
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index 5336117..d2c7eff 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -92,6 +92,8 @@ void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **
>
> void rdma_start_incoming_migration(const char *host_port, Error **errp);
>
> +void local_start_outgoing_migration(void *opaque, const char *uri, Error **errp);
> +
> void migrate_fd_error(MigrationState *s);
>
> void migrate_fd_connect(MigrationState *s);
> diff --git a/migration-local.c b/migration-local.c
> index 93190fd..cf4a091 100644
> --- a/migration-local.c
> +++ b/migration-local.c
> @@ -209,3 +209,88 @@ static void *qemu_fopen_local(int fd, const char *mode)
>
> return s->file;
> }
> +
> +/************************************************************************
> + * Outgoing part
> + **/
> +
> +static QEMUFileLocal *local_migration_init(void)
> +{
> + QEMUFileLocal *s = g_malloc0(sizeof(*s));
> +
> + s->state = MIG_STATE_SETUP;
> + trace_migrate_set_state(MIG_STATE_SETUP);
> + s->fd = -1;
> + s->last_block_sent = NULL;
> +
> + return s;
> +}
> +
migration.c already does this. Is there some reason why you need to
access the state machine?
If you have a custom initial values, you should change
migrate_get_current, not create your own init().
> +static void unix_local_wait_for_connect(int fd, void *opaque)
> +{
> + MigrationState *s = opaque;
> +
> + if (fd < 0) {
> + DPRINTF("migrate connect error\n");
> + s->file = NULL;
> + migrate_fd_error(s);
> + } else {
> + DPRINTF("migrate connect success\n");
> + s->file = qemu_fopen_local(fd, "wb");
> + migrate_fd_connect(s);
> + }
> +}
> +
> +static void unix_local_outgoing_connect(MigrationState *s, const char *path,
> + Error **errp)
> +{
> + unix_nonblocking_connect(path, unix_local_wait_for_connect, s, errp);
> +}
> +
> +void local_start_outgoing_migration(void *opaque, const char *uri,
> + Error **errp)
> +{
> + MigrationState *s = opaque;
> + const char *path;
> + QEMUFileLocal *local;
> + Error *local_err = NULL;
> + int is_vm_running;
> + int ret;
> +
> + local = local_migration_init();
> + if (local == NULL) {
> + error_setg(errp, "Failed to initialize\n");
> + }
> +
> + bdrv_flush_all();
> +
> + is_vm_running = runstate_is_running();
> +
> + /* Stop the VM first */
> + if (is_vm_running) {
> + ret = vm_stop(RUN_STATE_SAVE_VM);
> + if (ret < 0) {
> + goto fail;
> + }
> + }
> +
What is this for? The migration_thread() already does this work for you.....
Are you trying to avoid pre-copy? Pre-copy should not be bad for you.
> + /* Start outgoing migration via unix socket. */
> + if (uri) {
> + /* XXX. Creation of a new unix_start_outgoing_migration_* is
> + * not necessary, just for the first step. This will be replaced
> + * by vmsplice mechanism.
> + **/
> + unix_local_outgoing_connect(s, path, &local_err);
> + } else {
> + error_set(errp, QERR_INVALID_PARAMETER_VALUE,
> + "uri", "a valid migration protocol");
> + goto fail;
> + }
> +
> + return;
> +
> +fail:
> + error_propagate(errp, local_err);
> + g_free(local);
> + migrate_fd_error(s);
> +}
next prev parent reply other threads:[~2013-08-22 20:50 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 7:18 [Qemu-devel] [PATCH 0/18 RFC v3] Localhost migration Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 01/18] migration: export MIG_STATE_xxx flags Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 02/18] savevm: export qemu_save_device_state() Lei Li
2013-08-21 11:13 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 03/18] rename is_active to is_block_active Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 04/18] savevm: set right return value for qemu_file_rate_limit Lei Li
2013-08-21 10:42 ` Paolo Bonzini
2013-08-23 3:18 ` Lei Li
2013-08-23 5:34 ` Paolo Bonzini
2013-08-23 9:11 ` Lei Li
2013-08-23 9:14 ` Paolo Bonzini
2013-08-23 9:18 ` Lei Li
2013-08-23 9:22 ` Paolo Bonzini
2013-08-23 9:25 ` Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 05/18] savevm: add comments for qemu_file_get_error() Lei Li
2013-08-21 10:43 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 06/18] bugfix: wrong error set by ram_control_load_hook() Lei Li
2013-08-21 10:40 ` Paolo Bonzini
2013-08-23 3:22 ` Lei Li
2013-08-23 5:34 ` Paolo Bonzini
2013-08-23 6:31 ` Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 07/18] arch_init: export RAM_SAVE_xxx flags Lei Li
2013-08-21 10:49 ` Paolo Bonzini
2013-08-22 20:14 ` Michael R. Hines
2013-08-23 7:36 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 08/18] migration-local: introduce qemu_fopen_local() Lei Li
2013-08-22 20:42 ` Michael R. Hines
2013-08-23 7:44 ` Lei Li
2013-08-28 3:26 ` Lei Li
2013-08-28 6:37 ` Paolo Bonzini
2013-08-29 8:28 ` Lei Li
2013-08-29 14:05 ` Michael R. Hines
2013-08-21 7:18 ` [Qemu-devel] [PATCH 09/18] exec: export qemu_get_ram_block() Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 10/18] migration-local: implementation of outgoing part Lei Li
2013-08-21 10:44 ` Paolo Bonzini
2013-08-22 20:49 ` Michael R. Hines [this message]
2013-08-21 7:18 ` [Qemu-devel] [PATCH 11/18] migration: introduce capability localhost Lei Li
2013-08-21 15:08 ` Eric Blake
2013-08-28 4:22 ` Lei Li
2013-08-21 15:18 ` Paolo Bonzini
2013-08-22 20:50 ` Michael R. Hines
2013-08-23 7:40 ` Paolo Bonzini
2013-08-23 7:51 ` Lei Li
2013-08-23 8:01 ` Paolo Bonzini
2013-08-23 9:21 ` Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 12/18] arch_init: factor out ram_save_blocks() Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 13/18] arch_init: adjust ram_save_setup() for migrate_is_localhost Lei Li
2013-08-21 10:48 ` Paolo Bonzini
2013-08-23 6:25 ` Lei Li
2013-08-23 7:48 ` Paolo Bonzini
2013-08-23 7:57 ` Alex Bligh
2013-08-23 8:06 ` Paolo Bonzini
2013-08-23 9:00 ` Lei Li
2013-08-23 9:12 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 14/18] arch_init: skip migration_bitmap_sync for local migration Lei Li
2013-08-21 10:50 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 15/18] migration: adjust migration_thread " Lei Li
2013-08-21 10:47 ` Paolo Bonzini
2013-08-21 7:18 ` [Qemu-devel] [PATCH 16/18] migration-local: implementation of incoming part Lei Li
2013-08-21 7:18 ` Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 17/18] migration: add prefix for local migration to incoming migration Lei Li
2013-08-21 10:52 ` Paolo Bonzini
2013-08-23 14:02 ` Lei Li
2013-08-21 7:18 ` [Qemu-devel] [PATCH 18/18] hmp: better fomat for info migrate_capabilities 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=52167964.8030901@linux.vnet.ibm.com \
--to=mrhines@linux.vnet.ibm.com \
--cc=aarcange@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=lagarcia@br.ibm.com \
--cc=lilei@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).