Re: [Qemu-devel] [PULL 10/23] vl: Switch qemu_uuid to QemuUUID

[Fam Zheng <famz@redhat.com>]

On Tue, 09/27 10:05, Christian Borntraeger wrote:
> On 09/23/2016 07:10 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, its switching to
> > QemuUUID is done here too to keep everything in sync and avoid code
> > churn.
> > 
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > Reviewed-by: Eric Blake <eblake@redhat.com>
> > Reviewed-by: Jeff Cody <jcody@redhat.com>
> > Message-Id: <1474432046-325-10-git-send-email-famz@redhat.com>
> > ---
> >  hw/ipmi/ipmi_bmc_sim.c     |  2 +-
> >  hw/nvram/fw_cfg.c          |  2 +-
> >  hw/ppc/spapr.c             |  7 +------
> >  hw/ppc/spapr_rtas.c        |  3 ++-
> >  hw/smbios/smbios.c         | 12 ++++++------
> >  hw/xenpv/xen_domainbuild.c |  6 +-----
> >  include/qemu/uuid.h        |  2 +-
> >  include/sysemu/sysemu.h    |  3 ++-
> >  qmp.c                      | 10 ++--------
> >  ui/spice-core.c            |  2 +-
> >  util/uuid.c                | 11 ++++++-----
> >  vl.c                       |  6 +++---
> >  12 files changed, 27 insertions(+), 39 deletions(-)
> > 
> 
> This broke s390/kvm
> 
> 
> make: Entering directory '/home/cborntra/REPOS/qemu/build'
>   CC    s390x-softmmu/target-s390x/kvm.o
> /home/cborntra/REPOS/qemu/target-s390x/kvm.c: In function ‘insert_stsi_3_2_2’:
> /home/cborntra/REPOS/qemu/target-s390x/kvm.c:2002:30: error: incompatible type for argument 2 of ‘memcpy’
>      memcpy(sysib.vm[0].uuid, qemu_uuid, sizeof(sysib.vm[0].uuid));
>                               ^
> In file included from /usr/include/features.h:365:0,
>                  from /usr/include/stdint.h:25,
>                  from /usr/lib/gcc/s390x-redhat-linux/5.3.1/include/stdint.h:9,
>                  from /home/cborntra/REPOS/qemu/include/qemu/osdep.h:65,
>                  from /home/cborntra/REPOS/qemu/target-s390x/kvm.c:24:
> /usr/include/bits/string3.h:50:1: note: expected ‘const void * restrict’ but argument is of type ‘QemuUUID {aka struct <anonymous>}’
>  __NTH (memcpy (void *__restrict __dest, const void *__restrict __src,
>  ^
> /home/cborntra/REPOS/qemu/rules.mak:60: recipe for target 'target-s390x/kvm.o' failed
> 
> 
> 
> 
> Will send a fix.

Yes, there is also a similar breakage in xen_domain_build_pv. No idea how I
missed that.

Fam