mirror of
https://github.com/qemu/qemu.git
synced 2024-11-24 19:33:39 +08:00
49ed0d24a4
In our current code, when multifd is used during migration, if there is an error before the destination receives all new channels, the source keeps running, however the destination does not exit but keeps waiting until the source is killed deliberately. Fix this by dumping the specific error and let users decide whether to quit from the destination side when failing to receive packet via some channel. And update the comment for multifd_recv_new_channel(). Cc: Dr. David Alan Gilbert <dgilbert@redhat.com> Cc: Peter Xu <peterx@redhat.com> Cc: Markus Armbruster <armbru@redhat.com> Signed-off-by: Fei Li <fli@suse.com> Reviewed-by: Peter Xu <peterx@redhat.com> Message-Id: <20190113140849.38339-3-lifei1214@126.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
95 lines
2.7 KiB
C
95 lines
2.7 KiB
C
/*
|
|
* QEMU live migration channel operations
|
|
*
|
|
* Copyright Red Hat, Inc. 2016
|
|
*
|
|
* Authors:
|
|
* Daniel P. Berrange <berrange@redhat.com>
|
|
*
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "channel.h"
|
|
#include "tls.h"
|
|
#include "migration.h"
|
|
#include "qemu-file-channel.h"
|
|
#include "trace.h"
|
|
#include "qapi/error.h"
|
|
#include "io/channel-tls.h"
|
|
|
|
/**
|
|
* @migration_channel_process_incoming - Create new incoming migration channel
|
|
*
|
|
* Notice that TLS is special. For it we listen in a listener socket,
|
|
* and then create a new client socket from the TLS library.
|
|
*
|
|
* @ioc: Channel to which we are connecting
|
|
*/
|
|
void migration_channel_process_incoming(QIOChannel *ioc)
|
|
{
|
|
MigrationState *s = migrate_get_current();
|
|
Error *local_err = NULL;
|
|
|
|
trace_migration_set_incoming_channel(
|
|
ioc, object_get_typename(OBJECT(ioc)));
|
|
|
|
if (s->parameters.tls_creds &&
|
|
*s->parameters.tls_creds &&
|
|
!object_dynamic_cast(OBJECT(ioc),
|
|
TYPE_QIO_CHANNEL_TLS)) {
|
|
migration_tls_channel_process_incoming(s, ioc, &local_err);
|
|
} else {
|
|
migration_ioc_process_incoming(ioc, &local_err);
|
|
}
|
|
|
|
if (local_err) {
|
|
error_report_err(local_err);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* @migration_channel_connect - Create new outgoing migration channel
|
|
*
|
|
* @s: Current migration state
|
|
* @ioc: Channel to which we are connecting
|
|
* @hostname: Where we want to connect
|
|
* @error: Error indicating failure to connect, free'd here
|
|
*/
|
|
void migration_channel_connect(MigrationState *s,
|
|
QIOChannel *ioc,
|
|
const char *hostname,
|
|
Error *error)
|
|
{
|
|
trace_migration_set_outgoing_channel(
|
|
ioc, object_get_typename(OBJECT(ioc)), hostname, error);
|
|
|
|
if (!error) {
|
|
if (s->parameters.tls_creds &&
|
|
*s->parameters.tls_creds &&
|
|
!object_dynamic_cast(OBJECT(ioc),
|
|
TYPE_QIO_CHANNEL_TLS)) {
|
|
migration_tls_channel_connect(s, ioc, hostname, &error);
|
|
|
|
if (!error) {
|
|
/* tls_channel_connect will call back to this
|
|
* function after the TLS handshake,
|
|
* so we mustn't call migrate_fd_connect until then
|
|
*/
|
|
|
|
return;
|
|
}
|
|
} else {
|
|
QEMUFile *f = qemu_fopen_channel_output(ioc);
|
|
|
|
qemu_mutex_lock(&s->qemu_file_lock);
|
|
s->to_dst_file = f;
|
|
qemu_mutex_unlock(&s->qemu_file_lock);
|
|
}
|
|
}
|
|
migrate_fd_connect(s, error);
|
|
error_free(error);
|
|
}
|