[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 124/126] dump: Simplify compiling win_dump.o by introducing win_du
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 124/126] dump: Simplify compiling win_dump.o by introducing win_dump_available() |
Date: |
Mon, 27 Feb 2023 15:02:11 +0100 |
To make dump.c less target dependent, move the TARGET_X86_64 #ifdef'ry
from dump.c to win_dump.c (introducing a win_dump_available() method
there). By doing so we can build win_dump.c on any target, and
simplify the meson rule.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230225094903.53167-5-philmd@linaro.org>
---
dump/dump.c | 16 +++++-----------
dump/meson.build | 2 +-
dump/win_dump.c | 18 ++++++++++++++++++
dump/win_dump.h | 3 +++
4 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/dump/dump.c b/dump/dump.c
index da63129825..fa650980d8 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -28,10 +28,7 @@
#include "hw/misc/vmcoreinfo.h"
#include "migration/blocker.h"
#include "hw/core/cpu.h"
-
-#ifdef TARGET_X86_64
#include "win_dump.h"
-#endif
#include <zlib.h>
#ifdef CONFIG_LZO
@@ -2126,12 +2123,10 @@ void qmp_dump_guest_memory(bool paging, const char
*file,
}
#endif
-#ifndef TARGET_X86_64
- if (has_format && format == DUMP_GUEST_MEMORY_FORMAT_WIN_DMP) {
- error_setg(errp, "Windows dump is only available for x86-64");
+ if (has_format && format == DUMP_GUEST_MEMORY_FORMAT_WIN_DMP
+ && !win_dump_available(errp)) {
return;
}
-#endif
#if !defined(WIN32)
if (strstart(file, "fd:", &p)) {
@@ -2213,10 +2208,9 @@ DumpGuestMemoryCapability
*qmp_query_dump_guest_memory_capability(Error **errp)
QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_KDUMP_SNAPPY);
#endif
- /* Windows dump is available only if target is x86_64 */
-#ifdef TARGET_X86_64
- QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_WIN_DMP);
-#endif
+ if (win_dump_available(NULL)) {
+ QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_WIN_DMP);
+ }
return cap;
}
diff --git a/dump/meson.build b/dump/meson.build
index 2eff29c3ea..f13b29a849 100644
--- a/dump/meson.build
+++ b/dump/meson.build
@@ -1,4 +1,4 @@
softmmu_ss.add(files('dump-hmp-cmds.c'))
specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('dump.c'), snappy,
lzo])
-specific_ss.add(when: ['CONFIG_SOFTMMU', 'TARGET_X86_64'], if_true:
files('win_dump.c'))
+specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('win_dump.c'))
diff --git a/dump/win_dump.c b/dump/win_dump.c
index ba7fa404fe..ff9c5bd339 100644
--- a/dump/win_dump.c
+++ b/dump/win_dump.c
@@ -18,6 +18,13 @@
#include "win_dump.h"
#include "cpu.h"
+#if defined(TARGET_X86_64)
+
+bool win_dump_available(Error **errp)
+{
+ return true;
+}
+
static size_t win_dump_ptr_size(bool x64)
{
return x64 ? sizeof(uint64_t) : sizeof(uint32_t);
@@ -470,3 +477,14 @@ out_cr3:
return;
}
+
+#else /* !TARGET_X86_64 */
+
+bool win_dump_available(Error **errp)
+{
+ error_setg(errp, "Windows dump is only available for x86-64");
+
+ return false;
+}
+
+#endif
diff --git a/dump/win_dump.h b/dump/win_dump.h
index 56f63683c3..c9b49f87dc 100644
--- a/dump/win_dump.h
+++ b/dump/win_dump.h
@@ -13,6 +13,9 @@
#include "sysemu/dump.h"
+/* Check Windows dump availability for the current target */
+bool win_dump_available(Error **errp);
+
void create_win_dump(DumpState *s, Error **errp);
#endif /* WIN_DUMP_H */
--
2.38.1
- [PULL 115/126] hw/ide/pci: Unexport bmdma_active_if(), (continued)
- [PULL 115/126] hw/ide/pci: Unexport bmdma_active_if(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 118/126] hw/ide/piix: Refactor pci_piix_init_ports as pci_piix_init_bus per bus, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 120/126] hw/ide/pci: Add PCIIDEState::isa_irq[], Philippe Mathieu-Daudé, 2023/02/27
- [PULL 123/126] dump: Clean included headers, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 125/126] dump: Add create_win_dump() stub for non-x86 targets, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 110/126] hw/ide: Rename ide_exec_cmd() -> ide_bus_exec_cmd(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 113/126] hw/ide: Declare ide_get_[geometry/bios_chs_trans] in 'hw/ide/internal.h', Philippe Mathieu-Daudé, 2023/02/27
- [PULL 121/126] dump: Replace tswapN() -> cpu_to_dumpN(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 119/126] hw/ide/via: Replace magic 2 value by ARRAY_SIZE / MAX_IDE_DEVS, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 122/126] dump: Replace TARGET_PAGE_SIZE -> qemu_target_page_size(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 124/126] dump: Simplify compiling win_dump.o by introducing win_dump_available(),
Philippe Mathieu-Daudé <=
- [PULL 117/126] hw/ide/piix: Pass Error* to pci_piix_init_ports() for better error msg, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 126/126] ui/cocoa: user friendly characters for release mouse, Philippe Mathieu-Daudé, 2023/02/27
- Re: [RESEND PULL 000/126] Buildsys / QOM / QDev / UI patches for 2023-02-27, Peter Maydell, 2023/02/27