From a51ccaf82880d7b026d87d7c03a6fcde95f938d3 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 29 Oct 2010 11:47:20 +0100 Subject: [PATCH] Revert commit 06f81c63ebc19cb0e51f9b397991f6d6ae56d090 Commit 06f81c63ebc19cb0e51f9b397991f6d6ae56d090 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 --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0612e69e98..4e590e3374 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3912,8 +3912,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, driver->securityDriver->domainSetSecurityAllLabel && driver->securityDriver->domainSetSecurityAllLabel(driver->securityDriver, 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