ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: introduce new constructors for QEMUFile 

Prepare for the elimination of QEMUFileOps by introducing a pair of new
constructors. This lets us distinguish between an input and output file
object explicitly rather than via the existance of specific callbacks.

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:01:57 +01:00 committed by Dr. David Alan Gilbert
parent 2893a2884b
commit c0c6e1e2dd
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,11 +184,11 @@ static const QEMUFileOps channel_output_ops = {
QEMUFile *qemu_fopen_channel_input(QIOChannel *ioc) QEMUFile *qemu_fopen_channel_input(QIOChannel *ioc)
{ {
object_ref(OBJECT(ioc)); object_ref(OBJECT(ioc));
return qemu_fopen_ops(ioc, &channel_input_ops); return qemu_file_new_input(ioc, &channel_input_ops);
} }
QEMUFile *qemu_fopen_channel_output(QIOChannel *ioc) QEMUFile *qemu_fopen_channel_output(QIOChannel *ioc)
{ {
object_ref(OBJECT(ioc)); object_ref(OBJECT(ioc));
return qemu_fopen_ops(ioc, &channel_output_ops); return qemu_file_new_output(ioc, &channel_output_ops);
} }

18
migration/qemu-file.c
View File

@ -38,6 +38,7 @@ struct QEMUFile {
const QEMUFileOps *ops; const QEMUFileOps *ops;
const QEMUFileHooks *hooks; const QEMUFileHooks *hooks;
QIOChannel *ioc; QIOChannel *ioc;
bool is_writable;
/* /*
* Maximum amount of data in bytes to transfer during one * Maximum amount of data in bytes to transfer during one
@ -111,7 +112,9 @@ bool qemu_file_mode_is_not_valid(const char *mode)
return false; return false;
} }
QEMUFile *qemu_fopen_ops(QIOChannel *ioc, const QEMUFileOps *ops) static QEMUFile *qemu_file_new_impl(QIOChannel *ioc,
const QEMUFileOps *ops,
bool is_writable)
{ {
QEMUFile *f; QEMUFile *f;
@ -119,10 +122,21 @@ QEMUFile *qemu_fopen_ops(QIOChannel *ioc, const QEMUFileOps *ops)
f->ioc = ioc; f->ioc = ioc;
f->ops = ops; f->ops = ops;
f->is_writable = is_writable;
return f; return f;
} }
QEMUFile *qemu_file_new_output(QIOChannel *ioc, const QEMUFileOps *ops)
{
return qemu_file_new_impl(ioc, ops, true);
}
QEMUFile *qemu_file_new_input(QIOChannel *ioc, const QEMUFileOps *ops)
{
return qemu_file_new_impl(ioc, ops, false);
}
void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks) void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks)
{ {
@ -181,7 +195,7 @@ void qemu_file_set_error(QEMUFile *f, int ret)
bool qemu_file_is_writable(QEMUFile *f) bool qemu_file_is_writable(QEMUFile *f)
{ {
return f->ops->writev_buffer; return f->is_writable;
} }
static void qemu_iovec_release_ram(QEMUFile *f) static void qemu_iovec_release_ram(QEMUFile *f)

3
migration/qemu-file.h
View File

@ -118,7 +118,8 @@ typedef struct QEMUFileHooks {
QEMURamSaveFunc *save_page; QEMURamSaveFunc *save_page;
} QEMUFileHooks; } QEMUFileHooks;
QEMUFile *qemu_fopen_ops(QIOChannel *ioc, const QEMUFileOps *ops); QEMUFile *qemu_file_new_input(QIOChannel *ioc, const QEMUFileOps *ops);
QEMUFile *qemu_file_new_output(QIOChannel *ioc, const QEMUFileOps *ops);
void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks); void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks);
int qemu_get_fd(QEMUFile *f); int qemu_get_fd(QEMUFile *f);
int qemu_fclose(QEMUFile *f); int qemu_fclose(QEMUFile *f);