[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 28/28] migration: remove qemu_get_fd method from QEMU
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PULL 28/28] migration: remove qemu_get_fd method from QEMUFile |
Date: |
Thu, 26 May 2016 11:42:19 +0530 |
From: "Daniel P. Berrange" <address@hidden>
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 <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>
---
include/migration/qemu-file.h | 1 -
migration/qemu-file.c | 14 --------------
2 files changed, 15 deletions(-)
diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h
index 36af5f4..2409a98 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 6790040..8aea1c7 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));
- }
}
}
--
2.5.5
- [Qemu-devel] [PULL 20/28] migration: delete QEMUSizedBuffer struct, (continued)
- [Qemu-devel] [PULL 20/28] migration: delete QEMUSizedBuffer struct, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 19/28] migration: delete QEMUFile buffer implementation, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 21/28] migration: delete QEMUFile sockets implementation, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 22/28] migration: delete QEMUFile stdio implementation, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 24/28] migration: don't use an array for storing migrate parameters, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 23/28] migration: move definition of struct QEMUFile back into qemu-file.c, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 25/28] migration: define 'tls-creds' and 'tls-hostname' migration parameters, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 26/28] migration: add support for encrypting data with TLS, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 27/28] migration: remove support for non-iovec based write handlers, Amit Shah, 2016/05/26
- [Qemu-devel] [PULL 28/28] migration: remove qemu_get_fd method from QEMUFile,
Amit Shah <=
- Re: [Qemu-devel] [PULL 00/28] migration: support for TLS, Peter Maydell, 2016/05/26