openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Fix error reporting in qemuDomainSaveImageStartVM 

When restoring a domain from a compressed image, we launch an
intermediate process for decompressing the saved data. If QEMU fails to
load the data for some reason, we force close the stdin/stdout file
descriptors of the intermediate process and wait for it to die. However,
virCommandWait can report various errors which would overwrite the real
error from QEMU. Thus instead of getting something useful:

    internal error: process exited while connecting to monitor:
    2018-09-17T15:17:29.998910Z qemu-system-x86_64: can't apply global
    Skylake-Client-x86_64-cpu.osxsave=off: Property '.osxsave' not found

we could get an irrelevant error message:

    internal error: Child process (lzop -dc --ignore-warn) unexpected
    fatal signal 13

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Jiri Denemark 2018-09-18 09:42:06 +02:00
parent 602ecdf2ab
commit 1468536d42
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_driver.c
View File

@ -6598,11 +6598,15 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
restored = true;
if (intermediatefd != -1) {
virErrorPtr orig_err = NULL;
if (!restored) {
/* if there was an error setting up qemu, the intermediate
* process will wait forever to write to stdout, so we
* must manually kill it.
* must manually kill it and ignore any error related to
* the process
*/
orig_err = virSaveLastError();
VIR_FORCE_CLOSE(intermediatefd);
VIR_FORCE_CLOSE(*fd);
}
@ -6612,6 +6616,11 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
restored = false;
}
VIR_DEBUG("Decompression binary stderr: %s", NULLSTR(errbuf));
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
}
VIR_FORCE_CLOSE(intermediatefd);