[v1] hw/mips/loongson3: Remove uses of &first_cpu global

[PATCH 05/11] hw/mips/loongson3_bootp: Include missing headers

Posted by Philippe Mathieu-Daudé 3 months, 4 weeks ago

MemMapEntry is declared in "exec/hwaddr.h", cpu_to_le32() in
"qemu/bswap.h". These headers are indirectly included via "cpu.h".
Include them explicitly in order to avoid when removing "cpu.h":

  In file included from ../../hw/mips/loongson3_bootp.c:27:
  hw/mips/loongson3_bootp.h:234:14: error: unknown type name 'MemMapEntry'
    234 | extern const MemMapEntry virt_memmap[];
        |              ^
  hw/mips/loongson3_bootp.c:33:18: error: call to undeclared function 'cpu_to_le32'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
     33 |     c->cputype = cpu_to_le32(Loongson_3A);
        |                  ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/mips/loongson3_bootp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/mips/loongson3_bootp.c b/hw/mips/loongson3_bootp.c
index b97b81903b7..712439c2575 100644
--- a/hw/mips/loongson3_bootp.c
+++ b/hw/mips/loongson3_bootp.c
@@ -21,6 +21,8 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/cutils.h"
+#include "qemu/bswap.h"
+#include "exec/hwaddr.h"
 #include "cpu.h"
 #include "hw/boards.h"
 #include "hw/mips/loongson3_bootp.h"
-- 
2.47.1

Re: [PATCH 05/11] hw/mips/loongson3_bootp: Include missing headers

Posted by Richard Henderson 3 months, 3 weeks ago

On 1/12/25 13:58, Philippe Mathieu-Daudé wrote:
> MemMapEntry is declared in "exec/hwaddr.h", cpu_to_le32() in
> "qemu/bswap.h". These headers are indirectly included via "cpu.h".
> Include them explicitly in order to avoid when removing "cpu.h":
> 
>    In file included from ../../hw/mips/loongson3_bootp.c:27:
>    hw/mips/loongson3_bootp.h:234:14: error: unknown type name 'MemMapEntry'
>      234 | extern const MemMapEntry virt_memmap[];
>          |              ^
>    hw/mips/loongson3_bootp.c:33:18: error: call to undeclared function 'cpu_to_le32'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
>       33 |     c->cputype = cpu_to_le32(Loongson_3A);
>          |                  ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/mips/loongson3_bootp.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/hw/mips/loongson3_bootp.c b/hw/mips/loongson3_bootp.c
> index b97b81903b7..712439c2575 100644
> --- a/hw/mips/loongson3_bootp.c
> +++ b/hw/mips/loongson3_bootp.c
> @@ -21,6 +21,8 @@
>   #include "qemu/osdep.h"
>   #include "qemu/units.h"
>   #include "qemu/cutils.h"
> +#include "qemu/bswap.h"
> +#include "exec/hwaddr.h"
>   #include "cpu.h"
>   #include "hw/boards.h"
>   #include "hw/mips/loongson3_bootp.h"

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~