Attachment 830810 Details for Bug 1036248 – Patch fixing parts 1 and 2 of described bug

[patch] Patch fixing parts 1 and 2 of described bug

libvirt.patch (text/plain), 2.05 KB, created by Brad Ackerman on 2013-11-30 02:48:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Ackerman

Created: 2013-11-30 02:48:53 UTC

Size: 2.05 KB

patch

obsolete

>diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
>index 027e245..49e593d 100644
>--- a/src/vmware/vmware_conf.c
>+++ b/src/vmware/vmware_conf.c
>@@ -263,25 +263,27 @@ vmwareExtractVersion(struct vmware_driver *driver)
>     int ret = -1;
>     virCommandPtr cmd = NULL;
>     char * outbuf = NULL;
>+    char *errbuf = NULL;
>     char *bin = NULL;
>     char *vmwarePath = NULL;
>+    char *bufWithContent = NULL;
>
>     if ((vmwarePath = mdir_name(driver->vmrun)) == NULL)
>         goto cleanup;
>
>     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,18 +295,28 @@ vmwareExtractVersion(struct vmware_driver *driver)
>
>     cmd = virCommandNewArgList(bin, "-v", NULL);
>     virCommandSetOutputBuffer(cmd, &outbuf);
>+    virCommandSetErrorBuffer(cmd, &errbuf);
>
>     if (virCommandRun(cmd, NULL) < 0)
>         goto cleanup;
>
>-    if (vmwareParseVersionStr(driver->type, outbuf, &version) < 0)
>-        goto cleanup;
>+    /* VMware Fusion 6 outputs version information to stderr, not stdout.
>+       If stdout has no output, therefore, use stderr. */
>+
>+    if (strlen(outbuf))
>+        bufWithContent = outbuf;
>+    else
>+        bufWithContent = errbuf;
>+
>+    if (vmwareParseVersionStr(driver->type, bufWithContent, &version) < 0)
>+            goto cleanup;
>
>     ret = 0;
>
> cleanup:
>     virCommandFree(cmd);
>     VIR_FREE(outbuf);
>+    VIR_FREE(errbuf);
>     VIR_FREE(bin);
>     VIR_FREE(vmwarePath);
>     return ret;

Actions: View | Diff

Attachments on bug 1036248: 830810 | 844995