OSDN Git Service

tests/qtest: libqos: Rename malloc.h to libqos-malloc.h
authorXuzhou Cheng <xuzhou.cheng@windriver.com>
Wed, 24 Aug 2022 09:40:03 +0000 (17:40 +0800)
committerThomas Huth <thuth@redhat.com>
Mon, 29 Aug 2022 13:28:51 +0000 (15:28 +0200)
commitb243c73cf4dc7017e28577c4056df0655427a76e
tree3c4b4117e8b7cc2eff623d043bf90ae32cb26dc4
parente0e4c27c6f3a34fe8965ee46a301ccf61a31d3b6
tests/qtest: libqos: Rename malloc.h to libqos-malloc.h

The qtest/libqos directory is included via the "-I" option to search
for header files when building qtest. Unfortunately the malloc.h has
a name conflict with the standard libc header, leading to a build
failure on the Windows host, due to the MinGW libc stdlib.h header
file includes malloc.h and it now gets wrongly pointed to the one
in the qtest/libqos directory.

Rename "qtest/libqos/malloc.h" to "qtest/libqos/libqos-malloc.h" to
avoid the namespace pollution.

Signed-off-by: Xuzhou Cheng <xuzhou.cheng@windriver.com>
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220824094029.1634519-26-bmeng.cn@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
28 files changed:
tests/qtest/e1000e-test.c
tests/qtest/fuzz/qos_fuzz.c
tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
tests/qtest/libqos/arm-imx25-pdk-machine.c
tests/qtest/libqos/arm-n800-machine.c
tests/qtest/libqos/arm-raspi2-machine.c
tests/qtest/libqos/arm-sabrelite-machine.c
tests/qtest/libqos/arm-smdkc210-machine.c
tests/qtest/libqos/arm-virt-machine.c
tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
tests/qtest/libqos/e1000e.c
tests/qtest/libqos/generic-pcihost.h
tests/qtest/libqos/libqos-malloc.c [moved from tests/qtest/libqos/malloc.c with 99% similarity]
tests/qtest/libqos/libqos-malloc.h [moved from tests/qtest/libqos/malloc.h with 100% similarity]
tests/qtest/libqos/libqos.h
tests/qtest/libqos/malloc-pc.h
tests/qtest/libqos/malloc-spapr.h
tests/qtest/libqos/meson.build
tests/qtest/libqos/pci-pc.h
tests/qtest/libqos/pci-spapr.h
tests/qtest/libqos/qgraph.h
tests/qtest/libqos/qos_external.c
tests/qtest/libqos/qos_external.h
tests/qtest/libqos/rtas.h
tests/qtest/libqos/virtio-mmio.c
tests/qtest/libqos/virtio-pci.c
tests/qtest/libqos/virtio.h
tests/qtest/qos-test.c