48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 0e42e63ddcaddd8837ba5ba1056380d4590754ee Mon Sep 17 00:00:00 2001
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
Date: Wed, 4 Sep 2019 11:23:32 +0100
|
|
Subject: [PATCH 4/6] migration: update ram_counters for multifd sync packet
|
|
|
|
RH-Author: Juan Quintela <quintela@redhat.com>
|
|
Message-id: <20190904112332.16160-5-quintela@redhat.com>
|
|
Patchwork-id: 90280
|
|
O-Subject: [RHEL-AV-8.1 qemu-kvm PATCH v2 4/4] migration: update ram_counters for multifd sync packet
|
|
Bugzilla: 1734316
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
|
|
|
From: Ivan Ren <ivanren@tencent.com>
|
|
|
|
Multifd sync will send MULTIFD_FLAG_SYNC flag info to destination, add
|
|
these bytes to ram_counters record.
|
|
|
|
Signed-off-by: Ivan Ren <ivanren@tencent.com>
|
|
Suggested-by: Wei Yang <richardw.yang@linux.intel.com>
|
|
Message-Id: <1564464816-21804-4-git-send-email-ivanren@tencent.com>
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
(cherry picked from commit 81507f6b7e87468f24ed5886559feda15fe2db0c)
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
migration/ram.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/migration/ram.c b/migration/ram.c
|
|
index 88ddd2b..20b6eeb 100644
|
|
--- a/migration/ram.c
|
|
+++ b/migration/ram.c
|
|
@@ -1085,6 +1085,8 @@ static void multifd_send_sync_main(RAMState *rs)
|
|
p->flags |= MULTIFD_FLAG_SYNC;
|
|
p->pending_job++;
|
|
qemu_file_update_transfer(rs->f, p->packet_len);
|
|
+ ram_counters.multifd_bytes += p->packet_len;
|
|
+ ram_counters.transferred += p->packet_len;
|
|
qemu_mutex_unlock(&p->mutex);
|
|
qemu_sem_post(&p->sem);
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|