migration: rename 'file' in MigrationState to 'to_dst_file'
Rename the 'file' member of MigrationState to 'to_dst_file' to be consistent with to_src_file, from_src_file and from_dst_file. Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Amit Shah <amit.shah@redhat.com> Message-Id: <1452829066-9764-3-git-send-email-zhang.zhanghailiang@huawei.com> Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
parent
4c4bad4861
commit
89a02a9f7b
|
@ -133,7 +133,7 @@ struct MigrationState
|
||||||
size_t xfer_limit;
|
size_t xfer_limit;
|
||||||
QemuThread thread;
|
QemuThread thread;
|
||||||
QEMUBH *cleanup_bh;
|
QEMUBH *cleanup_bh;
|
||||||
QEMUFile *file;
|
QEMUFile *to_dst_file;
|
||||||
int parameters[MIGRATION_PARAMETER__MAX];
|
int parameters[MIGRATION_PARAMETER__MAX];
|
||||||
|
|
||||||
int state;
|
int state;
|
||||||
|
|
|
@ -36,8 +36,8 @@
|
||||||
|
|
||||||
void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp)
|
void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp)
|
||||||
{
|
{
|
||||||
s->file = qemu_popen_cmd(command, "w");
|
s->to_dst_file = qemu_popen_cmd(command, "w");
|
||||||
if (s->file == NULL) {
|
if (s->to_dst_file == NULL) {
|
||||||
error_setg_errno(errp, errno, "failed to popen the migration target");
|
error_setg_errno(errp, errno, "failed to popen the migration target");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,9 +51,9 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fd_is_socket(fd)) {
|
if (fd_is_socket(fd)) {
|
||||||
s->file = qemu_fopen_socket(fd, "wb");
|
s->to_dst_file = qemu_fopen_socket(fd, "wb");
|
||||||
} else {
|
} else {
|
||||||
s->file = qemu_fdopen(fd, "wb");
|
s->to_dst_file = qemu_fdopen(fd, "wb");
|
||||||
}
|
}
|
||||||
|
|
||||||
migrate_fd_connect(s);
|
migrate_fd_connect(s);
|
||||||
|
|
|
@ -809,7 +809,7 @@ static void migrate_fd_cleanup(void *opaque)
|
||||||
|
|
||||||
flush_page_queue(s);
|
flush_page_queue(s);
|
||||||
|
|
||||||
if (s->file) {
|
if (s->to_dst_file) {
|
||||||
trace_migrate_fd_cleanup();
|
trace_migrate_fd_cleanup();
|
||||||
qemu_mutex_unlock_iothread();
|
qemu_mutex_unlock_iothread();
|
||||||
if (s->migration_thread_running) {
|
if (s->migration_thread_running) {
|
||||||
|
@ -819,8 +819,8 @@ static void migrate_fd_cleanup(void *opaque)
|
||||||
qemu_mutex_lock_iothread();
|
qemu_mutex_lock_iothread();
|
||||||
|
|
||||||
migrate_compress_threads_join();
|
migrate_compress_threads_join();
|
||||||
qemu_fclose(s->file);
|
qemu_fclose(s->to_dst_file);
|
||||||
s->file = NULL;
|
s->to_dst_file = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
assert((s->state != MIGRATION_STATUS_ACTIVE) &&
|
assert((s->state != MIGRATION_STATUS_ACTIVE) &&
|
||||||
|
@ -837,7 +837,7 @@ static void migrate_fd_cleanup(void *opaque)
|
||||||
void migrate_fd_error(MigrationState *s)
|
void migrate_fd_error(MigrationState *s)
|
||||||
{
|
{
|
||||||
trace_migrate_fd_error();
|
trace_migrate_fd_error();
|
||||||
assert(s->file == NULL);
|
assert(s->to_dst_file == NULL);
|
||||||
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
|
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
|
||||||
MIGRATION_STATUS_FAILED);
|
MIGRATION_STATUS_FAILED);
|
||||||
notifier_list_notify(&migration_state_notifiers, s);
|
notifier_list_notify(&migration_state_notifiers, s);
|
||||||
|
@ -846,7 +846,7 @@ void migrate_fd_error(MigrationState *s)
|
||||||
static void migrate_fd_cancel(MigrationState *s)
|
static void migrate_fd_cancel(MigrationState *s)
|
||||||
{
|
{
|
||||||
int old_state ;
|
int old_state ;
|
||||||
QEMUFile *f = migrate_get_current()->file;
|
QEMUFile *f = migrate_get_current()->to_dst_file;
|
||||||
trace_migrate_fd_cancel();
|
trace_migrate_fd_cancel();
|
||||||
|
|
||||||
if (s->rp_state.from_dst_file) {
|
if (s->rp_state.from_dst_file) {
|
||||||
|
@ -917,7 +917,7 @@ MigrationState *migrate_init(const MigrationParams *params)
|
||||||
s->bytes_xfer = 0;
|
s->bytes_xfer = 0;
|
||||||
s->xfer_limit = 0;
|
s->xfer_limit = 0;
|
||||||
s->cleanup_bh = 0;
|
s->cleanup_bh = 0;
|
||||||
s->file = NULL;
|
s->to_dst_file = NULL;
|
||||||
s->state = MIGRATION_STATUS_NONE;
|
s->state = MIGRATION_STATUS_NONE;
|
||||||
s->params = *params;
|
s->params = *params;
|
||||||
s->rp_state.from_dst_file = NULL;
|
s->rp_state.from_dst_file = NULL;
|
||||||
|
@ -1096,8 +1096,9 @@ void qmp_migrate_set_speed(int64_t value, Error **errp)
|
||||||
|
|
||||||
s = migrate_get_current();
|
s = migrate_get_current();
|
||||||
s->bandwidth_limit = value;
|
s->bandwidth_limit = value;
|
||||||
if (s->file) {
|
if (s->to_dst_file) {
|
||||||
qemu_file_set_rate_limit(s->file, s->bandwidth_limit / XFER_LIMIT_RATIO);
|
qemu_file_set_rate_limit(s->to_dst_file,
|
||||||
|
s->bandwidth_limit / XFER_LIMIT_RATIO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1367,7 +1368,7 @@ out:
|
||||||
static int open_return_path_on_source(MigrationState *ms)
|
static int open_return_path_on_source(MigrationState *ms)
|
||||||
{
|
{
|
||||||
|
|
||||||
ms->rp_state.from_dst_file = qemu_file_get_return_path(ms->file);
|
ms->rp_state.from_dst_file = qemu_file_get_return_path(ms->to_dst_file);
|
||||||
if (!ms->rp_state.from_dst_file) {
|
if (!ms->rp_state.from_dst_file) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -1389,7 +1390,7 @@ static int await_return_path_close_on_source(MigrationState *ms)
|
||||||
* rp_thread will exit, however if there's an error we need to cause
|
* rp_thread will exit, however if there's an error we need to cause
|
||||||
* it to exit.
|
* it to exit.
|
||||||
*/
|
*/
|
||||||
if (qemu_file_get_error(ms->file) && ms->rp_state.from_dst_file) {
|
if (qemu_file_get_error(ms->to_dst_file) && ms->rp_state.from_dst_file) {
|
||||||
/*
|
/*
|
||||||
* shutdown(2), if we have it, will cause it to unblock if it's stuck
|
* shutdown(2), if we have it, will cause it to unblock if it's stuck
|
||||||
* waiting for the destination.
|
* waiting for the destination.
|
||||||
|
@ -1436,7 +1437,7 @@ static int postcopy_start(MigrationState *ms, bool *old_vm_running)
|
||||||
* Cause any non-postcopiable, but iterative devices to
|
* Cause any non-postcopiable, but iterative devices to
|
||||||
* send out their final data.
|
* send out their final data.
|
||||||
*/
|
*/
|
||||||
qemu_savevm_state_complete_precopy(ms->file, true);
|
qemu_savevm_state_complete_precopy(ms->to_dst_file, true);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* in Finish migrate and with the io-lock held everything should
|
* in Finish migrate and with the io-lock held everything should
|
||||||
|
@ -1454,9 +1455,9 @@ static int postcopy_start(MigrationState *ms, bool *old_vm_running)
|
||||||
* will notice we're in POSTCOPY_ACTIVE and not actually
|
* will notice we're in POSTCOPY_ACTIVE and not actually
|
||||||
* wrap their state up here
|
* wrap their state up here
|
||||||
*/
|
*/
|
||||||
qemu_file_set_rate_limit(ms->file, INT64_MAX);
|
qemu_file_set_rate_limit(ms->to_dst_file, INT64_MAX);
|
||||||
/* Ping just for debugging, helps line traces up */
|
/* Ping just for debugging, helps line traces up */
|
||||||
qemu_savevm_send_ping(ms->file, 2);
|
qemu_savevm_send_ping(ms->to_dst_file, 2);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* While loading the device state we may trigger page transfer
|
* While loading the device state we may trigger page transfer
|
||||||
|
@ -1490,7 +1491,7 @@ static int postcopy_start(MigrationState *ms, bool *old_vm_running)
|
||||||
qsb = qemu_buf_get(fb);
|
qsb = qemu_buf_get(fb);
|
||||||
|
|
||||||
/* Now send that blob */
|
/* Now send that blob */
|
||||||
if (qemu_savevm_send_packaged(ms->file, qsb)) {
|
if (qemu_savevm_send_packaged(ms->to_dst_file, qsb)) {
|
||||||
goto fail_closefb;
|
goto fail_closefb;
|
||||||
}
|
}
|
||||||
qemu_fclose(fb);
|
qemu_fclose(fb);
|
||||||
|
@ -1502,9 +1503,9 @@ static int postcopy_start(MigrationState *ms, bool *old_vm_running)
|
||||||
* Although this ping is just for debug, it could potentially be
|
* Although this ping is just for debug, it could potentially be
|
||||||
* used for getting a better measurement of downtime at the source.
|
* used for getting a better measurement of downtime at the source.
|
||||||
*/
|
*/
|
||||||
qemu_savevm_send_ping(ms->file, 4);
|
qemu_savevm_send_ping(ms->to_dst_file, 4);
|
||||||
|
|
||||||
ret = qemu_file_get_error(ms->file);
|
ret = qemu_file_get_error(ms->to_dst_file);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
error_report("postcopy_start: Migration stream errored");
|
error_report("postcopy_start: Migration stream errored");
|
||||||
migrate_set_state(&ms->state, MIGRATION_STATUS_POSTCOPY_ACTIVE,
|
migrate_set_state(&ms->state, MIGRATION_STATUS_POSTCOPY_ACTIVE,
|
||||||
|
@ -1550,8 +1551,8 @@ static void migration_completion(MigrationState *s, int current_active_state,
|
||||||
ret = bdrv_inactivate_all();
|
ret = bdrv_inactivate_all();
|
||||||
}
|
}
|
||||||
if (ret >= 0) {
|
if (ret >= 0) {
|
||||||
qemu_file_set_rate_limit(s->file, INT64_MAX);
|
qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX);
|
||||||
qemu_savevm_state_complete_precopy(s->file, false);
|
qemu_savevm_state_complete_precopy(s->to_dst_file, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
qemu_mutex_unlock_iothread();
|
qemu_mutex_unlock_iothread();
|
||||||
|
@ -1562,7 +1563,7 @@ static void migration_completion(MigrationState *s, int current_active_state,
|
||||||
} else if (s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
|
} else if (s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
|
||||||
trace_migration_completion_postcopy_end();
|
trace_migration_completion_postcopy_end();
|
||||||
|
|
||||||
qemu_savevm_state_complete_postcopy(s->file);
|
qemu_savevm_state_complete_postcopy(s->to_dst_file);
|
||||||
trace_migration_completion_postcopy_end_after_complete();
|
trace_migration_completion_postcopy_end_after_complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1583,7 +1584,7 @@ static void migration_completion(MigrationState *s, int current_active_state,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qemu_file_get_error(s->file)) {
|
if (qemu_file_get_error(s->to_dst_file)) {
|
||||||
trace_migration_completion_file_err();
|
trace_migration_completion_file_err();
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
@ -1618,24 +1619,24 @@ static void *migration_thread(void *opaque)
|
||||||
|
|
||||||
rcu_register_thread();
|
rcu_register_thread();
|
||||||
|
|
||||||
qemu_savevm_state_header(s->file);
|
qemu_savevm_state_header(s->to_dst_file);
|
||||||
|
|
||||||
if (migrate_postcopy_ram()) {
|
if (migrate_postcopy_ram()) {
|
||||||
/* Now tell the dest that it should open its end so it can reply */
|
/* Now tell the dest that it should open its end so it can reply */
|
||||||
qemu_savevm_send_open_return_path(s->file);
|
qemu_savevm_send_open_return_path(s->to_dst_file);
|
||||||
|
|
||||||
/* And do a ping that will make stuff easier to debug */
|
/* And do a ping that will make stuff easier to debug */
|
||||||
qemu_savevm_send_ping(s->file, 1);
|
qemu_savevm_send_ping(s->to_dst_file, 1);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Tell the destination that we *might* want to do postcopy later;
|
* Tell the destination that we *might* want to do postcopy later;
|
||||||
* if the other end can't do postcopy it should fail now, nice and
|
* if the other end can't do postcopy it should fail now, nice and
|
||||||
* early.
|
* early.
|
||||||
*/
|
*/
|
||||||
qemu_savevm_send_postcopy_advise(s->file);
|
qemu_savevm_send_postcopy_advise(s->to_dst_file);
|
||||||
}
|
}
|
||||||
|
|
||||||
qemu_savevm_state_begin(s->file, &s->params);
|
qemu_savevm_state_begin(s->to_dst_file, &s->params);
|
||||||
|
|
||||||
s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
|
s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
|
||||||
current_active_state = MIGRATION_STATUS_ACTIVE;
|
current_active_state = MIGRATION_STATUS_ACTIVE;
|
||||||
|
@ -1649,10 +1650,10 @@ static void *migration_thread(void *opaque)
|
||||||
int64_t current_time;
|
int64_t current_time;
|
||||||
uint64_t pending_size;
|
uint64_t pending_size;
|
||||||
|
|
||||||
if (!qemu_file_rate_limit(s->file)) {
|
if (!qemu_file_rate_limit(s->to_dst_file)) {
|
||||||
uint64_t pend_post, pend_nonpost;
|
uint64_t pend_post, pend_nonpost;
|
||||||
|
|
||||||
qemu_savevm_state_pending(s->file, max_size, &pend_nonpost,
|
qemu_savevm_state_pending(s->to_dst_file, max_size, &pend_nonpost,
|
||||||
&pend_post);
|
&pend_post);
|
||||||
pending_size = pend_nonpost + pend_post;
|
pending_size = pend_nonpost + pend_post;
|
||||||
trace_migrate_pending(pending_size, max_size,
|
trace_migrate_pending(pending_size, max_size,
|
||||||
|
@ -1673,7 +1674,7 @@ static void *migration_thread(void *opaque)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
/* Just another iteration step */
|
/* Just another iteration step */
|
||||||
qemu_savevm_state_iterate(s->file, entered_postcopy);
|
qemu_savevm_state_iterate(s->to_dst_file, entered_postcopy);
|
||||||
} else {
|
} else {
|
||||||
trace_migration_thread_low_pending(pending_size);
|
trace_migration_thread_low_pending(pending_size);
|
||||||
migration_completion(s, current_active_state,
|
migration_completion(s, current_active_state,
|
||||||
|
@ -1682,7 +1683,7 @@ static void *migration_thread(void *opaque)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qemu_file_get_error(s->file)) {
|
if (qemu_file_get_error(s->to_dst_file)) {
|
||||||
migrate_set_state(&s->state, current_active_state,
|
migrate_set_state(&s->state, current_active_state,
|
||||||
MIGRATION_STATUS_FAILED);
|
MIGRATION_STATUS_FAILED);
|
||||||
trace_migration_thread_file_err();
|
trace_migration_thread_file_err();
|
||||||
|
@ -1690,7 +1691,8 @@ static void *migration_thread(void *opaque)
|
||||||
}
|
}
|
||||||
current_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
|
current_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
|
||||||
if (current_time >= initial_time + BUFFER_DELAY) {
|
if (current_time >= initial_time + BUFFER_DELAY) {
|
||||||
uint64_t transferred_bytes = qemu_ftell(s->file) - initial_bytes;
|
uint64_t transferred_bytes = qemu_ftell(s->to_dst_file) -
|
||||||
|
initial_bytes;
|
||||||
uint64_t time_spent = current_time - initial_time;
|
uint64_t time_spent = current_time - initial_time;
|
||||||
double bandwidth = (double)transferred_bytes / time_spent;
|
double bandwidth = (double)transferred_bytes / time_spent;
|
||||||
max_size = bandwidth * migrate_max_downtime() / 1000000;
|
max_size = bandwidth * migrate_max_downtime() / 1000000;
|
||||||
|
@ -1706,11 +1708,11 @@ static void *migration_thread(void *opaque)
|
||||||
s->expected_downtime = s->dirty_bytes_rate / bandwidth;
|
s->expected_downtime = s->dirty_bytes_rate / bandwidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
qemu_file_reset_rate_limit(s->file);
|
qemu_file_reset_rate_limit(s->to_dst_file);
|
||||||
initial_time = current_time;
|
initial_time = current_time;
|
||||||
initial_bytes = qemu_ftell(s->file);
|
initial_bytes = qemu_ftell(s->to_dst_file);
|
||||||
}
|
}
|
||||||
if (qemu_file_rate_limit(s->file)) {
|
if (qemu_file_rate_limit(s->to_dst_file)) {
|
||||||
/* usleep expects microseconds */
|
/* usleep expects microseconds */
|
||||||
g_usleep((initial_time + BUFFER_DELAY - current_time)*1000);
|
g_usleep((initial_time + BUFFER_DELAY - current_time)*1000);
|
||||||
}
|
}
|
||||||
|
@ -1724,7 +1726,7 @@ static void *migration_thread(void *opaque)
|
||||||
qemu_mutex_lock_iothread();
|
qemu_mutex_lock_iothread();
|
||||||
qemu_savevm_state_cleanup();
|
qemu_savevm_state_cleanup();
|
||||||
if (s->state == MIGRATION_STATUS_COMPLETED) {
|
if (s->state == MIGRATION_STATUS_COMPLETED) {
|
||||||
uint64_t transferred_bytes = qemu_ftell(s->file);
|
uint64_t transferred_bytes = qemu_ftell(s->to_dst_file);
|
||||||
s->total_time = end_time - s->total_time;
|
s->total_time = end_time - s->total_time;
|
||||||
if (!entered_postcopy) {
|
if (!entered_postcopy) {
|
||||||
s->downtime = end_time - start_time;
|
s->downtime = end_time - start_time;
|
||||||
|
@ -1752,7 +1754,7 @@ void migrate_fd_connect(MigrationState *s)
|
||||||
s->expected_downtime = max_downtime/1000000;
|
s->expected_downtime = max_downtime/1000000;
|
||||||
s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s);
|
s->cleanup_bh = qemu_bh_new(migrate_fd_cleanup, s);
|
||||||
|
|
||||||
qemu_file_set_rate_limit(s->file,
|
qemu_file_set_rate_limit(s->to_dst_file,
|
||||||
s->bandwidth_limit / XFER_LIMIT_RATIO);
|
s->bandwidth_limit / XFER_LIMIT_RATIO);
|
||||||
|
|
||||||
/* Notify before starting migration thread */
|
/* Notify before starting migration thread */
|
||||||
|
|
|
@ -725,7 +725,8 @@ void postcopy_discard_send_range(MigrationState *ms, PostcopyDiscardState *pds,
|
||||||
|
|
||||||
if (pds->cur_entry == MAX_DISCARDS_PER_COMMAND) {
|
if (pds->cur_entry == MAX_DISCARDS_PER_COMMAND) {
|
||||||
/* Full set, ship it! */
|
/* Full set, ship it! */
|
||||||
qemu_savevm_send_postcopy_ram_discard(ms->file, pds->ramblock_name,
|
qemu_savevm_send_postcopy_ram_discard(ms->to_dst_file,
|
||||||
|
pds->ramblock_name,
|
||||||
pds->cur_entry,
|
pds->cur_entry,
|
||||||
pds->start_list,
|
pds->start_list,
|
||||||
pds->length_list);
|
pds->length_list);
|
||||||
|
@ -745,7 +746,8 @@ void postcopy_discard_send_finish(MigrationState *ms, PostcopyDiscardState *pds)
|
||||||
{
|
{
|
||||||
/* Anything unsent? */
|
/* Anything unsent? */
|
||||||
if (pds->cur_entry) {
|
if (pds->cur_entry) {
|
||||||
qemu_savevm_send_postcopy_ram_discard(ms->file, pds->ramblock_name,
|
qemu_savevm_send_postcopy_ram_discard(ms->to_dst_file,
|
||||||
|
pds->ramblock_name,
|
||||||
pds->cur_entry,
|
pds->cur_entry,
|
||||||
pds->start_list,
|
pds->start_list,
|
||||||
pds->length_list);
|
pds->length_list);
|
||||||
|
|
|
@ -3504,7 +3504,7 @@ void rdma_start_outgoing_migration(void *opaque,
|
||||||
|
|
||||||
trace_rdma_start_outgoing_migration_after_rdma_connect();
|
trace_rdma_start_outgoing_migration_after_rdma_connect();
|
||||||
|
|
||||||
s->file = qemu_fopen_rdma(rdma, "wb");
|
s->to_dst_file = qemu_fopen_rdma(rdma, "wb");
|
||||||
migrate_fd_connect(s);
|
migrate_fd_connect(s);
|
||||||
return;
|
return;
|
||||||
err:
|
err:
|
||||||
|
|
|
@ -1163,7 +1163,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
|
||||||
.shared = 0
|
.shared = 0
|
||||||
};
|
};
|
||||||
MigrationState *ms = migrate_init(¶ms);
|
MigrationState *ms = migrate_init(¶ms);
|
||||||
ms->file = f;
|
ms->to_dst_file = f;
|
||||||
|
|
||||||
if (qemu_savevm_state_blocked(errp)) {
|
if (qemu_savevm_state_blocked(errp)) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
|
@ -39,11 +39,11 @@ static void tcp_wait_for_connect(int fd, Error *err, void *opaque)
|
||||||
|
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
DPRINTF("migrate connect error: %s\n", error_get_pretty(err));
|
DPRINTF("migrate connect error: %s\n", error_get_pretty(err));
|
||||||
s->file = NULL;
|
s->to_dst_file = NULL;
|
||||||
migrate_fd_error(s);
|
migrate_fd_error(s);
|
||||||
} else {
|
} else {
|
||||||
DPRINTF("migrate connect success\n");
|
DPRINTF("migrate connect success\n");
|
||||||
s->file = qemu_fopen_socket(fd, "wb");
|
s->to_dst_file = qemu_fopen_socket(fd, "wb");
|
||||||
migrate_fd_connect(s);
|
migrate_fd_connect(s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,11 +39,11 @@ static void unix_wait_for_connect(int fd, Error *err, void *opaque)
|
||||||
|
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
DPRINTF("migrate connect error: %s\n", error_get_pretty(err));
|
DPRINTF("migrate connect error: %s\n", error_get_pretty(err));
|
||||||
s->file = NULL;
|
s->to_dst_file = NULL;
|
||||||
migrate_fd_error(s);
|
migrate_fd_error(s);
|
||||||
} else {
|
} else {
|
||||||
DPRINTF("migrate connect success\n");
|
DPRINTF("migrate connect success\n");
|
||||||
s->file = qemu_fopen_socket(fd, "wb");
|
s->to_dst_file = qemu_fopen_socket(fd, "wb");
|
||||||
migrate_fd_connect(s);
|
migrate_fd_connect(s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue