From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVbWX-0008T9-LA for qemu-devel@nongnu.org; Wed, 11 Mar 2015 03:57:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVbWT-0007m5-Ey for qemu-devel@nongnu.org; Wed, 11 Mar 2015 03:57:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33904) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVbWT-0007m1-7T for qemu-devel@nongnu.org; Wed, 11 Mar 2015 03:57:45 -0400 From: Markus Armbruster References: <1425976693-18087-1-git-send-email-borntraeger@de.ibm.com> <54FF6F98.4080102@de.ibm.com> Date: Wed, 11 Mar 2015 08:57:34 +0100 In-Reply-To: <54FF6F98.4080102@de.ibm.com> (Christian Borntraeger's message of "Tue, 10 Mar 2015 23:26:32 +0100") Message-ID: <87k2yormoh.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 00/20] s390x/kvm: Features and fixes for 2.3 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christian Borntraeger Cc: Peter Maydell , Thomas Huth , Alexander Graf , qemu-devel , Jens Freimann , Cornelia Huck , Richard Henderson Christian Borntraeger writes: > Am 10.03.2015 um 19:01 schrieb Peter Maydell: >> On 10 March 2015 at 08:37, Christian Borntraeger >> wrote: >>> Peter, >>> >>> this pull reuqest contains a header sync to 4.0-rc3. This should cause >>> no merge conflicts with other header syncs against 4.0-rc2. So here >>> is the s390 pull request. >>> >>> The following changes since commit 277263e1b320d759a760ba6c5ea75ec268f9= 29e5: >>> >>> Merge remote-tracking branch >>> remotes/agraf/tags/signed-ppc-for-upstream' into staging >>> (2015-03-09 14:04:14 +0000) >>> >>> are available in the git repository at: >>> >>> git://github.com/borntraeger/qemu.git tags/s390x-20150310 >>> >>> for you to fetch changes up to 6342cb1443b37d249a0e2005128ade07a80a97f5: >>> >>> s390-ccw: rebuild BIOS (2015-03-10 09:26:33 +0100) >>=20 >> Unfortunately I see build failures on 32 bit hosts: >>=20 >> /root/qemu/hw/s390x/ipl.c: In function =E2=80=98bios_translate_addr=E2= =80=99: >> /root/qemu/hw/s390x/ipl.c:101:24: error: cast from pointer to integer >> of different size [-Werror=3Dpointer-to-int-cast] >> /root/qemu/hw/s390x/ipl.c: In function =E2=80=98s390_ipl_init=E2=80=99: >> /root/qemu/hw/s390x/ipl.c:135:30: error: cast to pointer from integer >> of different size [-Werror=3Dint-to-pointer-cast] >>=20 > > O dear. Seems that every pull request after your vacation is somewhat bro= ken. > I fixed up patch 19 (" s390/bios: Make the s390-ccw.img relocatable") as > such > > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c > index ab7fd8a..6ed18d3 100644 > --- a/hw/s390x/ipl.c > +++ b/hw/s390x/ipl.c > @@ -98,7 +98,7 @@ static const VMStateDescription vmstate_ipl =3D { >=20=20 > static uint64_t bios_translate_addr(void *opaque, uint64_t srcaddr) > { > - uint64_t dstaddr =3D (uint64_t)opaque; > + uint64_t dstaddr =3D (uint64_t) (unsigned long) opaque; > /* > * Assuming that our s390-ccw.img was linked for starting at address= 0, > * we can simply add the destination address for the final location Won't this shift the warning from hosts where sizeof(void *) !=3D sizeof(uint64_t) to hosts where it's !=3D sizeof(unsigned long)? What about using uintptr_t instead? [...]