Attachment 844995 Details for Bug 1036248 – Another ver to fix same issue

[patch] Another ver to fix same issue

libvirt_OS_X_VMware.diff (text/plain), 1.29 KB, created by Denis Kondratenko on 2014-01-03 15:48:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Kondratenko

Created: 2014-01-03 15:48:42 UTC

Size: 1.29 KB

patch

obsolete

>diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
>index 027e245..477dc72 100644
>--- a/src/vmware/vmware_conf.c
>+++ b/src/vmware/vmware_conf.c
>@@ -271,17 +271,17 @@ vmwareExtractVersion(struct vmware_driver *driver)
> 
>     switch (driver->type) {
>         case VMWARE_DRIVER_PLAYER:
>-            if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer"))
>+            if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer") < 0)
>                 goto cleanup;
>             break;
> 
>         case VMWARE_DRIVER_WORKSTATION:
>-            if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware"))
>+            if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware") < 0)
>                 goto cleanup;
>             break;
> 
>         case VMWARE_DRIVER_FUSION:
>-            if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx"))
>+            if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx") < 0)
>                 goto cleanup;
>             break;
> 
>@@ -293,6 +293,9 @@ vmwareExtractVersion(struct vmware_driver *driver)
> 
>     cmd = virCommandNewArgList(bin, "-v", NULL);
>     virCommandSetOutputBuffer(cmd, &outbuf);
>+    
>+    // OS X 10.9.1 and some earlier ver: vmware-vmx reports ver to stderr   
>+    virCommandSetErrorBuffer(cmd, &outbuf);
> 
>     if (virCommandRun(cmd, NULL) < 0)
>         goto cleanup;

Actions: View | Diff

Attachments on bug 1036248: 830810 | 844995