motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-30 22:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: remove qemu_get_fd method from QEMUFile

Browse source 
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>
This commit is contained in:
Daniel P. Berrange 2016-04-27 11:05:18 +01:00 • committed by Amit Shah
parent 11808bb0c4
commit 12992c16d9
2 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/migration/qemu-file.h
View file

@ -103,7 +103,6 @@ typedef int (QEMUFileShutdownFunc)(void *opaque, bool rd, bool wr);
typedef struct QEMUFileOps { typedef struct QEMUFileOps {
QEMUFileGetBufferFunc *get_buffer; QEMUFileGetBufferFunc *get_buffer;
QEMUFileCloseFunc *close; QEMUFileCloseFunc *close;
QEMUFileGetFD *get_fd;
QEMUFileSetBlocking *set_blocking; QEMUFileSetBlocking *set_blocking;
QEMUFileWritevBufferFunc *writev_buffer; QEMUFileWritevBufferFunc *writev_buffer;
QEMURetPathFunc *get_return_path; QEMURetPathFunc *get_return_path;

14
migration/qemu-file.c
View file

@ -268,14 +268,6 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
return len; 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) void qemu_update_position(QEMUFile *f, size_t size)
{ {
f->pos += size; f->pos += size;
@ -688,11 +680,5 @@ void qemu_file_set_blocking(QEMUFile *f, bool block)
{ {
if (f->ops->set_blocking) { if (f->ops->set_blocking) {
f->ops->set_blocking(f->opaque, block); 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));
}
} }
} }