Skip to contentSkip to conversation

dump/win_dump: Build almost once

PATCH Superseded Philippe Mathieu-Daudé 3 participants 11 messages Jan 7 – Jan 8 Arm/Amlogic Meson SoC support

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover dump/win_dump: Build almost once

Build win_dump stub once on non-Windows or non-x86 hosts.

Philippe Mathieu-Daudé (2):
dump/win_dump: Abort in create_win_dump() on non-x86 hosts dump/win_dump: Use stubs on non-Windows hosts like POSIX

 dump/win_dump-stubs.c | 21 +++++++++++++++++++++
 dump/win_dump.c       | 14 +++++++++-----
 dump/meson.build      |  6 +++++-
 3 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 dump/win_dump-stubs.c
Signature · 1 line
2.52.0
#1 lore raw

PATCH 1/2 dump/win_dump: Abort in create_win_dump() on non-x86 hosts

win_dump_available() reports an error on non-x86 hosts when Windows dump format is not available. In that case win_dump_available() shouldn't be called, otherwise this is a programming error: abort.

---
 dump/win_dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
dump/win_dump.c +1 -1
index 3162e8bd487..6e07913dfb4 100644
@@ -489,7 +489,7 @@ bool win_dump_available(Error **errp)
 
 void create_win_dump(DumpState *s, Error **errp)
 {
-    win_dump_available(errp);
+    g_assert_not_reached();
 }
 
 #endif
Signature · 1 line
2.52.0
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] dump/win_dump: Abort in create_win_dump() on non-x86 hosts

Hi

Quoted 7 lines · Philippe Mathieu-Daudé

win_dump_available() reports an error on non-x86 hosts when Windows dump format is not available. In that case win_dump_available() shouldn't be called, otherwise this is a programming error: abort.

(qmp_dump_guest_memory() should prevent that runtime error)

Quoted 21 lines
---
 dump/win_dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
dump/win_dump.c +1 -2
index 3162e8bd487..6e07913dfb4 100644
@@ -489,7 +489,7 @@ bool win_dump_available(Error **errp)
 
 void create_win_dump(DumpState *s, Error **errp)
 {
-    win_dump_available(errp);
+    g_assert_not_reached();
 }
 
 #endif
--

2.52.0

Signature · 1 line
Marc-André Lureau
#3 lore raw

PATCH 2/2 dump/win_dump: Use stubs on non-Windows hosts like POSIX

In reply to Philippe Mathieu-Daudé

Rather than compiling the same content for all targets (unused most of the time, i.e. qemu-system-avr ...), build it once per POSIX hosts. Check Windows host (less likely) before x86 host.

---
 dump/win_dump-stubs.c | 21 +++++++++++++++++++++
 dump/win_dump.c       | 12 ++++++++----
 dump/meson.build      |  6 +++++-
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 dump/win_dump-stubs.c
dump/win_dump-stubs.c new file +21 -0
new file mode 100644
index 00000000000..722c66740a2
@@ -0,0 +1,21 @@
+/*
+ * Windows crashdump stubs
+ *
+ * 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 on Windows");
+
+    return false;
+}
+
+void create_win_dump(DumpState *s, Error **errp)
+{
+    g_assert_not_reached();
+}
dump/win_dump.c +8 -4
index 6e07913dfb4..5b2b55d9ff7 100644
@@ -12,14 +12,16 @@
 #include "system/dump.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "win_dump.h"
+
+#ifdef CONFIG_WIN32
+#if defined(TARGET_X86_64)
+
 #include "exec/cpu-defs.h"
 #include "hw/core/cpu.h"
 #include "qemu/win_dump_defs.h"
-#include "win_dump.h"
 #include "cpu.h"
 
-#if defined(TARGET_X86_64)
-
 bool win_dump_available(Error **errp)
 {
     return true;
@@ -478,7 +480,9 @@ out_cr3:
     first_x86_cpu->env.cr[3] = saved_cr3;
 }
 
-#else /* !TARGET_X86_64 */
+#endif /* !TARGET_X86_64 */
+
+#else /* !CONFIG_WIN32 */
 
 bool win_dump_available(Error **errp)
 {
dump/meson.build +5 -1
index 4277ce9328a..0aaf3f65d9c 100644
@@ -1,2 +1,6 @@
 system_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
-specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
+if host_os == 'windows'
+  system_ss.add(files('win_dump.c'))
+else
+  system_ss.add(files('win_dump-stubs.c'))
+endif
Signature · 1 line
2.52.0
#4 lore raw

Re: [PATCH 2/2] dump/win_dump: Use stubs on non-Windows hosts like POSIX

Hi

Quoted 45 lines · Philippe Mathieu-Daudé

Rather than compiling the same content for all targets (unused most of the time, i.e. qemu-system-avr ...), build it once per POSIX hosts. Check Windows host (less likely) before x86 host.

---
 dump/win_dump-stubs.c | 21 +++++++++++++++++++++
 dump/win_dump.c       | 12 ++++++++----
 dump/meson.build      |  6 +++++-
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 dump/win_dump-stubs.c
dump/win_dump-stubs.c new file +21 -0
new file mode 100644
index 00000000000..722c66740a2
@@ -0,0 +1,21 @@
+/*
+ * Windows crashdump stubs
+ *
+ * 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 on Windows");
+
+    return false;
+}
+
+void create_win_dump(DumpState *s, Error **errp)
+{
+    g_assert_not_reached();
+}
dump/win_dump.c +0 -0
index 6e07913dfb4..5b2b55d9ff7 100644

dump/win_dump.c line 17

Quoted 6 lines
dump/win_dump.c +3 -0
@@ -12,14 +12,16 @@
 #include "system/dump.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "win_dump.h"
+
+#ifdef CONFIG_WIN32

Why check CONFIG_WIN32 in a windows-only file?

Quoted 40 lines
dump/win_dump.c +5 -4
+#if defined(TARGET_X86_64)
+
 #include "exec/cpu-defs.h"
 #include "hw/core/cpu.h"
 #include "qemu/win_dump_defs.h"
-#include "win_dump.h"
 #include "cpu.h"
 
-#if defined(TARGET_X86_64)
-
 bool win_dump_available(Error **errp)
 {
     return true;
@@ -478,7 +480,9 @@ out_cr3:
     first_x86_cpu->env.cr[3] = saved_cr3;
 }
 
-#else /* !TARGET_X86_64 */
+#endif /* !TARGET_X86_64 */
+
+#else /* !CONFIG_WIN32 */
 
 bool win_dump_available(Error **errp)
 {
dump/meson.build +5 -2
index 4277ce9328a..0aaf3f65d9c 100644
@@ -1,2 +1,6 @@
 system_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
-specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
+if host_os == 'windows'
+  system_ss.add(files('win_dump.c'))
+else
+  system_ss.add(files('win_dump-stubs.c'))
+endif
--

2.52.0

Signature · 1 line
Marc-André Lureau
#5 lore raw

Re: [PATCH 2/2] dump/win_dump: Use stubs on non-Windows hosts like POSIX

In reply to Philippe Mathieu-Daudé
Quoted 11 lines · Philippe Mathieu-Daudé

Rather than compiling the same content for all targets (unused most of the time, i.e. qemu-system-avr ...), build it once per POSIX hosts. Check Windows host (less likely) before x86 host.

---
 dump/win_dump-stubs.c | 21 +++++++++++++++++++++
 dump/win_dump.c       | 12 ++++++++----
 dump/meson.build      |  6 +++++-
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 dump/win_dump-stubs.c

snip

dump/meson.build line 6

Quoted 12 lines
dump/meson.build +5 -1
index 4277ce9328a..0aaf3f65d9c 100644
@@ -1,2 +1,6 @@
 system_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
-specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
+if host_os == 'windows'
+  system_ss.add(files('win_dump.c'))
+else
+  system_ss.add(files('win_dump-stubs.c'))
+endif

This is very wrong.

The win_dump.c file has no association with Windows hosts. It is about creating crash dumps of Windows *guests* in the Windows dump format. The current conditional which builds it on TARGET_X86_64 is correct.

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#6 lore raw

Re: [PATCH 2/2] dump/win_dump: Use stubs on non-Windows hosts like POSIX

Quoted 30 lines · Daniel P. Berrangé
Quoted 11 lines · Philippe Mathieu-Daudé

Rather than compiling the same content for all targets (unused most of the time, i.e. qemu-system-avr ...), build it once per POSIX hosts. Check Windows host (less likely) before x86 host.

---
  dump/win_dump-stubs.c | 21 +++++++++++++++++++++
  dump/win_dump.c       | 12 ++++++++----
  dump/meson.build      |  6 +++++-
  3 files changed, 34 insertions(+), 5 deletions(-)

create mode 100644 dump/win_dump-stubs.c

snip

dump/meson.build line 6

Quoted 12 lines
dump/meson.build +5 -1
index 4277ce9328a..0aaf3f65d9c 100644
@@ -1,2 +1,6 @@
  system_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
-specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
+if host_os == 'windows'
+  system_ss.add(files('win_dump.c'))
+else
+  system_ss.add(files('win_dump-stubs.c'))
+endif

This is very wrong.

Quoted 3 lines

The win_dump.c file has no association with Windows hosts. It is about creating crash dumps of Windows *guests* in the Windows dump format. The current conditional which builds it on TARGET_X86_64 is correct.

Great to know this is a *guest* feature and not a *host* one.

Something else is currently wrong, because this file is built with qemu-system-avr on macOS.

Anyway, I'll revisit, thanks.

#7 lore raw

Re: [PATCH 2/2] dump/win_dump: Use stubs on non-Windows hosts like POSIX

Quoted 31 lines · Philippe Mathieu-Daudé
Quoted 30 lines · Daniel P. Berrangé
Quoted 11 lines · Philippe Mathieu-Daudé

Rather than compiling the same content for all targets (unused most of the time, i.e. qemu-system-avr ...), build it once per POSIX hosts. Check Windows host (less likely) before x86 host.

---
  dump/win_dump-stubs.c | 21 +++++++++++++++++++++
  dump/win_dump.c       | 12 ++++++++----
  dump/meson.build      |  6 +++++-
  3 files changed, 34 insertions(+), 5 deletions(-)

create mode 100644 dump/win_dump-stubs.c

snip

dump/meson.build line 6

Quoted 12 lines
dump/meson.build +5 -1
index 4277ce9328a..0aaf3f65d9c 100644
@@ -1,2 +1,6 @@
  system_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
-specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
+if host_os == 'windows'
+  system_ss.add(files('win_dump.c'))
+else
+  system_ss.add(files('win_dump-stubs.c'))
+endif

This is very wrong.

Quoted 8 lines
Quoted 3 lines

The win_dump.c file has no association with Windows hosts. It is about creating crash dumps of Windows *guests* in the Windows dump format. The current conditional which builds it on TARGET_X86_64 is correct.

Great to know this is a *guest* feature and not a *host* one.

Something else is currently wrong, because this file is built with qemu-system-avr on macOS.

Why is that a problem ? The entire file content is surrounded with

  #if defined(TARGET_X86_64)
  ...the impl...
  #else
  ...stubs...
  #endif

soo qemu-system-avr will be building the stubs which is fine. macOS is not a factor, since QEMU is fine to emulate Windows guests on macOS hosts and thus Win dump is in scope for macOS

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#8 lore raw

Re: [PATCH 2/2] dump/win_dump: Use stubs on non-Windows hosts like POSIX

Quoted 36 lines · Daniel P. Berrangé
Quoted 35 lines · Philippe Mathieu-Daudé
Quoted 33 lines · Daniel P. Berrangé
Quoted 11 lines · Philippe Mathieu-Daudé

Rather than compiling the same content for all targets (unused most of the time, i.e. qemu-system-avr ...), build it once per POSIX hosts. Check Windows host (less likely) before x86 host.

---
   dump/win_dump-stubs.c | 21 +++++++++++++++++++++
   dump/win_dump.c       | 12 ++++++++----
   dump/meson.build      |  6 +++++-
   3 files changed, 34 insertions(+), 5 deletions(-)

create mode 100644 dump/win_dump-stubs.c

snip

dump/meson.build line 6

Quoted 12 lines
dump/meson.build +5 -1
index 4277ce9328a..0aaf3f65d9c 100644
@@ -1,2 +1,6 @@
   system_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
-specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
+if host_os == 'windows'
+  system_ss.add(files('win_dump.c'))
+else
+  system_ss.add(files('win_dump-stubs.c'))
+endif

This is very wrong.

The win_dump.c file has no association with Windows hosts. It is about creating crash dumps of Windows *guests* in the Windows dump format. The current conditional which builds it on TARGET_X86_64 is correct.

Quoted 6 lines
Quoted 4 lines

Great to know this is a *guest* feature and not a *host* one.

Something else is currently wrong, because this file is built with qemu-system-avr on macOS.

Why is that a problem ?

Single binary can not be linked because each target has these same symbols.

Quoted 14 lines

The entire file content is surrounded with

   #if defined(TARGET_X86_64)
   ...the impl...
   #else
   ...stubs...
   #endif

soo qemu-system-avr will be building the stubs which is fine. macOS is not a factor, since QEMU is fine to emulate Windows guests on macOS hosts and thus Win dump is in scope for macOS

With regards,
Daniel

#9 lore raw

Re: [PATCH 2/2] dump/win_dump: Use stubs on non-Windows hosts like POSIX

Quoted 37 lines · Philippe Mathieu-Daudé
Quoted 36 lines · Daniel P. Berrangé
Quoted 35 lines · Philippe Mathieu-Daudé
Quoted 33 lines · Daniel P. Berrangé
Quoted 11 lines · Philippe Mathieu-Daudé

Rather than compiling the same content for all targets (unused most of the time, i.e. qemu-system-avr ...), build it once per POSIX hosts. Check Windows host (less likely) before x86 host.

---
   dump/win_dump-stubs.c | 21 +++++++++++++++++++++
   dump/win_dump.c       | 12 ++++++++----
   dump/meson.build      |  6 +++++-
   3 files changed, 34 insertions(+), 5 deletions(-)

create mode 100644 dump/win_dump-stubs.c

snip

dump/meson.build line 6

Quoted 12 lines
dump/meson.build +5 -1
index 4277ce9328a..0aaf3f65d9c 100644
@@ -1,2 +1,6 @@
   system_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
-specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
+if host_os == 'windows'
+  system_ss.add(files('win_dump.c'))
+else
+  system_ss.add(files('win_dump-stubs.c'))
+endif

This is very wrong.

The win_dump.c file has no association with Windows hosts. It is about creating crash dumps of Windows *guests* in the Windows dump format. The current conditional which builds it on TARGET_X86_64 is correct.

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

Great to know this is a *guest* feature and not a *host* one.

Something else is currently wrong, because this file is built with qemu-system-avr on macOS.

Why is that a problem ?

Single binary can not be linked because each target has these same symbols.

So we need a make 'win_dump_available()' into a runtime check against the current target == x86, and then unconditionally build the rest of the file ? How do we provide access to target specific types in such builds as merely removing the #ifdef shows missing X86CPU / CPUX86State types for most targets.

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#10 lore raw

Re: [PATCH 2/2] dump/win_dump: Use stubs on non-Windows hosts like POSIX

Quoted 45 lines · Daniel P. Berrangé
Quoted 44 lines · Philippe Mathieu-Daudé
Quoted 42 lines · Daniel P. Berrangé
Quoted 31 lines · Philippe Mathieu-Daudé
Quoted 30 lines · Daniel P. Berrangé
Quoted 11 lines · Philippe Mathieu-Daudé

Rather than compiling the same content for all targets (unused most of the time, i.e. qemu-system-avr ...), build it once per POSIX hosts. Check Windows host (less likely) before x86 host.

---
    dump/win_dump-stubs.c | 21 +++++++++++++++++++++
    dump/win_dump.c       | 12 ++++++++----
    dump/meson.build      |  6 +++++-
    3 files changed, 34 insertions(+), 5 deletions(-)

create mode 100644 dump/win_dump-stubs.c

snip

dump/meson.build line 6

Quoted 12 lines
dump/meson.build +5 -1
index 4277ce9328a..0aaf3f65d9c 100644
@@ -1,2 +1,6 @@
    system_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo])
-specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c'))
+if host_os == 'windows'
+  system_ss.add(files('win_dump.c'))
+else
+  system_ss.add(files('win_dump-stubs.c'))
+endif

This is very wrong.

Quoted 8 lines
Quoted 3 lines

The win_dump.c file has no association with Windows hosts. It is about creating crash dumps of Windows *guests* in the Windows dump format. The current conditional which builds it on TARGET_X86_64 is correct.

Great to know this is a *guest* feature and not a *host* one.

Something else is currently wrong, because this file is built with qemu-system-avr on macOS.

Why is that a problem ?

Quoted 7 lines
Quoted 1 line

Single binary can not be linked because each target has these same symbols.

So we need a make 'win_dump_available()' into a runtime check against the current target == x86, and then unconditionally build the rest of the file ? How do we provide access to target specific types in such builds as merely removing the #ifdef shows missing X86CPU / CPUX86State types for most targets.

I went with using a new Kconfig symbol in v2, see:
http://lore.kernel.org/qemu-devel/[email protected]/