[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/11] ram_find_and_save_block: change calling conven
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 04/11] ram_find_and_save_block: change calling convention |
Date: |
Mon, 16 Mar 2015 14:41:05 +0100 |
Add a parameter to pass the number of bytes written, and make it return
the number of pages written instead.
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 45 +++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index f1551ed..df5db66 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -654,16 +654,21 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block,
ram_addr_t offset,
return bytes_sent;
}
-/*
- * ram_find_and_save_block: Finds a page to send and sends it to f
+/**
+ * ram_find_and_save_block: Finds a dirty page and sends it to f
*
* Called within an RCU critical section.
*
- * Returns: The number of bytes written.
+ * Returns: The number of pages written
* 0 means no dirty pages
+ *
+ * @f: QEMUFile where to send the data
+ * @last_stage: if we are at the completion stage
+ * @bytes_transferred: increase it with the number of transferred bytes
*/
-static int ram_find_and_save_block(QEMUFile *f, bool last_stage)
+static int ram_find_and_save_block(QEMUFile *f, bool last_stage,
+ uint64_t *bytes_transferred)
{
RAMBlock *block = last_seen_block;
ram_addr_t offset = last_offset;
@@ -702,7 +707,10 @@ static int ram_find_and_save_block(QEMUFile *f, bool
last_stage)
last_seen_block = block;
last_offset = offset;
- return bytes_sent;
+
+ *bytes_transferred += bytes_sent;
+
+ return (bytes_sent != 0);
}
static uint64_t bytes_transferred;
@@ -886,7 +894,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
int ret;
int i;
int64_t t0;
- int total_sent = 0;
+ int pages_sent = 0;
rcu_read_lock();
if (ram_list.version != last_version) {
@@ -901,14 +909,14 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
t0 = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
i = 0;
while ((ret = qemu_file_rate_limit(f)) == 0) {
- int bytes_sent;
+ int pages;
- bytes_sent = ram_find_and_save_block(f, false);
- /* no more blocks to sent */
- if (bytes_sent == 0) {
+ pages = ram_find_and_save_block(f, false, &bytes_transferred);
+ /* no more pages to sent */
+ if (pages == 0) {
break;
}
- total_sent += bytes_sent;
+ pages_sent += pages;
acct_info.iterations++;
check_guest_throttling();
/* we want to check in the 1st loop, just in case it was the 1st time
@@ -934,12 +942,6 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
*/
ram_control_after_iterate(f, RAM_CONTROL_ROUND);
- bytes_transferred += total_sent;
-
- /*
- * Do not count these 8 bytes into total_sent, so that we can
- * return 0 if no page had been dirtied.
- */
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
bytes_transferred += 8;
@@ -948,7 +950,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
return ret;
}
- return total_sent;
+ return pages_sent;
}
/* Called with iothread lock */
@@ -964,14 +966,13 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
/* flush all remaining blocks regardless of rate limiting */
while (true) {
- int bytes_sent;
+ int pages;
- bytes_sent = ram_find_and_save_block(f, true);
+ pages = ram_find_and_save_block(f, true, &bytes_transferred);
/* no more blocks to sent */
- if (bytes_sent == 0) {
+ if (pages == 0) {
break;
}
- bytes_transferred += bytes_sent;
}
ram_control_after_iterate(f, RAM_CONTROL_FINISH);
--
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 <=
- [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