diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2022-06-20 12:02:01 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2022-06-22 19:33:43 +0100 |
| commit | 0ae1f7f055d757c01ce3144a7041fa9341a3715b (patch) | |
| tree | 9e760b26874b4a324e067c1ae55947783f221712 /migration/qemu-file.c | |
| parent | 80ad97069c3c434a3631f0c8bc0d5c4cee09be6d (diff) | |
| download | focaccia-qemu-0ae1f7f055d757c01ce3144a7041fa9341a3715b.tar.gz focaccia-qemu-0ae1f7f055d757c01ce3144a7041fa9341a3715b.zip | |
migration: remove the QEMUFileOps 'close' callback
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>
Diffstat (limited to 'migration/qemu-file.c')
| -rw-r--r-- | migration/qemu-file.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 95d5db9dd6..74f919de67 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -408,16 +408,16 @@ void qemu_file_credit_transfer(QEMUFile *f, size_t size) */ int qemu_fclose(QEMUFile *f) { - int ret; + int ret, ret2; qemu_fflush(f); ret = qemu_file_get_error(f); - if (f->ops->close) { - int ret2 = f->ops->close(f->ioc, NULL); - if (ret >= 0) { - ret = ret2; - } + ret2 = qio_channel_close(f->ioc, NULL); + if (ret >= 0) { + ret = ret2; } + g_clear_pointer(&f->ioc, object_unref); + /* If any error was spotted before closing, we should report it * instead of the close() return value. */ |