From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzWEZ-0005lI-LN for qemu-devel@nongnu.org; Mon, 01 Jun 2015 16:22:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzWEV-0004d8-K4 for qemu-devel@nongnu.org; Mon, 01 Jun 2015 16:22:55 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52685 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzWEV-0004d3-DY for qemu-devel@nongnu.org; Mon, 01 Jun 2015 16:22:51 -0400 Message-ID: <556CBF19.2050302@suse.de> Date: Mon, 01 Jun 2015 22:22:49 +0200 From: Alexander Graf MIME-Version: 1.0 References: <1433166716-36861-1-git-send-email-mimu@linux.vnet.ibm.com> In-Reply-To: <1433166716-36861-1-git-send-email-mimu@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] virtio-input: const_le16 and const_le32 not build time constant List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Mueller , qemu-devel@nongnu.org Cc: Peter Maydell , Gerd Hoffmann On 01.06.15 15:51, Michael Mueller wrote: > As the implementation of const_le16 and const_le32 is not build time co= nstant > on big endian systems this need to be fixed. >=20 > CC hw/input/virtio-input-hid.o > hw/input/virtio-input-hid.c:340:13: error: initializer element is not c= onstant > hw/input/virtio-input-hid.c:340:13: error: (near initialization for =E2= =80=98virtio_keyboard_config[1].u.ids.bustype=E2=80=99) > ... >=20 > Signed-off-by: Michael Mueller Thanks a lot for this patch. It fixes current compile breakage on upstream QEMU for me - or on any big endian system for that matter. For the time being I've included it into my ppc-next tree, but I'd prefer if this gets merged directly before I flush it (for bisectability's sake). Alex > --- > include/hw/virtio/virtio-input.h | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) >=20 > diff --git a/include/hw/virtio/virtio-input.h b/include/hw/virtio/virti= o-input.h > index a265519..bcee355 100644 > --- a/include/hw/virtio/virtio-input.h > +++ b/include/hw/virtio/virtio-input.h > @@ -14,8 +14,14 @@ typedef struct virtio_input_config virtio_input_conf= ig; > typedef struct virtio_input_event virtio_input_event; > =20 > #if defined(HOST_WORDS_BIGENDIAN) > -# define const_le32(_x) bswap32(_x) > -# define const_le16(_x) bswap32(_x) > +# define const_le32(_x) \ > + (((_x & 0x000000ffU) << 24) | \ > + ((_x & 0x0000ff00U) << 8) | \ > + ((_x & 0x00ff0000U) >> 8) | \ > + ((_x & 0xff000000U) >> 24)) > +# define const_le16(_x) \ > + (((_x & 0x00ff) << 8) | \ > + ((_x & 0xff00) >> 8)) > #else > # define const_le32(_x) (_x) > # define const_le16(_x) (_x) >=20