OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: remove the QEMUFileOps 'close' callback

Browse Source 
This directly implements the close 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:
Daniel P. Berrangé 2022-06-20 12:02:01 +01:00 committed by Dr. David Alan Gilbert
parent 80ad97069c
commit 0ae1f7f055
3 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/qemu-file-channel.c
View File

@ -102,16 +102,6 @@ static ssize_t channel_get_buffer(void *opaque,
} }
static int channel_close(void *opaque, Error **errp)
{
int ret;
QIOChannel *ioc = QIO_CHANNEL(opaque);
ret = qio_channel_close(ioc, errp);
object_unref(OBJECT(ioc));
return ret;
}
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);
@ -128,14 +118,12 @@ 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,
.get_return_path = channel_get_input_return_path, .get_return_path = channel_get_input_return_path,
}; };
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,
.get_return_path = channel_get_output_return_path, .get_return_path = channel_get_output_return_path,
}; };

12
migration/qemu-file.c
View File

@ -408,16 +408,16 @@ void qemu_file_credit_transfer(QEMUFile *f, size_t size)
*/ */
int qemu_fclose(QEMUFile *f) int qemu_fclose(QEMUFile *f)
{ {
int ret; int ret, ret2;
qemu_fflush(f); qemu_fflush(f);
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
if (f->ops->close) { ret2 = qio_channel_close(f->ioc, NULL);
int ret2 = f->ops->close(f->ioc, NULL); if (ret >= 0) {
if (ret >= 0) { ret = ret2;
ret = ret2;
}
} }
g_clear_pointer(&f->ioc, object_unref);
/* If any error was spotted before closing, we should report it /* If any error was spotted before closing, we should report it
* instead of the close() return value. * instead of the close() return value.
*/ */

10
migration/qemu-file.h
View File

@ -37,15 +37,6 @@ typedef ssize_t (QEMUFileGetBufferFunc)(void *opaque, uint8_t *buf,
int64_t pos, size_t size, int64_t pos, size_t size,
Error **errp); Error **errp);
/* Close a file
*
* Return negative error number on error, 0 or positive value on success.
*
* The meaning of return value on success depends on the specific back-end being
* used.
*/
typedef int (QEMUFileCloseFunc)(void *opaque, 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.
@ -87,7 +78,6 @@ typedef QEMUFile *(QEMURetPathFunc)(void *opaque);
typedef struct QEMUFileOps { typedef struct QEMUFileOps {
QEMUFileGetBufferFunc *get_buffer; QEMUFileGetBufferFunc *get_buffer;
QEMUFileCloseFunc *close;
QEMUFileWritevBufferFunc *writev_buffer; QEMUFileWritevBufferFunc *writev_buffer;
QEMURetPathFunc *get_return_path; QEMURetPathFunc *get_return_path;
} QEMUFileOps; } QEMUFileOps;