diff options
| author | Michael Mueller <mimu@linux.vnet.ibm.com> | 2015-06-01 15:51:56 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-06-02 10:29:54 +0200 |
| commit | 16c9d46d32b39b147774ddd948dd2f9ad9049d02 (patch) | |
| tree | 19e76fbed4f02ae9f7b11971408555cee4b4a16e | |
| parent | b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3 (diff) | |
| download | qemu-16c9d46d32b39b147774ddd948dd2f9ad9049d02.zip qemu-16c9d46d32b39b147774ddd948dd2f9ad9049d02.tar.gz qemu-16c9d46d32b39b147774ddd948dd2f9ad9049d02.tar.bz2 | |
virtio-input: const_le16 and const_le32 not build time constant
As the implementation of const_le16 and const_le32 is not build time constant
on big endian systems this need to be fixed.
CC hw/input/virtio-input-hid.o
hw/input/virtio-input-hid.c:340:13: error: initializer element is not constant
hw/input/virtio-input-hid.c:340:13: error: (near initialization for ‘virtio_keyboard_config[1].u.ids.bustype’)
...
Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | include/hw/virtio/virtio-input.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/hw/virtio/virtio-input.h b/include/hw/virtio/virtio-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_config; typedef struct virtio_input_event virtio_input_event; #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) |