Commit d263a20b authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

migration: replace qemu_stdio_fd with qemu_get_fd 



Reviewed-by: default avatarOrit Wasserman <owasserm@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 70eb6330

migration-exec.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,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);

}
@@ -103,6 +103,6 @@ void exec_start_incoming_migration(const char *command, Error **errp) 
        return;

    }



    qemu_set_fd_handler2(qemu_stdio_fd(f), NULL,

    qemu_set_fd_handler2(qemu_get_fd(f), NULL,

			 exec_accept_incoming_migration, NULL, f);

}

migration-fd.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,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);

}

qemu-file.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

savevm.c

+0 −11
Original line number Diff line number Diff line
@@ -311,17 +311,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,