[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 04/12] migration: replace qemu_stdio_fd with qem
From: |
Orit Wasserman |
Subject: |
Re: [Qemu-devel] [PATCH 04/12] migration: replace qemu_stdio_fd with qemu_get_fd |
Date: |
Sun, 28 Oct 2012 11:29:33 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 |
On 10/18/2012 12:22 PM, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> migration-exec.c | 4 ++--
> migration-fd.c | 2 +-
> qemu-file.h | 1 -
> savevm.c | 11 -----------
> 4 file modificati, 3 inserzioni(+), 15 rimozioni(-)
>
> diff --git a/migration-exec.c b/migration-exec.c
> index 6c97db9..f81e390 100644
> --- a/migration-exec.c
> +++ b/migration-exec.c
> @@ -98,7 +98,7 @@ static void exec_accept_incoming_migration(void *opaque)
> QEMUFile *f = opaque;
>
> process_incoming_migration(f);
> - qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL);
> + qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);
> qemu_fclose(f);
> }
>
> @@ -113,7 +113,7 @@ int exec_start_incoming_migration(const char *command)
> return -errno;
> }
>
> - qemu_set_fd_handler2(qemu_stdio_fd(f), NULL,
> + qemu_set_fd_handler2(qemu_get_fd(f), NULL,
> exec_accept_incoming_migration, NULL, f);
>
> return 0;
> diff --git a/migration-fd.c b/migration-fd.c
> index 7335167..43cc730 100644
> --- a/migration-fd.c
> +++ b/migration-fd.c
> @@ -104,7 +104,7 @@ static void fd_accept_incoming_migration(void *opaque)
> QEMUFile *f = opaque;
>
> process_incoming_migration(f);
> - qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL);
> + qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);
> qemu_fclose(f);
> }
>
> diff --git a/qemu-file.h b/qemu-file.h
> index d552f5d..d64bdbb 100644
> --- a/qemu-file.h
> +++ b/qemu-file.h
> @@ -80,7 +80,6 @@ QEMUFile *qemu_fopen_socket(int fd);
> QEMUFile *qemu_popen(FILE *popen_file, const char *mode);
> QEMUFile *qemu_popen_cmd(const char *command, const char *mode);
> int qemu_get_fd(QEMUFile *f);
> -int qemu_stdio_fd(QEMUFile *f);
> int qemu_fclose(QEMUFile *f);
> void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size);
> void qemu_put_byte(QEMUFile *f, int v);
> diff --git a/savevm.c b/savevm.c
> index 5c0a756..7eca28b 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -310,17 +310,6 @@ QEMUFile *qemu_popen_cmd(const char *command, const char
> *mode)
> return qemu_popen(popen_file, mode);
> }
>
> -int qemu_stdio_fd(QEMUFile *f)
> -{
> - QEMUFileStdio *p;
> - int fd;
> -
> - p = (QEMUFileStdio *)f->opaque;
> - fd = fileno(p->stdio_file);
> -
> - return fd;
> -}
> -
> static const QEMUFileOps stdio_file_read_ops = {
> .get_fd = stdio_get_fd,
> .get_buffer = stdio_get_buffer,
>
Reviewed-by: Orit Wasserman <address@hidden>
- [Qemu-devel] [PATCH 01/12] migration: unify stdio-based QEMUFile operations, (continued)
- [Qemu-devel] [PATCH 01/12] migration: unify stdio-based QEMUFile operations, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH 02/12] migration: consolidate QEMUFile methods in a single QEMUFileOps struct, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH 05/12] migration: clean up server sockets and handlers before invoking process_incoming_migration, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH 04/12] migration: replace qemu_stdio_fd with qemu_get_fd, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH 03/12] migration: add qemu_get_fd, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH 06/12] migration: use migrate_fd_close in migrate_fd_cleanup, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH 09/12] migration: close socket QEMUFile from socket_close, Paolo Bonzini, 2012/10/18