On 09/17/2016 04:38 PM, Eric Blake wrote:
> On 08/17/2016 02:28 AM, Fam Zheng wrote:
>> Update all qemu_uuid users as well, especially get rid of the duplicated
>> low level g_strdup_printf, sscanf and snprintf calls with QEMU UUID API.
>>
>> Since qemu_uuid_parse is quite tangled with qemu_uuid, it's switching to
>> QemuUUID is done here too to keep everything in sync and avoid code
>> churn.
>>
>> Signed-off-by: Fam Zheng <f...@redhat.com>
>> ---
> 
> Reviewed-by: Eric Blake <ebl...@redhat.com>
> 

Spoke too soon; this fails compilation for me, because you missed a few
spots:

  CC    ui/sdl2-2d.o
ui/spice-core.c: In function ‘qemu_spice_init’:
ui/spice-core.c:799:41: error: incompatible type for argument 2 of
‘spice_server_set_uuid’
     spice_server_set_uuid(spice_server, qemu_uuid);
                                         ^~~~~~~~~
In file included from /usr/include/spice-server/spice.h:25:0,
                 from ui/spice-core.c:19:
/usr/include/spice-server/spice-server.h:121:6: note: expected ‘const
uint8_t * {aka const unsigned char *}’ but argument is of type ‘QemuUUID
{aka struct <anonymous>}’
 void spice_server_set_uuid(SpiceServer *s, const uint8_t uuid[16]);
      ^~~~~~~~~~~~~~~~~~~~~

/home/eblake/qemu/hw/ppc/spapr_rtas.c: In function
‘rtas_ibm_get_system_parameter’:
/home/eblake/qemu/hw/ppc/spapr_rtas.c:306:42: error: incompatible type
for argument 3 of ‘sysparm_st’
         ret = sysparm_st(buffer, length, qemu_uuid, (qemu_uuid_set ? 16
: 0));
                                          ^~~~~~~~~
/home/eblake/qemu/hw/ppc/spapr_rtas.c:261:19: note: expected ‘const void
*’ but argument is of type ‘QemuUUID {aka struct <anonymous>}’
 static inline int sysparm_st(target_ulong addr, target_ulong len,
                   ^~~~~~~~~~
/home/eblake/qemu/rules.mak:60: recipe for target 'hw/ppc/spapr_rtas.o'
failed


The fixups should be obvious, though, so fold them in, and you can keep R-b.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to