2022-11-08 06:41:59 +00:00
|
|
|
From 56cd14fc23c58707b9184da11f36d777bba6ce78 Mon Sep 17 00:00:00 2001
|
2022-09-13 07:40:35 +00:00
|
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
|
|
|
Date: Wed, 18 May 2022 02:52:23 -0300
|
2022-11-08 06:41:59 +00:00
|
|
|
Subject: [PATCH 04/37] multifd: The variable is only used inside the loop
|
2022-09-13 07:40:35 +00:00
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
RH-Author: Leonardo Brás <leobras@redhat.com>
|
2022-11-08 06:41:59 +00:00
|
|
|
RH-MergeRequest: 191: MSG_ZEROCOPY + Multifd @ rhel8.7
|
|
|
|
|
RH-Commit: [4/26] 45d8bbde75ebbef6329c41ddb56db4526739f94f
|
|
|
|
|
RH-Bugzilla: 2072049
|
2022-09-13 07:40:35 +00:00
|
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
2022-11-08 06:41:59 +00:00
|
|
|
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
2022-09-13 07:40:35 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
|
|
(cherry picked from commit 1943c11a62bd0741e5d9fbba78404fe47ebea820)
|
|
|
|
|
Signed-off-by: Leonardo Bras <leobras@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
migration/multifd.c | 3 +--
|
|
|
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/migration/multifd.c b/migration/multifd.c
|
|
|
|
|
index cdeffdc4c5..ce7101cf9d 100644
|
|
|
|
|
--- a/migration/multifd.c
|
|
|
|
|
+++ b/migration/multifd.c
|
|
|
|
|
@@ -629,7 +629,6 @@ static void *multifd_send_thread(void *opaque)
|
|
|
|
|
MultiFDSendParams *p = opaque;
|
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
int ret = 0;
|
|
|
|
|
- uint32_t flags = 0;
|
|
|
|
|
|
|
|
|
|
trace_multifd_send_thread_start(p->id);
|
|
|
|
|
rcu_register_thread();
|
|
|
|
|
@@ -652,7 +651,7 @@ static void *multifd_send_thread(void *opaque)
|
|
|
|
|
if (p->pending_job) {
|
|
|
|
|
uint32_t used = p->pages->num;
|
|
|
|
|
uint64_t packet_num = p->packet_num;
|
|
|
|
|
- flags = p->flags;
|
|
|
|
|
+ uint32_t flags = p->flags;
|
|
|
|
|
|
|
|
|
|
if (used) {
|
|
|
|
|
ret = multifd_send_state->ops->send_prepare(p, used,
|
|
|
|
|
--
|
|
|
|
|
2.35.3
|
|
|
|
|
|
