Commit 12992c16 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Amit Shah
Browse files

migration: remove qemu_get_fd method from QEMUFile 



Now that there is a set_blocking callback in QEMUFileOps,
and all users needing non-blocking support have been
converted to QIOChannel, there is no longer any codepath
requiring the qemu_get_fd() method for QEMUFile. Remove it
to avoid further code being introduced with an expectation
of direct file handle access.

Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-Id: <1461751518-12128-29-git-send-email-berrange@redhat.com>
Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
parent 11808bb0

include/migration/qemu-file.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ typedef int (QEMUFileShutdownFunc)(void *opaque, bool rd, bool wr); 
typedef struct QEMUFileOps {

    QEMUFileGetBufferFunc *get_buffer;

    QEMUFileCloseFunc *close;

    QEMUFileGetFD *get_fd;

    QEMUFileSetBlocking *set_blocking;

    QEMUFileWritevBufferFunc *writev_buffer;

    QEMURetPathFunc *get_return_path;

migration/qemu-file.c

+0 −14
Original line number Diff line number Diff line
@@ -268,14 +268,6 @@ static ssize_t qemu_fill_buffer(QEMUFile *f) 
    return len;

}



int qemu_get_fd(QEMUFile *f)

{

    if (f->ops->get_fd) {

        return f->ops->get_fd(f->opaque);

    }

    return -1;

}



void qemu_update_position(QEMUFile *f, size_t size)

{

    f->pos += size;
@@ -688,11 +680,5 @@ void qemu_file_set_blocking(QEMUFile *f, bool block) 
{

    if (f->ops->set_blocking) {

        f->ops->set_blocking(f->opaque, block);

    } else {

        if (block) {

            qemu_set_block(qemu_get_fd(f));

        } else {

            qemu_set_nonblock(qemu_get_fd(f));

        }

    }

}