Hi Janosch On Wed, Oct 26, 2022 at 1:37 AM Stefan Hajnoczi <stefa...@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' ))