SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

multifd: Remove some redundant code

Browse Source 
Clean up some unnecessary code

Signed-off-by: Li Zhang <lizhang@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Li Zhang 2022-01-27 21:02:01 +01:00 committed by Juan Quintela
parent e3f37b2ce6
commit bca762c2b9
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
migration/multifd.c
View File

@ -892,19 +892,15 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
Error *local_err = NULL; Error *local_err = NULL;
trace_multifd_new_send_channel_async(p->id); trace_multifd_new_send_channel_async(p->id);
if (qio_task_propagate_error(task, &local_err)) { if (!qio_task_propagate_error(task, &local_err)) {
goto cleanup;
} else {
p->c = QIO_CHANNEL(sioc); p->c = QIO_CHANNEL(sioc);
qio_channel_set_delay(p->c, false); qio_channel_set_delay(p->c, false);
p->running = true; p->running = true;
if (!multifd_channel_connect(p, sioc, local_err)) { if (multifd_channel_connect(p, sioc, local_err)) {
goto cleanup; return;
} }
return;
} }
cleanup:
multifd_new_send_channel_cleanup(p, sioc, local_err); multifd_new_send_channel_cleanup(p, sioc, local_err);
} }
@ -1115,10 +1111,7 @@ static void *multifd_recv_thread(void *opaque)
ret = qio_channel_read_all_eof(p->c, (void *)p->packet, ret = qio_channel_read_all_eof(p->c, (void *)p->packet,
p->packet_len, &local_err); p->packet_len, &local_err);
if (ret == 0) { /* EOF */ if (ret == 0 || ret == -1) { /* 0: EOF -1: Error */
break;
}
if (ret == -1) { /* Error */
break; break;
} }