mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
migration/multifd: Ensure we're not given a socket for file migration
When doing migration using the fd: URI, QEMU will fetch the file descriptor passed in via the monitor at fd_start_outgoing|incoming_migration(), which means the checks at migration_channels_and_transport_compatible() happen too soon and we don't know at that point whether the FD refers to a plain file or a socket. For this reason, we've been allowing a migration channel of type SOCKET_ADDRESS_TYPE_FD to pass the initial verifications in scenarios where the socket migration is not supported, such as with fd + multifd. The commitdecdc76772
("migration/multifd: Add mapped-ram support to fd: URI") was supposed to add a second check prior to starting migration to make sure a socket fd is not passed instead of a file fd, but failed to do so. Add the missing verification and update the comment explaining this situation which is currently incorrect. Fixes:decdc76772
("migration/multifd: Add mapped-ram support to fd: URI") Signed-off-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Peter Xu <peterx@redhat.com> Link: https://lore.kernel.org/r/20240315032040.7974-2-farosas@suse.de Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
parent
74228c598f
commit
73f6f9a12f
3 changed files with 18 additions and 3 deletions
|
@ -22,6 +22,7 @@
|
|||
#include "migration.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "io/channel-file.h"
|
||||
#include "io/channel-socket.h"
|
||||
#include "io/channel-util.h"
|
||||
#include "options.h"
|
||||
#include "trace.h"
|
||||
|
@ -95,6 +96,13 @@ void fd_start_incoming_migration(const char *fdname, Error **errp)
|
|||
}
|
||||
|
||||
if (migrate_multifd()) {
|
||||
if (fd_is_socket(fd)) {
|
||||
error_setg(errp,
|
||||
"Multifd migration to a socket FD is not supported");
|
||||
object_unref(ioc);
|
||||
return;
|
||||
}
|
||||
|
||||
file_create_incoming_channels(ioc, errp);
|
||||
} else {
|
||||
qio_channel_set_name(ioc, "migration-fd-incoming");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue