Re: [PATCH v2 04/10] migration: Make multifd_save_setup() get an Error parameter

[Juan Quintela]

"Dr. David Alan Gilbert" <address@hidden> wrote:
> * Juan Quintela (address@hidden) wrote:
>> Signed-off-by: Juan Quintela <address@hidden>
>> ---
>>  migration/migration.c | 2 +-
>>  migration/ram.c       | 2 +-
>>  migration/ram.h       | 2 +-
>>  3 files changed, 3 insertions(+), 3 deletions(-)
>> 
>> diff --git a/migration/migration.c b/migration/migration.c
>> index e7f707e033..5a56bd0c91 100644
>> --- a/migration/migration.c
>> +++ b/migration/migration.c
>> @@ -3400,7 +3400,7 @@ void migrate_fd_connect(MigrationState *s, Error 
>> *error_in)
>>          return;
>>      }
>>  
>> -    if (multifd_save_setup() != 0) {
>> +    if (multifd_save_setup(&error_in) != 0) {
>
> I'm not sure that's right.  I think the *error passed into
> migration_channel_connect, and then onto migrate_fd_connect is an
> indication that an error has happened, not a place you can put
> an error pointer.   Note how migration_channel_connect
> frees it after the migrate_fd_connect call, it doesn't report it.


changed this to:

    if (multifd_save_setup(&local_err) != 0) {
       error_report_err(local_err);

Thanks, Juan.