[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 06/14] migration: Send the fd number which we ar
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v10 06/14] migration: Send the fd number which we are going to use for this page |
Date: |
Wed, 10 Jan 2018 13:47:15 +0100 |
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 | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/migration/ram.c b/migration/ram.c
index 5d6b46ac23..19c8089c4b 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1191,6 +1191,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;
@@ -1202,7 +1203,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);
- multifd_send_page(block, offset, rs->migration_dirty_pages == 1);
+ fd_num = multifd_send_page(block, offset,
+ 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);
ram_counters.transferred += TARGET_PAGE_SIZE;
pages = 1;
@@ -3040,6 +3044,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);
@@ -3151,6 +3156,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.14.3
- Re: [Qemu-devel] [PATCH v10 03/14] migration: Drop current address parameter from save_zero_page(), (continued)
- [Qemu-devel] [PATCH v10 05/14] migration: Create ram_multifd_page, Juan Quintela, 2018/01/10
- [Qemu-devel] [PATCH v10 07/14] migration: Create thread infrastructure for multifd recv side, Juan Quintela, 2018/01/10
- [Qemu-devel] [PATCH v10 04/14] migration: Start of multiple fd work, Juan Quintela, 2018/01/10
- [Qemu-devel] [PATCH v10 08/14] migration: Transfer pages over new channels, Juan Quintela, 2018/01/10
- [Qemu-devel] [PATCH v10 06/14] migration: Send the fd number which we are going to use for this page,
Juan Quintela <=
- [Qemu-devel] [PATCH v10 11/14] LOCAL: use trace events for migration-test, Juan Quintela, 2018/01/10
- [Qemu-devel] [PATCH v10 10/14] migration: Add multifd test, Juan Quintela, 2018/01/10
- [Qemu-devel] [PATCH v10 09/14] migration: Flush receive queue, Juan Quintela, 2018/01/10
- [Qemu-devel] [PATCH v10 12/14] migration: Sent the page list over the normal thread, Juan Quintela, 2018/01/10
- [Qemu-devel] [PATCH v10 13/14] migration: Add multifd_send_packet trace, Juan Quintela, 2018/01/10
- [Qemu-devel] [PATCH v10 14/14] all works, Juan Quintela, 2018/01/10
- Re: [Qemu-devel] [RFC 00/14] Multifd, Juan Quintela, 2018/01/10