[PATCH v4 0/7] dump: Make most of it target agnostic (build once)

[PATCH v4 0/7] dump: Make most of it target agnostic (build once)

[Philippe Mathieu-Daudé]

Thanks to Richard help, we can now build dump.o once
for all targets, keeping win_dump.o for x86* targets.

Philippe Mathieu-Daudé (7):
  dump: Replace tswapN() -> cpu_to_dumpN()
  dump: Replace TARGET_PAGE_SIZE -> qemu_target_page_size()
  dump: Correct headers included
  dump: Introduce win_dump_available()
  dump: Introduce create_win_dump()
  dump: Build once by adding stubs for non-x86 targets
  dump: Rename x86-specific file as win_dump_x86.c

 dump/dump.c                         | 29 +++++++++++------------------
 dump/meson.build                    |  6 ++++--
 dump/win_dump-stub.c                | 23 +++++++++++++++++++++++
 dump/{win_dump.c => win_dump-x86.c} |  8 +++++++-
 dump/win_dump.h                     |  5 ++++-
 5 files changed, 49 insertions(+), 22 deletions(-)
 create mode 100644 dump/win_dump-stub.c
 rename dump/{win_dump.c => win_dump-x86.c} (99%)

-- 
2.38.1

[PATCH v4 1/7] dump: Replace tswapN() -> cpu_to_dumpN()

[Philippe Mathieu-Daudé]

All uses of tswap in that file are wrong, and should be using
cpu_to_dumpN, which correctly tests the endianness of the output.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 dump/dump.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dump/dump.c b/dump/dump.c
index 279b07f09b..7101169ecb 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -907,13 +907,13 @@ static void get_note_sizes(DumpState *s, const void *note,
     if (dump_is_64bit(s)) {
         const Elf64_Nhdr *hdr = note;
         note_head_sz = sizeof(Elf64_Nhdr);
-        name_sz = tswap64(hdr->n_namesz);
-        desc_sz = tswap64(hdr->n_descsz);
+        name_sz = cpu_to_dump64(s, hdr->n_namesz);
+        desc_sz = cpu_to_dump64(s, hdr->n_descsz);
     } else {
         const Elf32_Nhdr *hdr = note;
         note_head_sz = sizeof(Elf32_Nhdr);
-        name_sz = tswap32(hdr->n_namesz);
-        desc_sz = tswap32(hdr->n_descsz);
+        name_sz = cpu_to_dump32(s, hdr->n_namesz);
+        desc_sz = cpu_to_dump32(s, hdr->n_descsz);
     }
 
     if (note_head_size) {
-- 
2.38.1

[PATCH v4 2/7] dump: Replace TARGET_PAGE_SIZE -> qemu_target_page_size()

[Philippe Mathieu-Daudé]

TARGET_PAGE_SIZE is target specific. In preparation of
making dump.c target-agnostic, replace the compile-time
TARGET_PAGE_SIZE definition by runtime qemu_target_page_size().

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

diff --git a/dump/dump.c b/dump/dump.c
index 7101169ecb..3784a9054d 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -15,6 +15,7 @@
 #include "qemu/cutils.h"
 #include "elf.h"
 #include "exec/hwaddr.h"
+#include "exec/target_page.h"
 #include "monitor/monitor.h"
 #include "sysemu/kvm.h"
 #include "sysemu/dump.h"
@@ -1859,7 +1860,7 @@ static void dump_init(DumpState *s, int fd, bool has_format,
     }
 
     if (!s->dump_info.page_size) {
-        s->dump_info.page_size = TARGET_PAGE_SIZE;
+        s->dump_info.page_size = qemu_target_page_size();
     }
 
     s->note_size = cpu_get_note_size(s->dump_info.d_class,
-- 
2.38.1

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

[Philippe Mathieu-Daudé]

"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

[PATCH v4 4/7] dump: Introduce win_dump_available()

[Philippe Mathieu-Daudé]

Remove a pair of TARGET_X86_64 #ifdef'ry by introducing
the win_dump_available() method. We'll soon extract it
to a stub file for non-x86 targets.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 dump/dump.c     | 23 +++++++++++++----------
 dump/win_dump.c |  5 +++++
 dump/win_dump.h |  3 +++
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/dump/dump.c b/dump/dump.c
index 3784a9054d..c356a88be1 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -30,9 +30,15 @@
 #include "qemu/main-loop.h"
 #include "hw/misc/vmcoreinfo.h"
 #include "migration/blocker.h"
-
-#ifdef TARGET_X86_64
 #include "win_dump.h"
+
+#ifndef TARGET_X86_64
+bool win_dump_available(Error **errp)
+{
+    error_setg(errp, "Windows dump is only available for x86-64");
+
+    return false;
+}
 #endif
 
 #include <zlib.h>
@@ -2130,12 +2136,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)) {
@@ -2217,10 +2221,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/win_dump.c b/dump/win_dump.c
index 12b7da5da0..ffeef4b738 100644
--- a/dump/win_dump.c
+++ b/dump/win_dump.c
@@ -24,6 +24,11 @@
 #include "qemu/win_dump_defs.h"
 #include "win_dump.h"
 
+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);
diff --git a/dump/win_dump.h b/dump/win_dump.h
index 56f63683c3..9abce289ac 100644
--- a/dump/win_dump.h
+++ b/dump/win_dump.h
@@ -13,6 +13,9 @@
 
 #include "sysemu/dump.h"
 
+/* Windows dump is available only if target is x86_64 */
+bool win_dump_available(Error **errp);
+
 void create_win_dump(DumpState *s, Error **errp);
 
 #endif /* WIN_DUMP_H */
-- 
2.38.1

[PATCH v4 5/7] dump: Introduce create_win_dump()

[Philippe Mathieu-Daudé]

Remove another TARGET_X86_64 #ifdef'ry by introducing
a create_win_dump() stub. We'll extract it to a stub
file for non-x86 targets in the next commit.

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

diff --git a/dump/dump.c b/dump/dump.c
index c356a88be1..b33a613d45 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -39,6 +39,11 @@ bool win_dump_available(Error **errp)
 
     return false;
 }
+
+void create_win_dump(DumpState *s, Error **errp)
+{
+    win_dump_available(errp);
+}
 #endif
 
 #include <zlib.h>
@@ -2031,9 +2036,7 @@ static void dump_process(DumpState *s, Error **errp)
     DumpQueryResult *result = NULL;
 
     if (s->has_format && s->format == DUMP_GUEST_MEMORY_FORMAT_WIN_DMP) {
-#ifdef TARGET_X86_64
         create_win_dump(s, errp);
-#endif
     } else if (s->has_format && s->format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
         create_kdump_vmcore(s, errp);
     } else {
-- 
2.38.1

[PATCH v4 6/7] dump: Build once by adding stubs for non-x86 targets

[Philippe Mathieu-Daudé]

Extract non-x86 stubs to win_dump-stub.c. We can now
build dump.o once for system emulation. Update meson.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 dump/dump.c          | 14 --------------
 dump/meson.build     |  6 ++++--
 dump/win_dump-stub.c | 23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 dump/win_dump-stub.c

diff --git a/dump/dump.c b/dump/dump.c
index b33a613d45..7cde3e326e 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -32,20 +32,6 @@
 #include "migration/blocker.h"
 #include "win_dump.h"
 
-#ifndef TARGET_X86_64
-bool win_dump_available(Error **errp)
-{
-    error_setg(errp, "Windows dump is only available for x86-64");
-
-    return false;
-}
-
-void create_win_dump(DumpState *s, Error **errp)
-{
-    win_dump_available(errp);
-}
-#endif
-
 #include <zlib.h>
 #ifdef CONFIG_LZO
 #include <lzo/lzo1x.h>
diff --git a/dump/meson.build b/dump/meson.build
index 2eff29c3ea..6ae07e6fed 100644
--- a/dump/meson.build
+++ b/dump/meson.build
@@ -1,4 +1,6 @@
 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'))
+softmmu_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'),
+                if_false: files('win_dump-stub.c'))
diff --git a/dump/win_dump-stub.c b/dump/win_dump-stub.c
new file mode 100644
index 0000000000..87cb699e3d
--- /dev/null
+++ b/dump/win_dump-stub.c
@@ -0,0 +1,23 @@
+/*
+ * Windows crashdump stubs for non-x86 targets
+ *
+ * Copyright (c) 2023 Linaro Ltd
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "win_dump.h"
+
+bool win_dump_available(Error **errp)
+{
+    error_setg(errp, "Windows dump is only available for x86-64");
+
+    return false;
+}
+
+void create_win_dump(DumpState *s, Error **errp)
+{
+    win_dump_available(errp);
+}
-- 
2.38.1

[PATCH v4 7/7] dump: Rename x86-specific file as win_dump_x86.c

[Philippe Mathieu-Daudé]

win_dump.c is x86 specific. Rename it as such in case
someone is willing to add win_dump-aarch64 :)

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 dump/meson.build                    | 2 +-
 dump/{win_dump.c => win_dump-x86.c} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename dump/{win_dump.c => win_dump-x86.c} (99%)

diff --git a/dump/meson.build b/dump/meson.build
index 6ae07e6fed..d899949a73 100644
--- a/dump/meson.build
+++ b/dump/meson.build
@@ -2,5 +2,5 @@ softmmu_ss.add(files('dump-hmp-cmds.c'))
 
 softmmu_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'),
+                if_true: files('win_dump-x86.c'),
                 if_false: files('win_dump-stub.c'))
diff --git a/dump/win_dump.c b/dump/win_dump-x86.c
similarity index 99%
rename from dump/win_dump.c
rename to dump/win_dump-x86.c
index ffeef4b738..5ee9a1d764 100644
--- a/dump/win_dump.c
+++ b/dump/win_dump-x86.c
@@ -1,5 +1,5 @@
 /*
- * Windows crashdump
+ * Windows crashdump for x86 targets
  *
  * Copyright (c) 2018 Virtuozzo International GmbH
  *
-- 
2.38.1

Re: [PATCH v4 7/7] dump: Rename x86-specific file as win_dump_x86.c

[Philippe Mathieu-Daudé]

Oops, "win_dump-x86.c" in subject...

On 24/2/23 00:17, Philippe Mathieu-Daudé wrote:
> win_dump.c is x86 specific. Rename it as such in case
> someone is willing to add win_dump-aarch64 :)
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   dump/meson.build                    | 2 +-
>   dump/{win_dump.c => win_dump-x86.c} | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>   rename dump/{win_dump.c => win_dump-x86.c} (99%)
> 
> diff --git a/dump/meson.build b/dump/meson.build
> index 6ae07e6fed..d899949a73 100644
> --- a/dump/meson.build
> +++ b/dump/meson.build
> @@ -2,5 +2,5 @@ softmmu_ss.add(files('dump-hmp-cmds.c'))
>   
>   softmmu_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'),
> +                if_true: files('win_dump-x86.c'),
>                   if_false: files('win_dump-stub.c'))
> diff --git a/dump/win_dump.c b/dump/win_dump-x86.c
> similarity index 99%
> rename from dump/win_dump.c
> rename to dump/win_dump-x86.c
> index ffeef4b738..5ee9a1d764 100644
> --- a/dump/win_dump.c
> +++ b/dump/win_dump-x86.c
> @@ -1,5 +1,5 @@
>   /*
> - * Windows crashdump
> + * Windows crashdump for x86 targets
>    *
>    * Copyright (c) 2018 Virtuozzo International GmbH
>    *

Re: [PATCH v4 1/7] dump: Replace tswapN() -> cpu_to_dumpN()

[Richard Henderson]

On 2/23/23 13:17, Philippe Mathieu-Daudé wrote:
> All uses of tswap in that file are wrong, and should be using
> cpu_to_dumpN, which correctly tests the endianness of the output.
> 
> Suggested-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   dump/dump.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)

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

r~

Re: [PATCH v4 2/7] dump: Replace TARGET_PAGE_SIZE -> qemu_target_page_size()

[Richard Henderson]

On 2/23/23 13:17, Philippe Mathieu-Daudé wrote:
> TARGET_PAGE_SIZE is target specific. In preparation of
> making dump.c target-agnostic, replace the compile-time
> TARGET_PAGE_SIZE definition by runtime qemu_target_page_size().
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
>   dump/dump.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

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

r~

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

[Richard Henderson]

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~

Re: [PATCH v4 4/7] dump: Introduce win_dump_available()

[Richard Henderson]

On 2/23/23 13:17, Philippe Mathieu-Daudé wrote:
> @@ -2130,12 +2136,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)) {

Indentation is off.

Otherwise looks plausible as an intermediate step before more targets.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH v4 5/7] dump: Introduce create_win_dump()

[Richard Henderson]

On 2/23/23 13:17, Philippe Mathieu-Daudé wrote:
> Remove another TARGET_X86_64 #ifdef'ry by introducing
> a create_win_dump() stub. We'll extract it to a stub
> file for non-x86 targets in the next commit.
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
>   dump/dump.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)

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

r~

Re: [PATCH v4 6/7] dump: Build once by adding stubs for non-x86 targets

[Richard Henderson]

On 2/23/23 13:17, Philippe Mathieu-Daudé wrote:
> Extract non-x86 stubs to win_dump-stub.c. We can now
> build dump.o once for system emulation. Update meson.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   dump/dump.c          | 14 --------------
>   dump/meson.build     |  6 ++++--
>   dump/win_dump-stub.c | 23 +++++++++++++++++++++++
>   3 files changed, 27 insertions(+), 16 deletions(-)
>   create mode 100644 dump/win_dump-stub.c
> 
> diff --git a/dump/dump.c b/dump/dump.c
> index b33a613d45..7cde3e326e 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -32,20 +32,6 @@
>   #include "migration/blocker.h"
>   #include "win_dump.h"
>   
> -#ifndef TARGET_X86_64
> -bool win_dump_available(Error **errp)
> -{
> -    error_setg(errp, "Windows dump is only available for x86-64");
> -
> -    return false;
> -}
> -
> -void create_win_dump(DumpState *s, Error **errp)
> -{
> -    win_dump_available(errp);
> -}
> -#endif
> -
>   #include <zlib.h>
>   #ifdef CONFIG_LZO
>   #include <lzo/lzo1x.h>
> diff --git a/dump/meson.build b/dump/meson.build
> index 2eff29c3ea..6ae07e6fed 100644
> --- a/dump/meson.build
> +++ b/dump/meson.build
> @@ -1,4 +1,6 @@
>   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'))
> +softmmu_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'),
> +                if_false: files('win_dump-stub.c'))

Doesn't this add win_dump-stub.c when !(SOFTMMU && X86_64), i.e. !SOFTMMU || !X86_64?

I trying to imagine how well this will scale with ARM64, for the ongoing Windows on ARM 
project.  Would it just be easier have the stubs in win_dump.c, using ifdefs?


r~

Re: [PATCH v4 7/7] dump: Rename x86-specific file as win_dump_x86.c

[Richard Henderson]

On 2/23/23 13:17, Philippe Mathieu-Daudé wrote:
> win_dump.c is x86 specific. Rename it as such in case
> someone is willing to add win_dump-aarch64 :)

I think this is premature.  I would *hope* there's a lot in here that would be shared.


r~

Re: [PATCH v4 6/7] dump: Build once by adding stubs for non-x86 targets

[Philippe Mathieu-Daudé]

On 24/2/23 00:51, Richard Henderson wrote:
> On 2/23/23 13:17, Philippe Mathieu-Daudé wrote:
>> Extract non-x86 stubs to win_dump-stub.c. We can now
>> build dump.o once for system emulation. Update meson.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>>   dump/dump.c          | 14 --------------
>>   dump/meson.build     |  6 ++++--
>>   dump/win_dump-stub.c | 23 +++++++++++++++++++++++
>>   3 files changed, 27 insertions(+), 16 deletions(-)
>>   create mode 100644 dump/win_dump-stub.c

>> diff --git a/dump/meson.build b/dump/meson.build
>> index 2eff29c3ea..6ae07e6fed 100644
>> --- a/dump/meson.build
>> +++ b/dump/meson.build
>> @@ -1,4 +1,6 @@
>>   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'))
>> +softmmu_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'),
>> +                if_false: files('win_dump-stub.c'))
> 
> Doesn't this add win_dump-stub.c when !(SOFTMMU && X86_64), i.e. 
> !SOFTMMU || !X86_64?
> 
> I trying to imagine how well this will scale with ARM64, for the ongoing 
> Windows on ARM project.  Would it just be easier have the stubs in 
> win_dump.c, using ifdefs?

Yeah I realized that later, keeping one single file with #ifdef'ry
even simplifies meson rules. I over-engineered that :)
Also various methods from win_dump.c could be reused.

Re: [PATCH v4 1/7] dump: Replace tswapN() -> cpu_to_dumpN()

[Thomas Huth]

On 24/02/2023 00.17, Philippe Mathieu-Daudé wrote:
> All uses of tswap in that file are wrong, and should be using
> cpu_to_dumpN, which correctly tests the endianness of the output.
> 
> Suggested-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   dump/dump.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/dump/dump.c b/dump/dump.c
> index 279b07f09b..7101169ecb 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -907,13 +907,13 @@ static void get_note_sizes(DumpState *s, const void *note,
>       if (dump_is_64bit(s)) {
>           const Elf64_Nhdr *hdr = note;
>           note_head_sz = sizeof(Elf64_Nhdr);
> -        name_sz = tswap64(hdr->n_namesz);
> -        desc_sz = tswap64(hdr->n_descsz);
> +        name_sz = cpu_to_dump64(s, hdr->n_namesz);
> +        desc_sz = cpu_to_dump64(s, hdr->n_descsz);
>       } else {
>           const Elf32_Nhdr *hdr = note;
>           note_head_sz = sizeof(Elf32_Nhdr);
> -        name_sz = tswap32(hdr->n_namesz);
> -        desc_sz = tswap32(hdr->n_descsz);
> +        name_sz = cpu_to_dump32(s, hdr->n_namesz);
> +        desc_sz = cpu_to_dump32(s, hdr->n_descsz);
>       }

Those tswaps looked suspiciuous indeed.

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

Re: [PATCH v4 2/7] dump: Replace TARGET_PAGE_SIZE -> qemu_target_page_size()

[Thomas Huth]

On 24/02/2023 00.17, Philippe Mathieu-Daudé wrote:
> TARGET_PAGE_SIZE is target specific. In preparation of
> making dump.c target-agnostic, replace the compile-time
> TARGET_PAGE_SIZE definition by runtime qemu_target_page_size().
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   dump/dump.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/dump/dump.c b/dump/dump.c
> index 7101169ecb..3784a9054d 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -15,6 +15,7 @@
>   #include "qemu/cutils.h"
>   #include "elf.h"
>   #include "exec/hwaddr.h"
> +#include "exec/target_page.h"
>   #include "monitor/monitor.h"
>   #include "sysemu/kvm.h"
>   #include "sysemu/dump.h"
> @@ -1859,7 +1860,7 @@ static void dump_init(DumpState *s, int fd, bool has_format,
>       }
>   
>       if (!s->dump_info.page_size) {
> -        s->dump_info.page_size = TARGET_PAGE_SIZE;
> +        s->dump_info.page_size = qemu_target_page_size();
>       }
>   
>       s->note_size = cpu_get_note_size(s->dump_info.d_class,

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

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

[Thomas Huth]

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 4/7] dump: Introduce win_dump_available()

[Thomas Huth]

On 24/02/2023 00.17, Philippe Mathieu-Daudé wrote:
> Remove a pair of TARGET_X86_64 #ifdef'ry by introducing
> the win_dump_available() method. We'll soon extract it
> to a stub file for non-x86 targets.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   dump/dump.c     | 23 +++++++++++++----------
>   dump/win_dump.c |  5 +++++
>   dump/win_dump.h |  3 +++
>   3 files changed, 21 insertions(+), 10 deletions(-)
> 
> diff --git a/dump/dump.c b/dump/dump.c
> index 3784a9054d..c356a88be1 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -30,9 +30,15 @@
>   #include "qemu/main-loop.h"
>   #include "hw/misc/vmcoreinfo.h"
>   #include "migration/blocker.h"
> -
> -#ifdef TARGET_X86_64
>   #include "win_dump.h"
> +
> +#ifndef TARGET_X86_64
> +bool win_dump_available(Error **errp)
> +{
> +    error_setg(errp, "Windows dump is only available for x86-64");
> +
> +    return false;
> +}
>   #endif

I think I'd prefer to introduce the stub file immediately here already, but 
it's just a matter of taste.

So with the indentation fixed (that Richard mentioned):

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

Re: [PATCH v4 5/7] dump: Introduce create_win_dump()

[Thomas Huth]

On 24/02/2023 00.17, Philippe Mathieu-Daudé wrote:
> Remove another TARGET_X86_64 #ifdef'ry by introducing
> a create_win_dump() stub. We'll extract it to a stub
> file for non-x86 targets in the next commit.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   dump/dump.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/dump/dump.c b/dump/dump.c
> index c356a88be1..b33a613d45 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -39,6 +39,11 @@ bool win_dump_available(Error **errp)
>   
>       return false;
>   }
> +
> +void create_win_dump(DumpState *s, Error **errp)
> +{
> +    win_dump_available(errp);
> +}
>   #endif
>   
>   #include <zlib.h>
> @@ -2031,9 +2036,7 @@ static void dump_process(DumpState *s, Error **errp)
>       DumpQueryResult *result = NULL;
>   
>       if (s->has_format && s->format == DUMP_GUEST_MEMORY_FORMAT_WIN_DMP) {
> -#ifdef TARGET_X86_64
>           create_win_dump(s, errp);
> -#endif
>       } else if (s->has_format && s->format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
>           create_kdump_vmcore(s, errp);
>       } else {

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