virtio_access_is_big_endian() is only used once in virtio_reset(). Make the VirtIODevice argument const.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/hw/virtio/virtio-access.h | 22 +--------------------- hw/virtio/virtio.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h index f3b4d0075b5..c6b76979749 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -16,29 +16,9 @@ #ifndef QEMU_VIRTIO_ACCESS_H #define QEMU_VIRTIO_ACCESS_H -#include "exec/hwaddr.h" +#include "qemu/bswap.h" #include "system/memory_cached.h" #include "hw/virtio/virtio.h" -#include "hw/virtio/virtio-bus.h" - -#if defined(TARGET_PPC64) || defined(TARGET_ARM) -#define LEGACY_VIRTIO_IS_BIENDIAN 1 -#endif - -static inline bool virtio_access_is_big_endian(VirtIODevice *vdev) -{ -#if defined(LEGACY_VIRTIO_IS_BIENDIAN) - return virtio_is_big_endian(vdev); -#elif TARGET_BIG_ENDIAN - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { - /* Devices conforming to VIRTIO 1.0 or later are always LE. */ - return false; - } - return true; -#else - return false; -#endif -} static inline void virtio_stw_p(VirtIODevice *vdev, void *ptr, uint16_t v) { diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 1dc60d37cb4..627a929b063 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -3233,6 +3233,25 @@ int virtio_set_features_ex(VirtIODevice *vdev, const uint64_t *features) return ret; } +#if defined(TARGET_PPC64) || defined(TARGET_ARM) +#define LEGACY_VIRTIO_IS_BIENDIAN 1 +#endif + +static bool virtio_access_is_big_endian(const VirtIODevice *vdev) +{ +#if defined(LEGACY_VIRTIO_IS_BIENDIAN) + return virtio_is_big_endian(vdev); +#elif TARGET_BIG_ENDIAN + if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + /* Devices conforming to VIRTIO 1.0 or later are always LE. */ + return false; + } + return true; +#else + return false; +#endif +} + void virtio_reset(VirtIODevice *vdev) { VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); -- 2.52.0
