On Mon, Sep 30, 2024 at 12:40:40PM -0700, Steve Sistare wrote:
> Add functions to create a QEMUFile based on a unix URI, for saving or
> loading, for use by cpr-transfer mode to preserve CPR state.
>
> Signed-off-by: Steve Sistare <steven.sist...@oracle.com>
Reviewed-by: Peter Xu <pet...@redhat.com>
There're a few extra newlines below, though, which could be removed.
> ---
> include/migration/cpr.h | 3 ++
> migration/cpr-transfer.c | 81
> ++++++++++++++++++++++++++++++++++++++++++++++++
> migration/meson.build | 1 +
> 3 files changed, 85 insertions(+)
> create mode 100644 migration/cpr-transfer.c
>
> diff --git a/include/migration/cpr.h b/include/migration/cpr.h
> index ac7a63e..51c19ed 100644
> --- a/include/migration/cpr.h
> +++ b/include/migration/cpr.h
> @@ -30,4 +30,7 @@ int cpr_state_load(Error **errp);
> void cpr_state_close(void);
> struct QIOChannel *cpr_state_ioc(void);
>
> +QEMUFile *cpr_transfer_output(const char *uri, Error **errp);
> +QEMUFile *cpr_transfer_input(const char *uri, Error **errp);
> +
> #endif
> diff --git a/migration/cpr-transfer.c b/migration/cpr-transfer.c
> new file mode 100644
> index 0000000..fb9ecd8
> --- /dev/null
> +++ b/migration/cpr-transfer.c
> @@ -0,0 +1,81 @@
> +/*
> + * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "io/channel-file.h"
> +#include "io/channel-socket.h"
> +#include "io/net-listener.h"
> +#include "migration/cpr.h"
> +#include "migration/migration.h"
> +#include "migration/savevm.h"
> +#include "migration/qemu-file.h"
> +#include "migration/vmstate.h"
> +
> +QEMUFile *cpr_transfer_output(const char *uri, Error **errp)
> +{
> + g_autoptr(MigrationChannel) channel = NULL;
> + QIOChannel *ioc;
> +
> + if (!migrate_uri_parse(uri, &channel, errp)) {
> + return NULL;
> + }
> +
> + if (channel->addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET &&
> + channel->addr->u.socket.type == SOCKET_ADDRESS_TYPE_UNIX) {
> +
here
> + QIOChannelSocket *sioc = qio_channel_socket_new();
> + SocketAddress *saddr = &channel->addr->u.socket;
> +
> + if (qio_channel_socket_connect_sync(sioc, saddr, errp)) {
> + object_unref(OBJECT(sioc));
> + return NULL;
> + }
> + ioc = QIO_CHANNEL(sioc);
> +
here
> + } else {
> + error_setg(errp, "bad cpr-uri %s; must be unix:", uri);
> + return NULL;
> + }
> +
> + qio_channel_set_name(ioc, "cpr-out");
> + return qemu_file_new_output(ioc);
> +}
> +
> +QEMUFile *cpr_transfer_input(const char *uri, Error **errp)
> +{
> + g_autoptr(MigrationChannel) channel = NULL;
> + QIOChannel *ioc;
> +
> + if (!migrate_uri_parse(uri, &channel, errp)) {
> + return NULL;
> + }
> +
> + if (channel->addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET &&
> + channel->addr->u.socket.type == SOCKET_ADDRESS_TYPE_UNIX) {
> +
here
> + QIOChannelSocket *sioc;
> + SocketAddress *saddr = &channel->addr->u.socket;
> + QIONetListener *listener = qio_net_listener_new();
> +
> + qio_net_listener_set_name(listener, "cpr-socket-listener");
> + if (qio_net_listener_open_sync(listener, saddr, 1, errp) < 0) {
> + object_unref(OBJECT(listener));
> + return NULL;
> + }
> +
> + sioc = qio_net_listener_wait_client(listener);
> + ioc = QIO_CHANNEL(sioc);
> +
here
> + } else {
> + error_setg(errp, "bad cpr-uri %s; must be unix:", uri);
> + return NULL;
> + }
> +
> + qio_channel_set_name(ioc, "cpr-in");
> + return qemu_file_new_input(ioc);
> +}
> diff --git a/migration/meson.build b/migration/meson.build
> index e5f4211..684ba98 100644
> --- a/migration/meson.build
> +++ b/migration/meson.build
> @@ -14,6 +14,7 @@ system_ss.add(files(
> 'channel.c',
> 'channel-block.c',
> 'cpr.c',
> + 'cpr-transfer.c',
> 'dirtyrate.c',
> 'exec.c',
> 'fd.c',
> --
> 1.8.3.1
>
--
Peter Xu
