[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 22/22] migration: remove qemu_get_fd method from
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v1 22/22] migration: remove qemu_get_fd method from QEMUFile |
Date: |
Tue, 12 Jan 2016 11:44:16 +0000 |
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.
Signed-off-by: Daniel P. Berrange <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 4ee40e4..68bc165 100644
--- a/include/migration/qemu-file.h
+++ b/include/migration/qemu-file.h
@@ -104,7 +104,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 372a6b9..baef865 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -267,14 +267,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;
@@ -687,11 +679,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.0
- [Qemu-devel] [PATCH v1 16/22] migration: delete QEMUSizedBuffer struct, (continued)
- [Qemu-devel] [PATCH v1 16/22] migration: delete QEMUSizedBuffer struct, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 10/22] migration: convert tcp socket protocol to use QIOChannel, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 12/22] migration: convert exec socket protocol to use QIOChannel, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 11/22] migration: convert fd socket protocol to use QIOChannel, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 17/22] migration: delete QEMUFile sockets implementation, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 13/22] migration: convert RDMA to use QIOChannel interface, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 19/22] migration: move definition of struct QEMUFile back into qemu-file.c, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 18/22] migration: delete QEMUFile stdio implementation, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 20/22] migration: support TLS encryption with TCP migration backend, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 21/22] migration: remove support for non-iovec based write handlers, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 22/22] migration: remove qemu_get_fd method from QEMUFile,
Daniel P. Berrange <=
- Re: [Qemu-devel] [PATCH v1 00/22] Convert migration to QIOChannel & support TLS, Daniel P. Berrange, 2016/01/12
- Re: [Qemu-devel] [PATCH v1 00/22] Convert migration to QIOChannel & support TLS, Daniel P. Berrange, 2016/01/20