[v4] dump: Make most of it target agnostic (build once)

[PATCH v4 3/7] dump: Correct headers included

Posted by Philippe Mathieu-Daudé 2 years, 2 months ago

"qemu/win_dump_defs.h" is only required by win_dump.c,
but win_dump.h requires "sysemu/dump.h" which declares
the DumpState type.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 dump/win_dump.c | 1 +
 dump/win_dump.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dump/win_dump.c b/dump/win_dump.c
index f20b6051b6..12b7da5da0 100644
--- a/dump/win_dump.c
+++ b/dump/win_dump.c
@@ -21,6 +21,7 @@
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "hw/misc/vmcoreinfo.h"
+#include "qemu/win_dump_defs.h"
 #include "win_dump.h"
 
 static size_t win_dump_ptr_size(bool x64)
diff --git a/dump/win_dump.h b/dump/win_dump.h
index b8c25348f4..56f63683c3 100644
--- a/dump/win_dump.h
+++ b/dump/win_dump.h
@@ -11,7 +11,7 @@
 #ifndef WIN_DUMP_H
 #define WIN_DUMP_H
 
-#include "qemu/win_dump_defs.h"
+#include "sysemu/dump.h"
 
 void create_win_dump(DumpState *s, Error **errp);
 
-- 
2.38.1

Re: [PATCH v4 3/7] dump: Correct headers included

Posted by Thomas Huth 2 years, 2 months ago

On 24/02/2023 00.17, Philippe Mathieu-Daudé wrote:
> "qemu/win_dump_defs.h" is only required by win_dump.c,
> but win_dump.h requires "sysemu/dump.h" which declares
> the DumpState type.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   dump/win_dump.c | 1 +
>   dump/win_dump.h | 2 +-
>   2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/dump/win_dump.c b/dump/win_dump.c
> index f20b6051b6..12b7da5da0 100644
> --- a/dump/win_dump.c
> +++ b/dump/win_dump.c
> @@ -21,6 +21,7 @@
>   #include "qapi/qmp/qerror.h"
>   #include "qemu/error-report.h"
>   #include "hw/misc/vmcoreinfo.h"
> +#include "qemu/win_dump_defs.h"
>   #include "win_dump.h"
>   
>   static size_t win_dump_ptr_size(bool x64)
> diff --git a/dump/win_dump.h b/dump/win_dump.h
> index b8c25348f4..56f63683c3 100644
> --- a/dump/win_dump.h
> +++ b/dump/win_dump.h
> @@ -11,7 +11,7 @@
>   #ifndef WIN_DUMP_H
>   #define WIN_DUMP_H
>   
> -#include "qemu/win_dump_defs.h"
> +#include "sysemu/dump.h"
>   
>   void create_win_dump(DumpState *s, Error **errp);
>   

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v4 3/7] dump: Correct headers included

Posted by Richard Henderson 2 years, 2 months ago

On 2/23/23 13:17, Philippe Mathieu-Daudé wrote:
> "qemu/win_dump_defs.h" is only required by win_dump.c,
> but win_dump.h requires "sysemu/dump.h" which declares
> the DumpState type.
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
>   dump/win_dump.c | 1 +
>   dump/win_dump.h | 2 +-
>   2 files changed, 2 insertions(+), 1 deletion(-)

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

r~