Re: [Qemu-devel] [PULL 00/38] QMP queue

[Markus Armbruster]

Peter Maydell <address@hidden> writes:

> On 8 May 2014 19:52, Luiz Capitulino <address@hidden> wrote:
>> The following changes since commit 6b342cc9c872e82620fdd32730cd92affa8a19b3:
>>
>>   Merge remote-tracking branch 'remotes/spice/tags/pull-spice-7'
>> into staging (2014-05-08 10:57:25 +0100)
>>
>> are available in the git repository at:
>>
>>
>>   git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>>
>> for you to fetch changes up to 4c56cbae6908cc597842e86e523886bb8ea8cfb8:
>>
>>   Revert "qapi: Clean up superfluous null check in
>> qapi_dealloc_type_str()" (2014-05-08 14:20:26 -0400)
>
> Hi; this doesn't build for w32, I'm afraid:
>
> /home/petmay01/linaro/qemu-for-merges/qga/vss-win32.c: In function
> ‘qga_vss_fsfreeze’:
> /home/petmay01/linaro/qemu-for-merges/qga/vss-win32.c:160: error:
> ‘err’ undeclared (first use in this function)
> /home/petmay01/linaro/qemu-for-merges/qga/vss-win32.c:160: error:
> (Each undeclared identifier is reported only once
> /home/petmay01/linaro/qemu-for-merges/qga/vss-win32.c:160: error: for
> each function it appears in.)

My fault!  Apologies...

The obvious fix needs to be squashed into "qga: Consistently name Error
** objects errp, and not err":

diff --git a/qga/vss-win32.c b/qga/vss-win32.c
index b17c909..0e40957 100644
--- a/qga/vss-win32.c
+++ b/qga/vss-win32.c
@@ -157,7 +157,7 @@ void qga_vss_fsfreeze(int *nr_volume, Error **errp, bool 
freeze)
 
     func = (QGAVSSRequesterFunc)GetProcAddress(provider_lib, func_name);
     if (!func) {
-        error_setg_win32(err, GetLastError(), "failed to load %s from %s",
+        error_setg_win32(errp, GetLastError(), "failed to load %s from %s",
                          func_name, QGA_VSS_DLL);
         return;
     }