Re: [libvirt] [PATCH] vmware: set the driver version

[Eric Blake]

On 04/08/2014 10:01 AM, Jean-Baptiste Rouault wrote:
> Since commit 7457cbe8 the vmware driver version isn't set anymore.
> ---
>  src/vmware/vmware_conf.c | 1 +
>  1 file changed, 1 insertion(+)
> 

Good catch, but it could be even simpler to skip the temporary variable.
 I'll push in your name, since you found the issue:

diff --git i/src/vmware/vmware_conf.c w/src/vmware/vmware_conf.c
index 6aba4f8..5ff6396 100644
--- i/src/vmware/vmware_conf.c
+++ w/src/vmware/vmware_conf.c
@@ -259,7 +259,6 @@ vmwareParseVersionStr(int type, const char *verbuf,
unsigned long *version)
 int
 vmwareExtractVersion(struct vmware_driver *driver)
 {
-unsigned long version = 0;
 int ret = -1;
 virCommandPtr cmd = NULL;
 char * outbuf = NULL;
@@ -298,7 +297,7 @@ vmwareExtractVersion(struct vmware_driver *driver)
 if (virCommandRun(cmd, NULL) < 0)
 goto cleanup;

-if (vmwareParseVersionStr(driver->type, outbuf, &version) < 0)
+if (vmwareParseVersionStr(driver->type, outbuf, &driver->version) < 0)
 goto cleanup;

 ret = 0;


-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] vmware: set the driver version

[Jean-Baptiste Rouault]

Since commit 7457cbe8 the vmware driver version isn't set anymore.
---
 src/vmware/vmware_conf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 6aba4f8..5e894a4 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -301,6 +301,7 @@ vmwareExtractVersion(struct vmware_driver *driver)
 if (vmwareParseVersionStr(driver->type, outbuf, &version) < 0)
 goto cleanup;
 
+driver->version = version;
 ret = 0;
 
  cleanup:
-- 
1.8.5.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list