[libvirt] [PATCH 1/4] Revert commit 06f81c63ebc19cb0e51f9b397991f6d6ae56d090

[Eric Blake]

On 11/01/2010 11:48 AM, Daniel P. Berrange wrote:
> 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 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index a7cce6a..9945f5d 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -3876,8 +3876,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;

ACK.

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20101101/973ea1b2/attachment-0001.sig>