Re: [Qemu-devel] [PATCH v1 19/22] migration: move definition of struct QEMUFile back into qemu-file.c

[Dr. David Alan Gilbert]

* Daniel P. Berrange (address@hidden) wrote:
> Now that the memory buffer based QEMUFile impl is gone, there
> is no need for any backend to be accessing internals of the
> QEMUFile struct, so it can be moved back into qemu-file.c
> 
> Signed-off-by: Daniel P. Berrange <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  migration/qemu-file-internal.h | 54 
> ------------------------------------------
>  migration/qemu-file.c          | 24 ++++++++++++++++++-
>  2 files changed, 23 insertions(+), 55 deletions(-)
>  delete mode 100644 migration/qemu-file-internal.h
> 
> diff --git a/migration/qemu-file-internal.h b/migration/qemu-file-internal.h
> deleted file mode 100644
> index 8fdfa95..0000000
> --- a/migration/qemu-file-internal.h
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -/*
> - * QEMU System Emulator
> - *
> - * Copyright (c) 2003-2008 Fabrice Bellard
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a 
> copy
> - * of this software and associated documentation files (the "Software"), to 
> deal
> - * in the Software without restriction, including without limitation the 
> rights
> - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> - * copies of the Software, and to permit persons to whom the Software is
> - * furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice shall be included in
> - * all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
> FROM,
> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> - * THE SOFTWARE.
> - */
> -
> -#ifndef QEMU_FILE_INTERNAL_H
> -#define QEMU_FILE_INTERNAL_H 1
> -
> -#include "qemu-common.h"
> -#include "qemu/iov.h"
> -
> -#define IO_BUF_SIZE 32768
> -#define MAX_IOV_SIZE MIN(IOV_MAX, 64)
> -
> -struct QEMUFile {
> -    const QEMUFileOps *ops;
> -    const QEMUFileHooks *hooks;
> -    void *opaque;
> -
> -    int64_t bytes_xfer;
> -    int64_t xfer_limit;
> -
> -    int64_t pos; /* start of buffer when writing, end of buffer
> -                    when reading */
> -    int buf_index;
> -    int buf_size; /* 0 when writing */
> -    uint8_t buf[IO_BUF_SIZE];
> -
> -    struct iovec iov[MAX_IOV_SIZE];
> -    unsigned int iovcnt;
> -
> -    int last_error;
> -};
> -
> -#endif
> diff --git a/migration/qemu-file.c b/migration/qemu-file.c
> index fc5977e..333f418 100644
> --- a/migration/qemu-file.c
> +++ b/migration/qemu-file.c
> @@ -29,9 +29,31 @@
>  #include "qemu/coroutine.h"
>  #include "migration/migration.h"
>  #include "migration/qemu-file.h"
> -#include "migration/qemu-file-internal.h"
>  #include "trace.h"
>  
> +#define IO_BUF_SIZE 32768
> +#define MAX_IOV_SIZE MIN(IOV_MAX, 64)
> +
> +struct QEMUFile {
> +    const QEMUFileOps *ops;
> +    const QEMUFileHooks *hooks;
> +    void *opaque;
> +
> +    int64_t bytes_xfer;
> +    int64_t xfer_limit;
> +
> +    int64_t pos; /* start of buffer when writing, end of buffer
> +                    when reading */
> +    int buf_index;
> +    int buf_size; /* 0 when writing */
> +    uint8_t buf[IO_BUF_SIZE];
> +
> +    struct iovec iov[MAX_IOV_SIZE];
> +    unsigned int iovcnt;
> +
> +    int last_error;
> +};
> +
>  /*
>   * Stop a file from being read/written - not all backing files can do this
>   * typically only sockets can.
> -- 
> 2.5.0
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK