[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 10/23] vl: Switch qemu_uuid to QemuUUID
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PULL 10/23] vl: Switch qemu_uuid to QemuUUID |
Date: |
Tue, 27 Sep 2016 16:13:25 +0800 |
User-agent: |
Mutt/1.7.0 (2016-08-17) |
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 <address@hidden>
> > Reviewed-by: Eric Blake <address@hidden>
> > Reviewed-by: Jeff Cody <address@hidden>
> > Message-Id: <address@hidden>
> > ---
> > 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
- [Qemu-devel] [PULL 03/23] uuid: Make null_uuid static, (continued)
- [Qemu-devel] [PULL 03/23] uuid: Make null_uuid static, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 02/23] util: Add UUID API, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 05/23] vdi: Use QEMU UUID API, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 04/23] vhdx: Use QEMU UUID API, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 06/23] vpc: Use QEMU UUID API, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 07/23] crypto: Switch to QEMU UUID API, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 08/23] tests: No longer dependent on CONFIG_UUID, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 09/23] configure: Remove detection code for UUID, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 10/23] vl: Switch qemu_uuid to QemuUUID, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 11/23] uuid: Tighten uuid parse, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 13/23] Add UUID files to MAINTAINERS, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 12/23] tests: Add uuid tests, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 14/23] tests: Ignore test-uuid, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 15/23] docker: Generate /packages.txt in centos6 image, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 16/23] docker: Generate /packages.txt in fedora image, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 17/23] docker: Generate /packages.txt in ubuntu image, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 18/23] docker: Update fedora image to latest, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 19/23] docker: Flatten default target list in test-quick, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 20/23] docker: Print used options before doing configure, Fam Zheng, 2016/09/23