qemu-devel.nongnu.org archive mirror
 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 11/21] multifd: multifd_send_pages only needs the qemufile
Date: Thu, 23 Jan 2020 12:58:21 +0100	[thread overview]
Message-ID: <20200123115831.36842-12-quintela@redhat.com> (raw)
In-Reply-To: <20200123115831.36842-1-quintela@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/ram.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index 125c6d0f60..19caf5ed4d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -929,7 +929,7 @@ struct {
  * false.
  */
 
-static int multifd_send_pages(RAMState *rs)
+static int multifd_send_pages(QEMUFile *f)
 {
     int i;
     static int next_channel;
@@ -965,7 +965,7 @@ static int multifd_send_pages(RAMState *rs)
     multifd_send_state->pages = p->pages;
     p->pages = pages;
     transferred = ((uint64_t) pages->used) * TARGET_PAGE_SIZE + p->packet_len;
-    qemu_file_update_transfer(rs->f, transferred);
+    qemu_file_update_transfer(f, transferred);
     ram_counters.multifd_bytes += transferred;
     ram_counters.transferred += transferred;;
     qemu_mutex_unlock(&p->mutex);
@@ -993,7 +993,7 @@ static int multifd_queue_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
         }
     }
 
-    if (multifd_send_pages(rs) < 0) {
+    if (multifd_send_pages(rs->f) < 0) {
         return -1;
     }
 
@@ -1090,7 +1090,7 @@ static void multifd_send_sync_main(RAMState *rs)
         return;
     }
     if (multifd_send_state->pages->used) {
-        if (multifd_send_pages(rs) < 0) {
+        if (multifd_send_pages(rs->f) < 0) {
             error_report("%s: multifd_send_pages fail", __func__);
             return;
         }
-- 
2.24.1



  parent reply	other threads:[~2020-01-23 12:59 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 ` [PATCH v3 03/21] qemu-file: Don't do IO after shutdown Juan Quintela
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 ` Juan Quintela [this message]
2020-01-24 10:57   ` [PATCH v3 11/21] multifd: multifd_send_pages only needs the qemufile 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-12-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 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).