From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bonW9-0006By-3E for qemu-devel@nongnu.org; Tue, 27 Sep 2016 04:13:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bonW5-0008FI-5H for qemu-devel@nongnu.org; Tue, 27 Sep 2016 04:13:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bonW4-0008Ew-V0 for qemu-devel@nongnu.org; Tue, 27 Sep 2016 04:13:29 -0400 Date: Tue, 27 Sep 2016 16:13:25 +0800 From: Fam Zheng Message-ID: <20160927081325.GD4591@lemon> References: <1474607430-26500-1-git-send-email-famz@redhat.com> <1474607430-26500-11-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 10/23] vl: Switch qemu_uuid to QemuUUID List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christian Borntraeger Cc: qemu-devel@nongnu.org, Peter Maydell 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 duplica= ted > > low level g_strdup_printf, sscanf and snprintf calls with QEMU UUID A= PI. > >=20 > > 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. > >=20 > > Signed-off-by: Fam Zheng > > Reviewed-by: Eric Blake > > Reviewed-by: Jeff Cody > > 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(-) > >=20 >=20 > This broke s390/kvm >=20 >=20 > 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 =E2=80=98inse= rt_stsi_3_2_2=E2=80=99: > /home/cborntra/REPOS/qemu/target-s390x/kvm.c:2002:30: error: incompatib= le type for argument 2 of =E2=80=98memcpy=E2=80=99 > 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/std= int.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 =E2=80=98const void * = restrict=E2=80=99 but argument is of type =E2=80=98QemuUUID {aka struct <= anonymous>}=E2=80=99 > __NTH (memcpy (void *__restrict __dest, const void *__restrict __src, > ^ > /home/cborntra/REPOS/qemu/rules.mak:60: recipe for target 'target-s390x= /kvm.o' failed >=20 >=20 >=20 >=20 > Will send a fix. Yes, there is also a similar breakage in xen_domain_build_pv. No idea how= I missed that. Fam