[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 07/11] save_block_hdr: we can recalculate the con
From: |
Juan Quintela |
Subject: |
Re: [Qemu-devel] [PULL 07/11] save_block_hdr: we can recalculate the cont parameter here |
Date: |
Tue, 17 Mar 2015 13:00:23 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) |
"Li, Liang Z" <address@hidden> wrote:
> Hi Juan
>
> This patch will make my work more difficult, as we discussed
> before, after modification,
> I have to use a lock before I can reuse the function save_block_hdr in
> my compression threads,
> this will lead to low efficiency. Could help to revert this patch?
>
> Liang
Sorry, my intention was to just revert the bits that you neded, what
does this patch works for you?
I just moved back the uses of last_sent_block() where there were before.
Thanks, Juan.
>From 76bdb0c98e345dcc4777d4b034efd4ccd71489ba Mon Sep 17 00:00:00 2001
From: Juan Quintela <address@hidden>
Date: Tue, 17 Mar 2015 12:56:13 +0100
Subject: [PATCH] migration: remove last_sent_block from save_page_header
Compression code (still not on tree) want to call this funtion from
outside the migration thread, so we can't write to last_sent_block.
Instead of reverting full patch:
[PULL 07/11] save_block_hdr: we can recalculate
Just revert the parts that touch last_sent_block.
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index c3f7d3f..c779957 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -332,19 +332,14 @@ static size_t save_page_header(QEMUFile *f, RAMBlock
*block, ram_addr_t offset)
{
size_t size;
- if (block == last_sent_block) {
- offset |= RAM_SAVE_FLAG_CONTINUE;
- }
-
qemu_put_be64(f, offset);
size = 8;
- if (block != last_sent_block) {
+ if (!(offset & RAM_SAVE_FLAG_CONTINUE)) {
qemu_put_byte(f, strlen(block->idstr));
qemu_put_buffer(f, (uint8_t *)block->idstr,
strlen(block->idstr));
size += 1 + strlen(block->idstr);
- last_sent_block = block;
}
return size;
}
@@ -644,6 +639,10 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block,
ram_addr_t offset,
XBZRLE_cache_lock();
current_addr = block->offset + offset;
+
+ if (block == last_sent_block) {
+ offset |= RAM_SAVE_FLAG_CONTINUE;
+ }
if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
if (ret != RAM_SAVE_CONTROL_DELAYED) {
if (bytes_xmit > 0) {
@@ -739,6 +738,7 @@ static int ram_find_and_save_block(QEMUFile *f, bool
last_stage,
/* if page is unmodified, continue to the next */
if (pages > 0) {
+ last_sent_block = block;
break;
}
}
--
2.1.0
- [Qemu-devel] [PULL 00/11] Migration pull request, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 01/11] Add -incoming defer, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 02/11] Add migrate_incoming, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 06/11] save_xbzrle_page: change calling convention, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 04/11] ram_find_and_save_block: change calling convention, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 05/11] ram_save_page: change calling covention, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 03/11] ram: make all save_page functions take a uint64_t parameter, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 07/11] save_block_hdr: we can recalculate the cont parameter here, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 08/11] rename save_block_hdr to save_page_header, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 09/11] migration: Read JSON VM description on incoming migration, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 10/11] migration: Allow to suppress vmdesc submission, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 11/11] pc: Disable vmdesc submission for old machines, Juan Quintela, 2015/03/16
- Re: [Qemu-devel] [PULL 00/11] Migration pull request, Markus Armbruster, 2015/03/16
- Re: [Qemu-devel] [PULL 00/11] Migration pull request, Peter Maydell, 2015/03/16