External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-08 07:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virStream*All: Preserve reported error

Browse Source 
If one these four functions fail (virStreamRecvAll,
virStreamSendAll, virStreamSparseRecvAll, virStreamSparseSendAll)
the stream is aborted by calling virStreamAbort(). This is  a
public API; therefore, the first thing it does is error reset. At
that point any error that caused us to abort stream in the first
place is gone.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Michal Privoznik 2017-06-01 08:40:10 +02:00
parent 6f8aa8e8da
commit 5b62dacb70
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libvirt-stream.c
View File

@ -616,7 +616,12 @@ virStreamSendAll(virStreamPtr stream,
VIR_FREE(bytes); VIR_FREE(bytes);
if (ret != 0) { if (ret != 0) {
virErrorPtr orig_err = virSaveLastError();
virStreamAbort(stream); virStreamAbort(stream);
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
virDispatchError(stream->conn); virDispatchError(stream->conn);
} }
@ -771,7 +776,12 @@ int virStreamSparseSendAll(virStreamPtr stream,
VIR_FREE(bytes); VIR_FREE(bytes);
if (ret != 0) { if (ret != 0) {
virErrorPtr orig_err = virSaveLastError();
virStreamAbort(stream); virStreamAbort(stream);
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
virDispatchError(stream->conn); virDispatchError(stream->conn);
} }
@ -865,7 +875,12 @@ virStreamRecvAll(virStreamPtr stream,
VIR_FREE(bytes); VIR_FREE(bytes);
if (ret != 0) { if (ret != 0) {
virErrorPtr orig_err = virSaveLastError();
virStreamAbort(stream); virStreamAbort(stream);
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
virDispatchError(stream->conn); virDispatchError(stream->conn);
} }
@ -985,7 +1000,12 @@ virStreamSparseRecvAll(virStreamPtr stream,
VIR_FREE(bytes); VIR_FREE(bytes);
if (ret != 0) { if (ret != 0) {
virErrorPtr orig_err = virSaveLastError();
virStreamAbort(stream); virStreamAbort(stream);
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
virDispatchError(stream->conn); virDispatchError(stream->conn);
} }