[v2] Dump patches

[PULL v2 00/11] Dump patches

Posted by marcandre.lureau@redhat.com 1 year, 6 months ago

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit e750a7ace492f0b450653d4ad368a77d6f660fb8:

  Merge tag 'pull-9p-20221024' of https://github.com/cschoenebeck/qemu into staging (2022-10-24 14:27:12 -0400)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/dump-pull-request

for you to fetch changes up to 1c08fb2d72aac3324bb537a70d05523c1a8984ab:

  dump/win_dump: limit number of processed PRCBs (2022-10-25 11:47:35 +0400)

----------------------------------------------------------------
dump queue

Hi

The "dump" queue, with:
- [PATCH v3/v4 0/9] dump: Cleanup and consolidation
- [PATCH v4 0/4] dump: add 32-bit guest Windows support

----------------------------------------------------------------

Janosch Frank (10):
  dump: Use a buffer for ELF section data and headers
  dump: Write ELF section headers right after ELF header
  dump: Reorder struct DumpState
  dump: Reintroduce memory_offset and section_offset
  dump: Add architecture section and section string table support
  s390x: Add protected dump cap
  s390x: Introduce PV query interface
  include/elf.h: add s390x note types
  s390x: Add KVM PV dump interface
  s390x: pv: Add dump support

Viktor Prutyanov (1):
  dump/win_dump: limit number of processed PRCBs

 include/elf.h                |   2 +
 include/hw/s390x/pv.h        |  19 +++
 include/sysemu/dump-arch.h   |   3 +
 include/sysemu/dump.h        |  26 +++-
 target/s390x/kvm/kvm_s390x.h |   1 +
 dump/dump.c                  | 288 +++++++++++++++++++++++++++--------
 dump/win_dump.c              |   7 +
 hw/s390x/pv.c                | 112 ++++++++++++++
 hw/s390x/s390-virtio-ccw.c   |   6 +
 target/s390x/arch_dump.c     | 262 +++++++++++++++++++++++++++----
 target/s390x/kvm/kvm.c       |   7 +
 11 files changed, 635 insertions(+), 98 deletions(-)

-- 
2.37.3

Re: [PULL v2 00/11] Dump patches

Posted by Stefan Hajnoczi 1 year, 6 months ago

Please solve this CI failure:

c++ -o qemu-system-s390x ...
/usr/bin/ld: libqemu-s390x-softmmu.fa.p/target_s390x_arch_dump.c.o: in
function `arch_sections_add':
/home/gitlab-runner/builds/Y1MP9VSY/0/qemu-project/qemu/build/../target/s390x/arch_dump.c:392:
undefined reference to `kvm_s390_get_protected_dump'
/usr/bin/ld: libqemu-s390x-softmmu.fa.p/target_s390x_arch_dump.c.o: in
function `cpu_get_dump_info':
/home/gitlab-runner/builds/Y1MP9VSY/0/qemu-project/qemu/build/../target/s390x/arch_dump.c:452:
undefined reference to `kvm_s390_get_protected_dump'
collect2: error: ld returned 1 exit status

https://gitlab.com/qemu-project/qemu/-/jobs/3226673649

Thanks,
Stefan

Re: [PULL v2 00/11] Dump patches

Posted by Marc-André Lureau 1 year, 6 months ago

Hi Janosch

On Wed, Oct 26, 2022 at 1:37 AM Stefan Hajnoczi <stefanha@gmail.com> wrote:

> Please solve this CI failure:
>
> c++ -o qemu-system-s390x ...
> /usr/bin/ld: libqemu-s390x-softmmu.fa.p/target_s390x_arch_dump.c.o: in
> function `arch_sections_add':
>
> /home/gitlab-runner/builds/Y1MP9VSY/0/qemu-project/qemu/build/../target/s390x/arch_dump.c:392:
> undefined reference to `kvm_s390_get_protected_dump'
> /usr/bin/ld: libqemu-s390x-softmmu.fa.p/target_s390x_arch_dump.c.o: in
> function `cpu_get_dump_info':
>
> /home/gitlab-runner/builds/Y1MP9VSY/0/qemu-project/qemu/build/../target/s390x/arch_dump.c:452:
> undefined reference to `kvm_s390_get_protected_dump'
> collect2: error: ld returned 1 exit status
>
> https://gitlab.com/qemu-project/qemu/-/jobs/3226673649
>
>
Ok to squash this with "s390x: Add protected dump cap" patch ? that should
solve it hopefully.

diff --git a/target/s390x/kvm/stubs.c b/target/s390x/kvm/stubs.c
new file mode 100644
index 0000000000..5fd63b9a7e
--- /dev/null
+++ b/target/s390x/kvm/stubs.c
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+
+#include "kvm_s390x.h"
+
+int kvm_s390_get_protected_dump(void)
+{
+    return false;
+}
diff --git a/target/s390x/kvm/meson.build b/target/s390x/kvm/meson.build
index d1356356b1..aef52b6686 100644
--- a/target/s390x/kvm/meson.build
+++ b/target/s390x/kvm/meson.build
@@ -1,6 +1,8 @@

 s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
   'kvm.c'
+), if_false: files(
+  'stubs.c'
 ))

Re: [PULL v2 00/11] Dump patches

Posted by Janosch Frank 1 year, 6 months ago

On 10/26/22 09:42, Marc-André Lureau wrote:
> Hi Janosch
> 
> On Wed, Oct 26, 2022 at 1:37 AM Stefan Hajnoczi <stefanha@gmail.com> wrote:
> 
>> Please solve this CI failure:
>>
>> c++ -o qemu-system-s390x ...
>> /usr/bin/ld: libqemu-s390x-softmmu.fa.p/target_s390x_arch_dump.c.o: in
>> function `arch_sections_add':
>>
>> /home/gitlab-runner/builds/Y1MP9VSY/0/qemu-project/qemu/build/../target/s390x/arch_dump.c:392:
>> undefined reference to `kvm_s390_get_protected_dump'
>> /usr/bin/ld: libqemu-s390x-softmmu.fa.p/target_s390x_arch_dump.c.o: in
>> function `cpu_get_dump_info':
>>
>> /home/gitlab-runner/builds/Y1MP9VSY/0/qemu-project/qemu/build/../target/s390x/arch_dump.c:452:
>> undefined reference to `kvm_s390_get_protected_dump'
>> collect2: error: ld returned 1 exit status
>>
>> https://gitlab.com/qemu-project/qemu/-/jobs/3226673649
>>
>>
> Ok to squash this with "s390x: Add protected dump cap" patch ? that should
> solve it hopefully.

Sure, LGTM

> 
> diff --git a/target/s390x/kvm/stubs.c b/target/s390x/kvm/stubs.c
> new file mode 100644
> index 0000000000..5fd63b9a7e
> --- /dev/null
> +++ b/target/s390x/kvm/stubs.c
> @@ -0,0 +1,12 @@
> +/*
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + */
> +
> +#include "qemu/osdep.h"
> +
> +#include "kvm_s390x.h"
> +
> +int kvm_s390_get_protected_dump(void)
> +{
> +    return false;
> +}
> diff --git a/target/s390x/kvm/meson.build b/target/s390x/kvm/meson.build
> index d1356356b1..aef52b6686 100644
> --- a/target/s390x/kvm/meson.build
> +++ b/target/s390x/kvm/meson.build
> @@ -1,6 +1,8 @@
> 
>   s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
>     'kvm.c'
> +), if_false: files(
> +  'stubs.c'
>   ))
>