Re: [Qemu-devel] [PATCH v2 02/15] qga: Consistently name Error ** objects errp, and not err

[Markus Armbruster]

Michael Roth <address@hidden> writes:

> Quoting Markus Armbruster (2014-04-28 15:27:41)
>> Signed-off-by: Markus Armbruster <address@hidden>
>> Reviewed-by: Eric Blake <address@hidden>
>> ---
>>  qga/commands-posix.c | 209 
>> ++++++++++++++++++++++++++-------------------------
>>  qga/commands-win32.c | 115 ++++++++++++++--------------
>>  qga/commands.c       |   4 +-
>>  qga/vss-win32.c      |   4 +-
>>  qga/vss-win32.h      |   2 +-
>>  5 files changed, 170 insertions(+), 164 deletions(-)
>> 
>> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
>> index 935a4ec..e49c7da 100644
>> --- a/qga/commands-posix.c
>> +++ b/qga/commands-posix.c
[...]
>> @@ -829,21 +832,21 @@ int64_t qmp_guest_fsfreeze_thaw(Error **err)
>>      ga_unset_frozen(ga_state);
>>      free_fs_mount_list(&mounts);
>> 
>> -    execute_fsfreeze_hook(FSFREEZE_HOOK_THAW, err);
>> +    execute_fsfreeze_hook(FSFREEZE_HOOK_THAW, errp);
>> 
>>      return i;
>>  }
>> 
>>  static void guest_fsfreeze_cleanup(void)
>>  {
>> -    Error *err = NULL;
>> +    Error *errp = NULL;
>
> Surprisingly, I actually got this one right the first time around.
>
> Well, I guess Error *local_err is the convention for these, so maybe
> not...

Right enough for me :)

Anyway, I'll fix my screwup.

> Looks good otherwise.

Thanks!