Replace compile-time #ifdef with a runtime check to ensure all code paths are built and tested. This reduces build-time configuration complexity and improves maintainability.
No functional change intended. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/hw/virtio/virtio-gpu-bswap.h | 6 +++--- hw/display/artist.c | 12 ++++++------ hw/display/vga.c | 20 ++++++++------------ hw/display/virtio-gpu-gl.c | 8 ++++---- hw/display/virtio-gpu-rutabaga.c | 8 ++++---- 5 files changed, 25 insertions(+), 29 deletions(-) diff --git a/include/hw/virtio/virtio-gpu-bswap.h b/include/hw/virtio/virtio-gpu-bswap.h index dd1975e2d40..279734231e2 100644 --- a/include/hw/virtio/virtio-gpu-bswap.h +++ b/include/hw/virtio/virtio-gpu-bswap.h @@ -29,7 +29,9 @@ virtio_gpu_ctrl_hdr_bswap(struct virtio_gpu_ctrl_hdr *hdr) static inline void virtio_gpu_bswap_32(void *ptr, size_t size) { -#if HOST_BIG_ENDIAN + if (!HOST_BIG_ENDIAN) { + return; + } size_t i; struct virtio_gpu_ctrl_hdr *hdr = (struct virtio_gpu_ctrl_hdr *) ptr; @@ -41,8 +43,6 @@ virtio_gpu_bswap_32(void *ptr, size_t size) le32_to_cpus((uint32_t *)(ptr + i)); i = i + sizeof(uint32_t); } - -#endif } static inline void diff --git a/hw/display/artist.c b/hw/display/artist.c index 3c884c92437..8d73f2d894d 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -738,9 +738,9 @@ static void combine_write_reg(hwaddr addr, uint64_t val, int size, void *out) * FIXME: is there a qemu helper for this? */ -#if !HOST_BIG_ENDIAN - addr ^= 3; -#endif + if (!HOST_BIG_ENDIAN) { + addr ^= 3; + } switch (size) { case 1: @@ -1132,9 +1132,9 @@ static uint64_t combine_read_reg(hwaddr addr, int size, void *in) * FIXME: is there a qemu helper for this? */ -#if !HOST_BIG_ENDIAN - addr ^= 3; -#endif + if (!HOST_BIG_ENDIAN) { + addr ^= 3; + } switch (size) { case 1: diff --git a/hw/display/vga.c b/hw/display/vga.c index 90b89cf4044..01b1cfa98d3 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1307,13 +1307,13 @@ static void vga_draw_text(VGACommonState *s, int full_update) if (cx > cx_max) cx_max = cx; *ch_attr_ptr = ch_attr; -#if HOST_BIG_ENDIAN - ch = ch_attr >> 8; - cattr = ch_attr & 0xff; -#else - ch = ch_attr & 0xff; - cattr = ch_attr >> 8; -#endif + if (HOST_BIG_ENDIAN) { + ch = ch_attr >> 8; + cattr = ch_attr & 0xff; + } else { + ch = ch_attr & 0xff; + cattr = ch_attr >> 8; + } font_ptr = font_base[(cattr >> 3) & 1]; font_ptr += 32 * 4 * ch; bgcol = palette[cattr >> 4]; @@ -1489,11 +1489,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) vga_draw_line_func *vga_draw_line = NULL; bool allocate_surface, force_shadow = false; pixman_format_code_t format; -#if HOST_BIG_ENDIAN - bool byteswap = !s->big_endian_fb; -#else - bool byteswap = s->big_endian_fb; -#endif + bool byteswap = s->big_endian_fb ^ HOST_BIG_ENDIAN; full_update |= update_basic_params(s); diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index c06a078fb36..c29152a3c7a 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -123,10 +123,10 @@ static void virtio_gpu_gl_device_realize(DeviceState *qdev, Error **errp) ERRP_GUARD(); VirtIOGPU *g = VIRTIO_GPU(qdev); -#if HOST_BIG_ENDIAN - error_setg(errp, "virgl is not supported on bigendian platforms"); - return; -#endif + if (HOST_BIG_ENDIAN) { + error_setg(errp, "virgl is not supported on bigendian platforms"); + return; + } if (!object_resolve_path_type("", TYPE_VIRTIO_GPU_GL, NULL)) { error_setg(errp, "at most one %s device is permitted", TYPE_VIRTIO_GPU_GL); diff --git a/hw/display/virtio-gpu-rutabaga.c b/hw/display/virtio-gpu-rutabaga.c index ed5ae52acbe..f82a84b53aa 100644 --- a/hw/display/virtio-gpu-rutabaga.c +++ b/hw/display/virtio-gpu-rutabaga.c @@ -1074,10 +1074,10 @@ static void virtio_gpu_rutabaga_realize(DeviceState *qdev, Error **errp) VirtIOGPUBase *bdev = VIRTIO_GPU_BASE(qdev); VirtIOGPU *gpudev = VIRTIO_GPU(qdev); -#if HOST_BIG_ENDIAN - error_setg(errp, "rutabaga is not supported on bigendian platforms"); - return; -#endif + if (HOST_BIG_ENDIAN) { + error_setg(errp, "rutabaga is not supported on bigendian platforms"); + return; + } if (!virtio_gpu_rutabaga_init(gpudev, errp)) { return; -- 2.51.0
