migration: remove the QEMUFileOps 'set_blocking' callback
This directly implements the set_blocking logic using QIOChannel APIs. Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
parent
d3c581b750
commit
80ad97069c
|
@ -112,18 +112,6 @@ static int channel_close(void *opaque, Error **errp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int channel_set_blocking(void *opaque,
|
|
||||||
bool enabled,
|
|
||||||
Error **errp)
|
|
||||||
{
|
|
||||||
QIOChannel *ioc = QIO_CHANNEL(opaque);
|
|
||||||
|
|
||||||
if (qio_channel_set_blocking(ioc, enabled, errp) < 0) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static QEMUFile *channel_get_input_return_path(void *opaque)
|
static QEMUFile *channel_get_input_return_path(void *opaque)
|
||||||
{
|
{
|
||||||
QIOChannel *ioc = QIO_CHANNEL(opaque);
|
QIOChannel *ioc = QIO_CHANNEL(opaque);
|
||||||
|
@ -141,7 +129,6 @@ static QEMUFile *channel_get_output_return_path(void *opaque)
|
||||||
static const QEMUFileOps channel_input_ops = {
|
static const QEMUFileOps channel_input_ops = {
|
||||||
.get_buffer = channel_get_buffer,
|
.get_buffer = channel_get_buffer,
|
||||||
.close = channel_close,
|
.close = channel_close,
|
||||||
.set_blocking = channel_set_blocking,
|
|
||||||
.get_return_path = channel_get_input_return_path,
|
.get_return_path = channel_get_input_return_path,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -149,7 +136,6 @@ static const QEMUFileOps channel_input_ops = {
|
||||||
static const QEMUFileOps channel_output_ops = {
|
static const QEMUFileOps channel_output_ops = {
|
||||||
.writev_buffer = channel_writev_buffer,
|
.writev_buffer = channel_writev_buffer,
|
||||||
.close = channel_close,
|
.close = channel_close,
|
||||||
.set_blocking = channel_set_blocking,
|
|
||||||
.get_return_path = channel_get_output_return_path,
|
.get_return_path = channel_get_output_return_path,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -879,9 +879,7 @@ void qemu_put_counted_string(QEMUFile *f, const char *str)
|
||||||
*/
|
*/
|
||||||
void qemu_file_set_blocking(QEMUFile *f, bool block)
|
void qemu_file_set_blocking(QEMUFile *f, bool block)
|
||||||
{
|
{
|
||||||
if (f->ops->set_blocking) {
|
qio_channel_set_blocking(f->ioc, block, NULL);
|
||||||
f->ops->set_blocking(f->ioc, block, NULL);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -46,10 +46,6 @@ typedef ssize_t (QEMUFileGetBufferFunc)(void *opaque, uint8_t *buf,
|
||||||
*/
|
*/
|
||||||
typedef int (QEMUFileCloseFunc)(void *opaque, Error **errp);
|
typedef int (QEMUFileCloseFunc)(void *opaque, Error **errp);
|
||||||
|
|
||||||
/* Called to change the blocking mode of the file
|
|
||||||
*/
|
|
||||||
typedef int (QEMUFileSetBlocking)(void *opaque, bool enabled, Error **errp);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This function writes an iovec to file. The handler must write all
|
* This function writes an iovec to file. The handler must write all
|
||||||
* of the data or return a negative errno value.
|
* of the data or return a negative errno value.
|
||||||
|
@ -92,7 +88,6 @@ typedef QEMUFile *(QEMURetPathFunc)(void *opaque);
|
||||||
typedef struct QEMUFileOps {
|
typedef struct QEMUFileOps {
|
||||||
QEMUFileGetBufferFunc *get_buffer;
|
QEMUFileGetBufferFunc *get_buffer;
|
||||||
QEMUFileCloseFunc *close;
|
QEMUFileCloseFunc *close;
|
||||||
QEMUFileSetBlocking *set_blocking;
|
|
||||||
QEMUFileWritevBufferFunc *writev_buffer;
|
QEMUFileWritevBufferFunc *writev_buffer;
|
||||||
QEMURetPathFunc *get_return_path;
|
QEMURetPathFunc *get_return_path;
|
||||||
} QEMUFileOps;
|
} QEMUFileOps;
|
||||||
|
|
Loading…
Reference in New Issue