diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2022-06-20 12:02:04 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2022-06-23 10:18:13 +0100 |
| commit | 02bdbe172da51ae2189d8c6035c3aeb3788b553f (patch) | |
| tree | 10f99fda555d9e8c2f084248c165a2003170ba81 /migration/qemu-file.c | |
| parent | ec2135eec80dc0bd4089d8af2db28c386fadc558 (diff) | |
| download | focaccia-qemu-02bdbe172da51ae2189d8c6035c3aeb3788b553f.tar.gz focaccia-qemu-02bdbe172da51ae2189d8c6035c3aeb3788b553f.zip | |
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>
Diffstat (limited to 'migration/qemu-file.c')
| -rw-r--r-- | migration/qemu-file.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 355117fee0..fad0e33164 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -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); |