diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2016-04-27 11:05:18 +0100 |
|---|---|---|
| committer | Amit Shah <amit.shah@redhat.com> | 2016-05-26 11:32:21 +0530 |
| commit | 12992c16d9afd8a23a94a84ad532a1adedf9e511 (patch) | |
| tree | 083645f6a967ce460761ae32ad53815614cc7098 | |
| parent | 11808bb0c422134bf09119f4aa22c59b0ce84bf3 (diff) | |
| download | qemu-12992c16d9afd8a23a94a84ad532a1adedf9e511.tar.gz | |
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: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1461751518-12128-29-git-send-email-berrange@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
| -rw-r--r-- | include/migration/qemu-file.h | 1 | ||||
| -rw-r--r-- | migration/qemu-file.c | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 36af5f4236..2409a98967 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -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; diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 6790040bd6..8aea1c7094 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -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)); - } } } |