migration: remove the QEMUFileOps 'get_return_path' callback
This directly implements the get_return_path 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:
committed by
Dr. David Alan Gilbert
parent
ec2135eec8
commit
02bdbe172d
+10
-12
@@ -95,18 +95,6 @@ int qemu_file_shutdown(QEMUFile *f)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Result: QEMUFile* for a 'return path' for comms in the opposite direction
|
||||
* NULL if not available
|
||||
*/
|
||||
QEMUFile *qemu_file_get_return_path(QEMUFile *f)
|
||||
{
|
||||
if (!f->ops->get_return_path) {
|
||||
return NULL;
|
||||
}
|
||||
return f->ops->get_return_path(f->ioc);
|
||||
}
|
||||
|
||||
bool qemu_file_mode_is_not_valid(const char *mode)
|
||||
{
|
||||
if (mode == NULL ||
|
||||
@@ -134,6 +122,16 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc,
|
||||
return f;
|
||||
}
|
||||
|
||||
/*
|
||||
* Result: QEMUFile* for a 'return path' for comms in the opposite direction
|
||||
* NULL if not available
|
||||
*/
|
||||
QEMUFile *qemu_file_get_return_path(QEMUFile *f)
|
||||
{
|
||||
object_ref(f->ioc);
|
||||
return qemu_file_new_impl(f->ioc, f->ops, !f->is_writable);
|
||||
}
|
||||
|
||||
QEMUFile *qemu_file_new_output(QIOChannel *ioc, const QEMUFileOps *ops)
|
||||
{
|
||||
return qemu_file_new_impl(ioc, ops, true);
|
||||
|
||||
Reference in New Issue
Block a user