All of lore.kernel.org
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v3 03/21] qemu-file: Don't do IO after shutdown
Date: Thu, 23 Jan 2020 12:58:13 +0100	[thread overview]
Message-ID: <20200123115831.36842-4-quintela@redhat.com> (raw)
In-Reply-To: <20200123115831.36842-1-quintela@redhat.com>

Be sure that we are not doing neither read/write after shutdown of the
QEMUFile.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>

---

Set error in case that there is none (dave)
---
 migration/qemu-file.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 26fb25ddc1..bbb2b63927 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -53,6 +53,8 @@ struct QEMUFile {
 
     int last_error;
     Error *last_error_obj;
+    /* has the file has been shutdown */
+    bool shutdown;
 };
 
 /*
@@ -61,10 +63,18 @@ struct QEMUFile {
  */
 int qemu_file_shutdown(QEMUFile *f)
 {
+    int ret;
+
+    f->shutdown = true;
     if (!f->ops->shut_down) {
         return -ENOSYS;
     }
-    return f->ops->shut_down(f->opaque, true, true, NULL);
+    ret = f->ops->shut_down(f->opaque, true, true, NULL);
+
+    if (!f->last_error) {
+        qemu_file_set_error(f, -EIO);
+    }
+    return ret;
 }
 
 /*
@@ -214,6 +224,9 @@ void qemu_fflush(QEMUFile *f)
         return;
     }
 
+    if (f->shutdown) {
+        return;
+    }
     if (f->iovcnt > 0) {
         expect = iov_size(f->iov, f->iovcnt);
         ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt, f->pos,
@@ -328,6 +341,10 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
     f->buf_index = 0;
     f->buf_size = pending;
 
+    if (f->shutdown) {
+        return 0;
+    }
+
     len = f->ops->get_buffer(f->opaque, f->buf + pending, f->pos,
                              IO_BUF_SIZE - pending, &local_error);
     if (len > 0) {
@@ -642,6 +659,9 @@ int64_t qemu_ftell(QEMUFile *f)
 
 int qemu_file_rate_limit(QEMUFile *f)
 {
+    if (f->shutdown) {
+        return 1;
+    }
     if (qemu_file_get_error(f)) {
         return 1;
     }
-- 
2.24.1



  parent reply	other threads:[~2020-01-23 12:51 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-23 11:58 [PATCH v3 00/21] Multifd Migration Compression Juan Quintela
2020-01-23 11:58 ` [PATCH v3 01/21] migration-test: Use g_free() instead of free() Juan Quintela
2020-01-24  9:37   ` Dr. David Alan Gilbert
2020-01-24  9:50   ` Philippe Mathieu-Daudé
2020-01-24 10:39   ` Daniel P. Berrangé
2020-01-24 11:08     ` Juan Quintela
2020-01-23 11:58 ` [PATCH v3 02/21] multifd: Make sure that we don't do any IO after an error Juan Quintela
2020-01-23 11:58 ` Juan Quintela [this message]
2020-01-23 11:58 ` [PATCH v3 04/21] migration-test: Make sure that multifd and cancel works Juan Quintela
2020-01-23 11:58 ` [PATCH v3 05/21] migration: Create migration_is_running() Juan Quintela
2020-01-24  9:38   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 06/21] migration: Don't send data if we have stopped Juan Quintela
2020-01-24  9:42   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 07/21] migration: Make multifd_save_setup() get an Error parameter Juan Quintela
2020-01-24 12:57   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 08/21] migration: Make multifd_load_setup() " Juan Quintela
2020-01-24 13:02   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 09/21] migration: Add multifd-compress parameter Juan Quintela
2020-01-24 16:15   ` Eric Blake
2020-01-23 11:58 ` [PATCH v3 10/21] ram_addr: Split RAMBlock definition Juan Quintela
2020-01-24 10:39   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 11/21] multifd: multifd_send_pages only needs the qemufile Juan Quintela
2020-01-24 10:57   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 12/21] multifd: multifd_queue_page " Juan Quintela
2020-01-24 11:37   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 13/21] multifd: multifd_send_sync_main " Juan Quintela
2020-01-24 11:40   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 14/21] multifd: Use qemu_target_page_size() Juan Quintela
2020-01-24 11:42   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 15/21] migration: Make checkpatch happy with comments Juan Quintela
2020-01-24 11:54   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 16/21] migration: Add support for modules Juan Quintela
2020-01-24 18:13   ` Dr. David Alan Gilbert
2020-01-24 18:56     ` Juan Quintela
2020-01-23 11:58 ` [PATCH v3 17/21] multifd: Split multifd code into its own file Juan Quintela
2020-01-24 12:10   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 18/21] migration: Make no compression operations into its own structure Juan Quintela
2020-01-24 12:47   ` Dr. David Alan Gilbert
2020-01-24 13:39     ` Juan Quintela
2020-01-24 13:46       ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 19/21] migration: Add zlib compression multifd support Juan Quintela
2020-01-24 13:44   ` Dr. David Alan Gilbert
2020-01-27 13:43     ` Juan Quintela
2020-01-24 16:16   ` Eric Blake
2020-01-23 11:58 ` [PATCH v3 20/21] configure: Enable test and libs for zstd Juan Quintela
2020-01-24 18:39   ` Dr. David Alan Gilbert
2020-01-23 11:58 ` [PATCH v3 21/21] migration: Add zstd compression multifd support Juan Quintela
2020-01-24 16:18   ` Eric Blake
2020-01-24 18:49     ` Juan Quintela
2020-01-23 12:17 ` [PATCH v3 00/21] Multifd Migration Compression Juan Quintela
2020-01-25  7:20 ` Markus Armbruster

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=20200123115831.36842-4-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.