qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Leonardo Bras <leobras@redhat.com>,
	Eric Blake <eblake@redhat.com>, Peter Xu <peterx@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Thomas Huth <thuth@redhat.com>,
	libvir-list@redhat.com, Markus Armbruster <armbru@redhat.com>,
	Juan Quintela <quintela@redhat.com>,
	Laurent Vivier <lvivier@redhat.com>
Subject: [PULL 23/25] qemu-file: Simplify qemu_file_shutdown()
Date: Wed, 26 Jul 2023 14:14:57 +0200	[thread overview]
Message-ID: <20230726121459.1837-24-quintela@redhat.com> (raw)
In-Reply-To: <20230726121459.1837-1-quintela@redhat.com>

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230530183941.7223-20-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/qemu-file.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 9a89e17924..4c577bdff8 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -65,8 +65,6 @@ struct QEMUFile {
  */
 int qemu_file_shutdown(QEMUFile *f)
 {
-    int ret = 0;
-
     /*
      * We must set qemufile error before the real shutdown(), otherwise
      * there can be a race window where we thought IO all went though
@@ -96,10 +94,10 @@ int qemu_file_shutdown(QEMUFile *f)
     }
 
     if (qio_channel_shutdown(f->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL) < 0) {
-        ret = -EIO;
+        return -EIO;
     }
 
-    return ret;
+    return 0;
 }
 
 bool qemu_file_mode_is_not_valid(const char *mode)
-- 
2.40.1



  parent reply	other threads:[~2023-07-26 12:22 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-26 12:14 [PULL 00/25] Migration 20230726 patches Juan Quintela
2023-07-26 12:14 ` [PULL 01/25] migration/multifd: Rename threadinfo.c functions Juan Quintela
2023-07-26 12:14 ` [PULL 02/25] migration/multifd: Protect accesses to migration_threads Juan Quintela
2023-07-26 12:14 ` [PULL 03/25] softmmu/dirtylimit: Add parameter check for hmp "set_vcpu_dirty_limit" Juan Quintela
2023-07-26 12:14 ` [PULL 04/25] qapi/migration: Introduce x-vcpu-dirty-limit-period parameter Juan Quintela
2023-07-26 12:14 ` [PULL 05/25] qapi/migration: Introduce vcpu-dirty-limit parameters Juan Quintela
2023-07-26 12:14 ` [PULL 06/25] migration: Introduce dirty-limit capability Juan Quintela
2023-07-26 12:14 ` [PULL 07/25] migration: Refactor auto-converge capability logic Juan Quintela
2023-07-26 12:14 ` [PULL 08/25] migration: Put the detection logic before auto-converge checking Juan Quintela
2023-07-26 12:14 ` [PULL 09/25] migration: Implement dirty-limit convergence algo Juan Quintela
2023-07-26 12:14 ` [PULL 10/25] migration: Extend query-migrate to provide dirty page limit info Juan Quintela
2023-07-26 12:14 ` [PULL 11/25] migration-test: Be consistent for ppc Juan Quintela
2023-07-26 12:14 ` [PULL 12/25] migration-test: Make machine_opts regular with other options Juan Quintela
2023-07-26 12:14 ` [PULL 13/25] migration-test: Create arch_opts Juan Quintela
2023-07-26 12:14 ` [PULL 14/25] migration-test: machine_opts is really arch specific Juan Quintela
2023-07-26 12:14 ` [PULL 15/25] migration: skipped field is really obsolete Juan Quintela
2023-07-26 12:14 ` [PULL 16/25] docs/migration: Update postcopy bits Juan Quintela
2023-07-26 12:14 ` [PULL 17/25] migration: Update error description whenever migration fails Juan Quintela
2023-07-26 12:14 ` [PULL 18/25] migration: enforce multifd and postcopy preempt to be set before incoming Juan Quintela
2023-07-26 12:14 ` [PULL 19/25] qtest/migration-tests.c: use "-incoming defer" for postcopy tests Juan Quintela
2023-07-26 12:14 ` [PULL 20/25] qemu-file: Rename qemu_file_transferred_ fast -> noflush Juan Quintela
2023-07-26 12:14 ` [PULL 21/25] migration: Change qemu_file_transferred to noflush Juan Quintela
2023-07-26 12:14 ` [PULL 22/25] qemu_file: Make qemu_file_is_writable() static Juan Quintela
2023-07-26 12:14 ` Juan Quintela [this message]
2023-07-26 12:14 ` [PULL 24/25] qemu-file: Make qemu_file_get_error_obj() static Juan Quintela
2023-07-26 12:14 ` [PULL 25/25] migration/rdma: Split qemu_fopen_rdma() into input/output functions Juan Quintela
2023-07-26 16:23 ` [PULL 00/25] Migration 20230726 patches Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230726121459.1837-24-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=leobras@redhat.com \
    --cc=libvir-list@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).