提交 4e22355e 编写于 作者: P Peter Krempa

qemu: cgroup: Avoid reporting errors from inaccessible NFS volumes

Rather than reporting it and then reseting the error, don't report it in
the first place.
上级 cf113e8d
...@@ -77,7 +77,7 @@ qemuSetImageCgroupInternal(virDomainObjPtr vm, ...@@ -77,7 +77,7 @@ qemuSetImageCgroupInternal(virDomainObjPtr vm,
VIR_DEBUG("Deny path %s", src->path); VIR_DEBUG("Deny path %s", src->path);
ret = virCgroupDenyDevicePath(priv->cgroup, src->path, perms, false); ret = virCgroupDenyDevicePath(priv->cgroup, src->path, perms, true);
} else { } else {
if (!src->readonly && !forceReadonly) if (!src->readonly && !forceReadonly)
perms |= VIR_CGROUP_DEVICE_WRITE; perms |= VIR_CGROUP_DEVICE_WRITE;
...@@ -85,7 +85,7 @@ qemuSetImageCgroupInternal(virDomainObjPtr vm, ...@@ -85,7 +85,7 @@ qemuSetImageCgroupInternal(virDomainObjPtr vm,
VIR_DEBUG("Allow path %s, perms: %s", VIR_DEBUG("Allow path %s, perms: %s",
src->path, virCgroupGetDevicePermsString(perms)); src->path, virCgroupGetDevicePermsString(perms));
ret = virCgroupAllowDevicePath(priv->cgroup, src->path, perms, false); ret = virCgroupAllowDevicePath(priv->cgroup, src->path, perms, true);
} }
virDomainAuditCgroupPath(vm, priv->cgroup, virDomainAuditCgroupPath(vm, priv->cgroup,
...@@ -94,14 +94,6 @@ qemuSetImageCgroupInternal(virDomainObjPtr vm, ...@@ -94,14 +94,6 @@ qemuSetImageCgroupInternal(virDomainObjPtr vm,
virCgroupGetDevicePermsString(perms), virCgroupGetDevicePermsString(perms),
ret == 0); ret == 0);
/* Get this for root squash NFS */
if (ret < 0 &&
virLastErrorIsSystemErrno(EACCES)) {
VIR_DEBUG("Ignoring EACCES for %s", src->path);
virResetLastError();
ret = 0;
}
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册