On 11/02/2018 10:46 AM, Peter Xu wrote:
On Thu, Nov 01, 2018 at 06:17:12PM +0800, Fei Li wrote:
[...]
@@ -1339,7 +1339,7 @@ bool multifd_recv_all_channels_created(void)
}
/* Return true if multifd is ready for the migration, otherwise false */
-bool multifd_recv_new_channel(QIOChannel *ioc)
+bool multifd_recv_new_channel(QIOChannel *ioc, Error **errp)
{
MultiFDRecvParams *p;
Error *local_err = NULL;
@@ -1347,6 +1347,9 @@ bool multifd_recv_new_channel(QIOChannel *ioc)
id = multifd_recv_initial_packet(ioc, &local_err);
if (id < 0) {
+ error_propagate_prepend(errp, local_err,
+ "failed to receive packet via multifd channel %x: ",
I'd use either %d or 0x%x, and some indent issue.
Otherwise looks good to me. Thanks,
Thanks, fixed as:
id = multifd_recv_initial_packet(ioc, &local_err);
if (id < 0) {
+ error_propagate_prepend(errp, local_err,
+ "failed to receive packet"
+ " via multifd channel %d: ",
+ multifd_recv_state->count);
Have a nice day :)
Fei
