Re: [PATCH v6 09/10] s390x: Add KVM PV dump interface

[Janosch Frank]

On 10/24/22 20:36, Marc-André Lureau wrote:

Hi Janosch

On Mon, Oct 17, 2022 at 12:53 PM Janosch Frank <fran...@linux.ibm.com>
wrote:

[...]

diff --git a/include/hw/s390x/pv.h b/include/hw/s390x/pv.h
index e5ea0eca16..3164006674 100644
--- a/include/hw/s390x/pv.h
+++ b/include/hw/s390x/pv.h
@@ -51,6 +51,10 @@ uint64_t kvm_s390_pv_dmp_get_size_cpu(void);
  uint64_t kvm_s390_pv_dmp_get_size_mem_state(void);
  uint64_t kvm_s390_pv_dmp_get_size_completion_data(void);
  bool kvm_s390_pv_info_basic_valid(void);
+int kvm_s390_dump_init(void);
+int kvm_s390_dump_cpu(S390CPU *cpu, void *buff);
+int kvm_s390_dump_mem_state(uint64_t addr, size_t len, void *dest);
+int kvm_s390_dump_completion_data(void *buff);
  #else /* CONFIG_KVM */
  static inline bool s390_is_pv(void) { return false; }
  static inline int s390_pv_query_info(void) { return 0; }
@@ -66,6 +70,11 @@ static inline uint64_t
kvm_s390_pv_dmp_get_size_cpu(void) { return 0; }
  static inline uint64_t kvm_s390_pv_dmp_get_size_mem_state(void) { return
0; }
  static inline uint64_t kvm_s390_pv_dmp_get_size_completion_data(void) {
return 0; }
  static inline bool kvm_s390_pv_info_basic_valid(void) { return false; }
+static inline int kvm_s390_dump_init(void) { return 0; }
+static inline int kvm_s390_dump_cpu(S390CPU *cpu, void *buff, size_t len)
{ return 0; }
+static inline int kvm_s390_dump_mem_state(uint64_t addr, size_t len,
+                                          void *dest) { return 0; }
+static inline int kvm_s390_dump_completion_data(void *buff) { return 0; }
  #endif /* CONFIG_KVM */

To fix build issue:
../target/s390x/arch_dump.c
../target/s390x/arch_dump.c: In function ‘s390x_write_elf64_pv’:
../target/s390x/arch_dump.c:195:5: error: too few arguments to
function ‘kvm_s390_dump_cpu’
195 | kvm_s390_dump_cpu(cpu, &note->contents.dynamic);
| ^~~~~~~~~~~~~~~~~
In file included from ../target/s390x/arch_dump.c:20:
/builds/qemu-project/qemu/include/hw/s390x/pv.h:74:19: note: declared here
74 | static inline int kvm_s390_dump_cpu(S390CPU *cpu, void *buff,
size_t len) { return 0; }
| ^~~~~~~~~~~~~~~~~

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

Can you ack squashing this to this patch?:

Ack