Fix the non-linux platform build after recent VIR_AUTOPTR patches

[libvirt] [PATCH 1/2] util: virnetdevopenvswitch: Drop an unused variable @ovs_timeout

Posted by Erik Skultety 7 years, 6 months ago

Technically, it was never used ever since commit @f4d06ca8fd9 introduced
it, but the fact that we called VIR_FREE on it was enough for Clang to
never complain about it.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
---

CC'ing Boris, as he allowed specifying timeouts for openvswitch calls, however,
this particular one hasn't been in use ever.

 src/util/virnetdevopenvswitch.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index 69ae04ee5a..9a9435f8af 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -473,7 +473,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
     size_t ntokens = 0;
     int status;
     int ret = -1;
-    VIR_AUTOFREE(char *) ovs_timeout = NULL;

     /* Openvswitch vhostuser path are hardcoded to
      * /<runstatedir>/openvswitch/<ifname>
--
2.14.4

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

Re: [libvirt] [PATCH 1/2] util: virnetdevopenvswitch: Drop an unused variable @ovs_timeout

Posted by Ján Tomko 7 years, 6 months ago

On Wed, Aug 08, 2018 at 08:23:41AM +0200, Erik Skultety wrote:
>Technically, it was never used ever since commit @f4d06ca8fd9 introduced
>it, but the fact that we called VIR_FREE on it was enough for Clang to
>never complain about it.
>
>Signed-off-by: Erik Skultety <eskultet@redhat.com>
>---
>
>CC'ing Boris, as he allowed specifying timeouts for openvswitch calls, however,
>this particular one hasn't been in use ever.
>

Looks like an oversight by Michal when he made adjustments before
pushing the series:
https://www.redhat.com/archives/libvir-list/2017-February/msg00407.html

The timeout addition is handled by virNetDevOpenvswitchAddTimeout,
this is harmless.

> src/util/virnetdevopenvswitch.c | 1 -
> 1 file changed, 1 deletion(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

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

Re: [libvirt] [PATCH 1/2] util: virnetdevopenvswitch: Drop an unused variable @ovs_timeout

Posted by Boris Fiuczynski 7 years, 6 months ago

On 08/08/2018 08:23 AM, Erik Skultety wrote:
> Technically, it was never used ever since commit @f4d06ca8fd9 introduced
> it, but the fact that we called VIR_FREE on it was enough for Clang to
> never complain about it.
> 
> Signed-off-by: Erik Skultety <eskultet@redhat.com>
> ---
> 
> CC'ing Boris, as he allowed specifying timeouts for openvswitch calls, however,
> this particular one hasn't been in use ever.
> 
>   src/util/virnetdevopenvswitch.c | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
> index 69ae04ee5a..9a9435f8af 100644
> --- a/src/util/virnetdevopenvswitch.c
> +++ b/src/util/virnetdevopenvswitch.c
> @@ -473,7 +473,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
>       size_t ntokens = 0;
>       int status;
>       int ret = -1;
> -    VIR_AUTOFREE(char *) ovs_timeout = NULL;
> 
>       /* Openvswitch vhostuser path are hardcoded to
>        * /<runstatedir>/openvswitch/<ifname>
> --
> 2.14.4
> 
> --
> libvir-list mailing list
> libvir-list@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
> 
Even so it is pushed already the removal is correct.
I did not catch this leftover after Michal rework.

-- 
Mit freundlichen Grüßen/Kind regards
    Boris Fiuczynski

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martina Köderitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294

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