[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 3/5] dump: Clean included headers
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v6 3/5] dump: Clean included headers |
Date: |
Sat, 25 Feb 2023 10:49:01 +0100 |
"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. Remove various unused headers.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
dump/dump-hmp-cmds.c | 2 +-
dump/dump.c | 6 ++----
dump/win_dump.c | 15 +++++----------
dump/win_dump.h | 2 +-
4 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/dump/dump-hmp-cmds.c b/dump/dump-hmp-cmds.c
index e5053b04cd..b038785fee 100644
--- a/dump/dump-hmp-cmds.c
+++ b/dump/dump-hmp-cmds.c
@@ -1,5 +1,5 @@
/*
- * Human Monitor Interface commands
+ * Windows crashdump (Human Monitor Interface commands)
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
diff --git a/dump/dump.c b/dump/dump.c
index 4d68a74ffa..da63129825 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -14,22 +14,20 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "elf.h"
-#include "exec/hwaddr.h"
+#include "qemu/bswap.h"
#include "exec/target_page.h"
#include "monitor/monitor.h"
-#include "sysemu/kvm.h"
#include "sysemu/dump.h"
-#include "sysemu/memory_mapping.h"
#include "sysemu/runstate.h"
#include "sysemu/cpus.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-dump.h"
#include "qapi/qapi-events-dump.h"
#include "qapi/qmp/qerror.h"
-#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "hw/misc/vmcoreinfo.h"
#include "migration/blocker.h"
+#include "hw/core/cpu.h"
#ifdef TARGET_X86_64
#include "win_dump.h"
diff --git a/dump/win_dump.c b/dump/win_dump.c
index f20b6051b6..ba7fa404fe 100644
--- a/dump/win_dump.c
+++ b/dump/win_dump.c
@@ -1,5 +1,5 @@
/*
- * Windows crashdump
+ * Windows crashdump (target specific implementations)
*
* Copyright (c) 2018 Virtuozzo International GmbH
*
@@ -9,19 +9,14 @@
*/
#include "qemu/osdep.h"
-#include "qemu/cutils.h"
-#include "elf.h"
-#include "exec/hwaddr.h"
-#include "monitor/monitor.h"
-#include "sysemu/kvm.h"
#include "sysemu/dump.h"
-#include "sysemu/memory_mapping.h"
-#include "sysemu/cpus.h"
#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
-#include "qemu/error-report.h"
-#include "hw/misc/vmcoreinfo.h"
+#include "exec/cpu-defs.h"
+#include "hw/core/cpu.h"
+#include "qemu/win_dump_defs.h"
#include "win_dump.h"
+#include "cpu.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
- [PATCH v6 0/5] dump: Make most of it target agnostic (build once), Philippe Mathieu-Daudé, 2023/02/25
- [PATCH v6 1/5] dump: Replace tswapN() -> cpu_to_dumpN(), Philippe Mathieu-Daudé, 2023/02/25
- [PATCH v6 2/5] dump: Replace TARGET_PAGE_SIZE -> qemu_target_page_size(), Philippe Mathieu-Daudé, 2023/02/25
- [PATCH v6 3/5] dump: Clean included headers,
Philippe Mathieu-Daudé <=
- [PATCH v6 4/5] dump: Simplify compiling win_dump.o by introducing win_dump_available(), Philippe Mathieu-Daudé, 2023/02/25
- [PATCH v6 5/5] dump: Add create_win_dump() stub for non-x86 targets, Philippe Mathieu-Daudé, 2023/02/25
- Re: [PATCH v6 0/5] dump: Make most of it target agnostic (build once), Marc-André Lureau, 2023/02/26