[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/13] migration: Send the fd number which we are go
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 10/13] migration: Send the fd number which we are going to use for this page |
Date: |
Wed, 20 Apr 2016 16:44:38 +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>
---
migration/ram.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 4b73100..47e208b 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -501,7 +501,7 @@ void migrate_multifd_send_threads_create(void)
}
}
-static void multifd_send_page(uint8_t *address)
+static int multifd_send_page(uint8_t *address)
{
int i, thread_count;
bool found = false;
@@ -525,6 +525,8 @@ static void multifd_send_page(uint8_t *address)
multifd_send[i].address = address;
qemu_cond_signal(&multifd_send[i].cond);
qemu_mutex_unlock(&multifd_send[i].mutex);
+
+ return i;
}
struct MultiFDRecvParams {
@@ -1027,6 +1029,7 @@ static int ram_multifd_page(QEMUFile *f, PageSearchStatus
*pss,
bool last_stage, uint64_t *bytes_transferred)
{
int pages;
+ uint16_t fd_num;
uint8_t *p;
RAMBlock *block = pss->block;
ram_addr_t offset = pss->offset;
@@ -1040,8 +1043,10 @@ static int ram_multifd_page(QEMUFile *f,
PageSearchStatus *pss,
if (pages == -1) {
*bytes_transferred +=
save_page_header(f, block, offset | RAM_SAVE_FLAG_MULTIFD_PAGE);
+ fd_num = multifd_send_page(p);
+ qemu_put_be16(f, fd_num);
+ *bytes_transferred += 2; /* size of fd_num */
qemu_put_buffer(f, p, TARGET_PAGE_SIZE);
- multifd_send_page(p);
*bytes_transferred += TARGET_PAGE_SIZE;
pages = 1;
acct_info.norm_pages++;
@@ -2693,6 +2698,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);
@@ -2778,6 +2784,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 == fd_num) {
+ /* this is yet an unused variable, changed later */
+ fd_num = 0;
+ }
qemu_get_buffer(f, host, TARGET_PAGE_SIZE);
break;
--
2.5.5
- Re: [Qemu-devel] [PATCH 01/13] migration: create Migration Incoming State at init time, (continued)
- [Qemu-devel] [PATCH 03/13] migration: [HACK] Don't create decompression threads if not enabled, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 02/13] migration: Pass TCP args in an struct, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 09/13] migration: Create thread infrastructure for multifd send side, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 06/13] migration: create multifd migration threads, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 07/13] migration: Start of multiple fd work, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 04/13] migration: Add multifd capability, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 05/13] migration: Create x-multifd-threads parameter, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 08/13] migration: create ram_multifd_page, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 10/13] migration: Send the fd number which we are going to use for this page,
Juan Quintela <=
- [Qemu-devel] [PATCH 12/13] migration: Test new fd infrastructure, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 13/13] migration: [HACK]Transfer pages over new channels, Juan Quintela, 2016/04/20
- [Qemu-devel] [PATCH 11/13] migration: Create thread infrastructure for multifd recv side, Juan Quintela, 2016/04/20
- Re: [Qemu-devel] [RFC 00/13] Multiple fd migration support, Michael S. Tsirkin, 2016/04/20
- Re: [Qemu-devel] [RFC 00/13] Multiple fd migration support, Dr. David Alan Gilbert, 2016/04/22