提交 a51ccaf8 编写于 作者: D Daniel P. Berrange

Revert commit 06f81c63

Commit 06f81c63 attempted to make
QEMU driver ignore the failure to relabel 'stdin_path' if it was
on NFS. The actual result was that it ignores *all* failures to
label any aspect of the VM, unless stdin_path is non-NULL and
is not on NFS.

* src/qemu/qemu_driver.c: Treat all relabel failures as terminal
上级 53618145
...@@ -3912,8 +3912,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, ...@@ -3912,8 +3912,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
driver->securityDriver->domainSetSecurityAllLabel && driver->securityDriver->domainSetSecurityAllLabel &&
driver->securityDriver->domainSetSecurityAllLabel(driver->securityDriver, driver->securityDriver->domainSetSecurityAllLabel(driver->securityDriver,
vm, stdin_path) < 0) { vm, stdin_path) < 0) {
if (stdin_path && virStorageFileIsSharedFS(stdin_path) != 1) goto cleanup;
goto cleanup;
} }
/* Ensure no historical cgroup for this VM is lying around bogus /* Ensure no historical cgroup for this VM is lying around bogus
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册