Commit 16c9d46d authored by Michael Mueller's avatar Michael Mueller Committed by Gerd Hoffmann
Browse files

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: default avatarMichael Mueller <mimu@linux.vnet.ibm.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent b821cbe2

include/hw/virtio/virtio-input.h

+8 −2
Original line number Diff line number Diff line
@@ -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)