External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 14:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Allow suppressing errors from qemuStorageLimitsRefresh

Browse Source 
qemuStorageLimitsRefresh uses qemuDomainStorageOpenStat internally and
there are callers which don't care about the error. Propagate the
skipInaccessible flag so that we can log less errors.

Callers currently don't care about the return value change.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-08-14 18:15:20 +02:00
parent 3d7ea4165b
commit ea26e22f94
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_driver.c
View File

@ -12363,6 +12363,7 @@ qemuDomainStorageUpdatePhysical(virQEMUDriverPtr driver,
* @cfg: driver configuration data * @cfg: driver configuration data
* @vm: domain object * @vm: domain object
* @src: storage source data * @src: storage source data
* @skipInaccessible: Suppress reporting of common errors when accessing @src
* *
* Refresh the capacity and allocation limits of a given storage source. * Refresh the capacity and allocation limits of a given storage source.
* *
@ -12384,22 +12385,27 @@ qemuDomainStorageUpdatePhysical(virQEMUDriverPtr driver,
* is sparse, but the amount of sparseness changes due to writes or * is sparse, but the amount of sparseness changes due to writes or
* punching holes), and physical size of a non-raw file can change. * punching holes), and physical size of a non-raw file can change.
* *
* Returns 0 on success, -1 on failure * Returns 1 if @src was successfully updated, 0 if @src can't be opened and
* @skipInaccessible is true (no errors are reported) or -1 otherwise (errors
* are reported).
*/ */
static int static int
qemuStorageLimitsRefresh(virQEMUDriverPtr driver, qemuStorageLimitsRefresh(virQEMUDriverPtr driver,
virQEMUDriverConfigPtr cfg, virQEMUDriverConfigPtr cfg,
virDomainObjPtr vm, virDomainObjPtr vm,
virStorageSourcePtr src) virStorageSourcePtr src,
bool skipInaccessible)
{ {
int rc;
int ret = -1; int ret = -1;
int fd = -1; int fd = -1;
struct stat sb; struct stat sb;
char *buf = NULL; char *buf = NULL;
ssize_t len; ssize_t len;
if (qemuDomainStorageOpenStat(driver, cfg, vm, src, &fd, &sb, false) < 0) if ((rc = qemuDomainStorageOpenStat(driver, cfg, vm, src, &fd, &sb,
goto cleanup; skipInaccessible)) <= 0)
return rc;
if (virStorageSourceIsLocalStorage(src)) { if (virStorageSourceIsLocalStorage(src)) {
if ((len = virFileReadHeaderFD(fd, VIR_STORAGE_MAX_HEADER, &buf)) < 0) { if ((len = virFileReadHeaderFD(fd, VIR_STORAGE_MAX_HEADER, &buf)) < 0) {
@ -12427,7 +12433,7 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver,
S_ISBLK(sb.st_mode)) S_ISBLK(sb.st_mode))
src->allocation = 0; src->allocation = 0;
ret = 0; ret = 1;
cleanup: cleanup:
VIR_FREE(buf); VIR_FREE(buf);
@ -12477,7 +12483,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom,
/* for inactive domains we have to peek into the files */ /* for inactive domains we have to peek into the files */
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
if ((qemuStorageLimitsRefresh(driver, cfg, vm, disk->src)) < 0) if ((qemuStorageLimitsRefresh(driver, cfg, vm, disk->src, false)) < 0)
goto endjob; goto endjob;
info->capacity = disk->src->capacity; info->capacity = disk->src->capacity;
@ -21295,7 +21301,7 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriverPtr driver,
if (virStorageSourceIsEmpty(src)) if (virStorageSourceIsEmpty(src))
return 0; return 0;
if (qemuStorageLimitsRefresh(driver, cfg, dom, src) < 0) { if (qemuStorageLimitsRefresh(driver, cfg, dom, src, false) < 0) {
virResetLastError(); virResetLastError();
return 0; return 0;
} }