qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com,
	Xiao Guangrong <xiaoguangrong@tencent.com>
Subject: [Qemu-devel] [PULL 01/41] migration: fix saving normal page even if it's been compressed
Date: Wed,  9 May 2018 13:23:26 +0200	[thread overview]
Message-ID: <20180509112406.6183-2-quintela@redhat.com> (raw)
In-Reply-To: <20180509112406.6183-1-quintela@redhat.com>

From: Xiao Guangrong <xiaoguangrong@tencent.com>

Fix the bug introduced by da3f56cb2e767016 (migration: remove
ram_save_compressed_page()), It should be 'return' rather than
'res'

Sorry for this stupid mistake :(

Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com>
Message-Id: <20180428081045.8878-1-xiaoguangrong@tencent.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/ram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/ram.c b/migration/ram.c
index 912810c18e..da0b567003 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1490,7 +1490,7 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss,
      * CPU resource.
      */
     if (block == rs->last_sent_block && save_page_use_compression(rs)) {
-        res = compress_page_with_multi_thread(rs, block, offset);
+        return compress_page_with_multi_thread(rs, block, offset);
     }
 
     return ram_save_page(rs, pss, last_stage);
-- 
2.17.0

  reply	other threads:[~2018-05-09 11:24 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-09 11:23 [Qemu-devel] [PULL 00/41] Migration queue Juan Quintela
2018-05-09 11:23 ` Juan Quintela [this message]
2018-05-09 11:23 ` [Qemu-devel] [PULL 02/41] tests: Add migration precopy test Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 03/41] tests: Add migration xbzrle test Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 04/41] tests: Migration ppc now inlines its program Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 05/41] migration: Set error state in case of error Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 06/41] migration: Introduce multifd_recv_new_channel() Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 07/41] migration: terminate_* can be called for other threads Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 08/41] migration: Be sure all recv channels are created Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 09/41] migration: Export functions to create send channels Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 10/41] migration: Create multifd channels Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 11/41] migration: Delay start of migration main routines Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 12/41] migration: Transmit initial package through the multifd channels Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 13/41] migration: Define MultifdRecvParams sooner Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 14/41] migration: let incoming side use thread context Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 15/41] migration: new postcopy-pause state Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 16/41] migration: implement "postcopy-pause" src logic Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 17/41] migration: allow dst vm pause on postcopy Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 18/41] migration: allow src return path to pause Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 19/41] migration: allow fault thread " Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 20/41] qmp: hmp: add migrate "resume" option Juan Quintela
2018-05-09 12:57   ` Eric Blake
2018-05-09 11:23 ` [Qemu-devel] [PULL 21/41] migration: rebuild channel on source Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 22/41] migration: new state "postcopy-recover" Juan Quintela
2018-05-09 12:57   ` Eric Blake
2018-05-09 11:23 ` [Qemu-devel] [PULL 23/41] migration: wakeup dst ram-load-thread for recover Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 24/41] migration: new cmd MIG_CMD_RECV_BITMAP Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 25/41] migration: new message MIG_RP_MSG_RECV_BITMAP Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 26/41] migration: new cmd MIG_CMD_POSTCOPY_RESUME Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 27/41] migration: new message MIG_RP_MSG_RESUME_ACK Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 28/41] migration: introduce SaveVMHandlers.resume_prepare Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 29/41] migration: synchronize dirty bitmap for resume Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 30/41] migration: setup ramstate " Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 31/41] migration: final handshake for the resume Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 32/41] migration: init dst in migration_object_init too Juan Quintela
2018-05-09 11:23 ` [Qemu-devel] [PULL 33/41] qmp/migration: new command migrate-recover Juan Quintela
2018-05-09 12:59   ` Eric Blake
2018-05-09 11:23 ` [Qemu-devel] [PULL 34/41] hmp/migration: add migrate_recover command Juan Quintela
2018-05-09 11:24 ` [Qemu-devel] [PULL 35/41] migration: introduce lock for to_dst_file Juan Quintela
2018-05-09 11:24 ` [Qemu-devel] [PULL 36/41] migration/qmp: add command migrate-pause Juan Quintela
2018-05-09 12:59   ` Eric Blake
2018-05-09 11:24 ` [Qemu-devel] [PULL 37/41] migration/hmp: add migrate_pause command Juan Quintela
2018-05-09 11:24 ` [Qemu-devel] [PULL 38/41] migration: update docs Juan Quintela
2018-05-09 11:24 ` [Qemu-devel] [PULL 39/41] migration: update index field when delete or qsort RDMALocalBlock Juan Quintela
2018-05-09 11:24 ` [Qemu-devel] [PULL 40/41] migration: Textual fixups for blocktime Juan Quintela
2018-05-09 11:24 ` [Qemu-devel] [PULL 41/41] Migration+TLS: Fix crash due to double cleanup Juan Quintela
2018-05-11 13:41 ` [Qemu-devel] [PULL 00/41] Migration queue Peter Maydell
2018-05-11 14:20   ` Dr. David Alan Gilbert
2018-05-11 14:22     ` Peter Maydell
2018-05-18 10:19   ` Peter Maydell
2018-05-18 10:22     ` Peter Maydell

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=20180509112406.6183-2-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=xiaoguangrong@tencent.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).