diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 57e3eb4188..a9560bafc4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1382,7 +1382,6 @@ virFileLoopDeviceAssociate; virFileRewrite; virFileTouch; virFileUpdatePerm; -virFileWrapperFdCatchError; virFileWrapperFdClose; virFileWrapperFdFree; virFileWrapperFdNew; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 979a027b3f..48f95164c0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2855,7 +2855,6 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, cleanup: VIR_FORCE_CLOSE(fd); - virFileWrapperFdCatchError(wrapperFd); virFileWrapperFdFree(wrapperFd); VIR_FREE(xml); @@ -3288,10 +3287,8 @@ doCoreDump(virQEMUDriverPtr driver, cleanup: VIR_FORCE_CLOSE(fd); - if (ret != 0) { - virFileWrapperFdCatchError(wrapperFd); + if (ret != 0) unlink(path); - } virFileWrapperFdFree(wrapperFd); return ret; } diff --git a/src/util/virfile.c b/src/util/virfile.c index b4765fb660..eec9bccafa 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -282,26 +282,17 @@ virFileWrapperFdNew(int *fd ATTRIBUTE_UNUSED, int virFileWrapperFdClose(virFileWrapperFdPtr wfd) { + int ret; + if (!wfd) return 0; - return virCommandWait(wfd->cmd, NULL); -} - - -/** - * virFileWrapperFdCatchError: - * @wfd: fd wrapper, or NULL - * - * If iohelper reported any error VIR_WARN() about it. - */ -void -virFileWrapperFdCatchError(virFileWrapperFdPtr wfd) -{ - if (wfd && wfd->err_msg) + ret = virCommandWait(wfd->cmd, NULL); + if (wfd->err_msg) VIR_WARN("iohelper reports: %s", wfd->err_msg); -} + return ret; +} /** * virFileWrapperFdFree: diff --git a/src/util/virfile.h b/src/util/virfile.h index 80daf867a5..c885b73c36 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -90,8 +90,6 @@ int virFileWrapperFdClose(virFileWrapperFdPtr dfd); void virFileWrapperFdFree(virFileWrapperFdPtr dfd); -void virFileWrapperFdCatchError(virFileWrapperFdPtr dfd); - int virFileLock(int fd, bool shared, off_t start, off_t len); int virFileUnlock(int fd, off_t start, off_t len);