[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 16/20] migration/rdma: Split qemu_fopen_rdma() into input/
From: |
Peter Xu |
Subject: |
Re: [PATCH v2 16/20] migration/rdma: Split qemu_fopen_rdma() into input/output functions |
Date: |
Wed, 14 Jun 2023 11:07:33 -0400 |
On Tue, May 30, 2023 at 08:39:37PM +0200, Juan Quintela wrote:
> This is how everything else in QEMUFile is structured.
> As a bonus they are three less lines of code.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> migration/rdma.c | 35 ++++++++++++++++-------------------
> 1 file changed, 16 insertions(+), 19 deletions(-)
>
> diff --git a/migration/rdma.c b/migration/rdma.c
> index 3ef35fc635..606837bd45 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -4046,25 +4046,22 @@ static void qio_channel_rdma_register_types(void)
>
> type_init(qio_channel_rdma_register_types);
>
> -static QEMUFile *qemu_fopen_rdma(RDMAContext *rdma, const char *mode)
> +static QEMUFile *rdma_new_input(RDMAContext *rdma)
> {
> - QIOChannelRDMA *rioc;
> + QIOChannelRDMA *rioc =
> QIO_CHANNEL_RDMA(object_new(TYPE_QIO_CHANNEL_RDMA));
> + rioc->file = qemu_file_new_input(QIO_CHANNEL(rioc));
> + rioc->rdmain = rdma;
> + rioc->rdmaout = rdma->return_path;
>
> - if (qemu_file_mode_is_not_valid(mode)) {
We can also drop this function together. If with that:
Reviewed-by: Peter Xu <peterx@redhat.com>
> - return NULL;
> - }
> + return rioc->file;
> +}
>
> - rioc = QIO_CHANNEL_RDMA(object_new(TYPE_QIO_CHANNEL_RDMA));
> -
> - if (mode[0] == 'w') {
> - rioc->file = qemu_file_new_output(QIO_CHANNEL(rioc));
> - rioc->rdmaout = rdma;
> - rioc->rdmain = rdma->return_path;
> - } else {
> - rioc->file = qemu_file_new_input(QIO_CHANNEL(rioc));
> - rioc->rdmain = rdma;
> - rioc->rdmaout = rdma->return_path;
> - }
> +static QEMUFile *rdma_new_output(RDMAContext *rdma)
> +{
> + QIOChannelRDMA *rioc =
> QIO_CHANNEL_RDMA(object_new(TYPE_QIO_CHANNEL_RDMA));
> + rioc->file = qemu_file_new_output(QIO_CHANNEL(rioc));
> + rioc->rdmaout = rdma;
> + rioc->rdmain = rdma->return_path;
>
> return rioc->file;
> }
> @@ -4090,9 +4087,9 @@ static void rdma_accept_incoming_migration(void *opaque)
> return;
> }
>
> - f = qemu_fopen_rdma(rdma, "rb");
> + f = rdma_new_input(rdma);
> if (f == NULL) {
> - fprintf(stderr, "RDMA ERROR: could not qemu_fopen_rdma\n");
> + fprintf(stderr, "RDMA ERROR: could not open RDMA for input\n");
> qemu_rdma_cleanup(rdma);
> return;
> }
> @@ -4217,7 +4214,7 @@ void rdma_start_outgoing_migration(void *opaque,
> trace_rdma_start_outgoing_migration_after_rdma_connect();
>
> s->rdma_migration = true;
> - s->to_dst_file = qemu_fopen_rdma(rdma, "wb");
> + s->to_dst_file = rdma_new_output(rdma);
> migrate_fd_connect(s, NULL);
> return;
> return_path_err:
> --
> 2.40.1
>
--
Peter Xu
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH v2 16/20] migration/rdma: Split qemu_fopen_rdma() into input/output functions,
Peter Xu <=