When kvmppc_get_htab_fd() fails, its return value is propagated up to qemu_savevm_state_iterate() or to qemu_savevm_state_complete_precopy(). All savevm handlers expect to receive a negative errno on error.
Let's patch kvmppc_get_htab_fd() accordingly. While here, let's change htab_load() in the spapr code to also propagate the error, since it doesn't make sense to abort() if we couldn't get the htab fd from KVM. Signed-off-by: Greg Kurz <gr...@kaod.org> --- hw/ppc/spapr.c | 5 +++-- target/ppc/kvm.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 841117f6d185..1ae79326d1ac 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1218,7 +1218,7 @@ static int get_htab_fd(sPAPRMachineState *spapr) spapr->htab_fd = kvmppc_get_htab_fd(false); if (spapr->htab_fd < 0) { error_report("Unable to open fd for reading hash table from KVM: %s", - strerror(errno)); + strerror(spapr->htab_fd)); } return spapr->htab_fd; @@ -1962,7 +1962,8 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id) fd = kvmppc_get_htab_fd(true); if (fd < 0) { error_report("Unable to open fd to restore KVM hash table: %s", - strerror(errno)); + strerror(fd)); + return fd; } } diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 00d7029b8d7a..09d7dea79e2d 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2556,13 +2556,19 @@ int kvmppc_get_htab_fd(bool write) .flags = write ? KVM_GET_HTAB_WRITE : 0, .start_index = 0, }; + int ret; if (!cap_htab_fd) { fprintf(stderr, "KVM version doesn't support saving the hash table\n"); - return -1; + return -ENOTSUP; + } + + ret = kvm_vm_ioctl(kvm_state, KVM_PPC_GET_HTAB_FD, &s); + if (ret < 0) { + return -errno; } - return kvm_vm_ioctl(kvm_state, KVM_PPC_GET_HTAB_FD, &s); + return ret; } int kvmppc_save_htab(QEMUFile *f, int fd, size_t bufsize, int64_t max_ns)