[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 15/20] migration: Send the fd number which we are
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v8 15/20] migration: Send the fd number which we are going to use for this page |
Date: |
Wed, 13 Sep 2017 12:59:48 +0200 |
We are still sending the page through the main channel, that would
change later in the series
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 179b45eea7..3f60f7e40c 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -597,7 +597,7 @@ static uint16_t multifd_send_page(uint8_t *address, bool
last_page)
qemu_mutex_unlock(&p->mutex);
qemu_sem_post(&p->sem);
- return 0;
+ return i;
}
struct MultiFDRecvParams {
@@ -1186,6 +1186,7 @@ static int ram_multifd_page(RAMState *rs,
PageSearchStatus *pss,
bool last_stage)
{
int pages;
+ uint16_t fd_num;
uint8_t *p;
RAMBlock *block = pss->block;
ram_addr_t offset = pss->page << TARGET_PAGE_BITS;
@@ -1197,8 +1198,10 @@ static int ram_multifd_page(RAMState *rs,
PageSearchStatus *pss,
ram_counters.transferred +=
save_page_header(rs, rs->f, block,
offset | RAM_SAVE_FLAG_MULTIFD_PAGE);
+ fd_num = multifd_send_page(p, rs->migration_dirty_pages == 1);
+ qemu_put_be16(rs->f, fd_num);
+ ram_counters.transferred += 2; /* size of fd_num */
qemu_put_buffer(rs->f, p, TARGET_PAGE_SIZE);
- multifd_send_page(p, rs->migration_dirty_pages == 1);
ram_counters.transferred += TARGET_PAGE_SIZE;
pages = 1;
ram_counters.normal++;
@@ -2948,6 +2951,7 @@ static int ram_load(QEMUFile *f, void *opaque, int
version_id)
while (!postcopy_running && !ret && !(flags & RAM_SAVE_FLAG_EOS)) {
ram_addr_t addr, total_ram_bytes;
void *host = NULL;
+ uint16_t fd_num;
uint8_t ch;
addr = qemu_get_be64(f);
@@ -3058,6 +3062,11 @@ static int ram_load(QEMUFile *f, void *opaque, int
version_id)
break;
case RAM_SAVE_FLAG_MULTIFD_PAGE:
+ fd_num = qemu_get_be16(f);
+ if (fd_num != 0) {
+ /* this is yet an unused variable, changed later */
+ fd_num = fd_num;
+ }
qemu_get_buffer(f, host, TARGET_PAGE_SIZE);
break;
--
2.13.5
- [Qemu-devel] [PATCH v8 07/20] migration: Add multifd capability, (continued)
- [Qemu-devel] [PATCH v8 07/20] migration: Add multifd capability, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 08/20] migration: Create x-multifd-channels parameter, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 11/20] migration: Split migration_fd_process_incoming, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 10/20] migration: Create multifd migration threads, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 12/20] migration: Start of multiple fd work, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 13/20] migration: Create ram_multifd_page, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 09/20] migration: Create x-multifd-page-count parameter, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 14/20] migration: Really use multiple pages at a time, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 15/20] migration: Send the fd number which we are going to use for this page,
Juan Quintela <=
- [Qemu-devel] [PATCH v8 17/20] migration: Test new fd infrastructure, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 16/20] migration: Create thread infrastructure for multifd recv side, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 19/20] migration: Transfer pages over new channels, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 20/20] migration: Flush receive queue, Juan Quintela, 2017/09/13
- [Qemu-devel] [PATCH v8 18/20] migration: Rename initial_bytes, Juan Quintela, 2017/09/13