1. Patchew
  2. Libvirt
  3. [PATCH v2 00/14] Unreacheble code cleanup
  4. View patch

[PATCH v2 14/14] rpc: turn virNetClientAddProgram() to void

Dmitry Frolov posted 14 patches 2 years, 1 month ago
There is a newer version of this series
[PATCH v2 14/14] rpc: turn virNetClientAddProgram() to void
Posted by Dmitry Frolov 2 years, 1 month ago 
virNetClientAddProgram() always returns 0.

Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
---
 src/admin/admin_remote.c        | 3 +--
 src/locking/lock_driver_lockd.c | 3 +--
 src/logging/log_manager.c       | 3 +--
 src/lxc/lxc_monitor.c           | 4 +---
 src/remote/remote_driver.c      | 7 +++----
 src/rpc/virnetclient.c          | 3 +--
 src/rpc/virnetclient.h          | 2 +-
 7 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c
index 3291a1e965..5c4913a76e 100644
--- a/src/admin/admin_remote.c
+++ b/src/admin/admin_remote.c
@@ -214,8 +214,7 @@ remoteAdminPrivNew(const char *sock_path)
                                                  NULL, 0, NULL)))
         goto error;
 
-    if (virNetClientAddProgram(priv->client, priv->program) < 0)
-        goto error;
+    virNetClientAddProgram(priv->client, priv->program);
 
     return priv;
  error:
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index d75302dd0a..0b6c720477 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -213,8 +213,7 @@ static virNetClient *virLockManagerLockDaemonConnectionNew(bool privileged,
                                          NULL)))
         goto error;
 
-    if (virNetClientAddProgram(client, *prog) < 0)
-        goto error;
+    virNetClientAddProgram(client, *prog);
 
     return client;
 
diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c
index d8490f4e5a..19e23d65c5 100644
--- a/src/logging/log_manager.c
+++ b/src/logging/log_manager.c
@@ -88,8 +88,7 @@ virLogManagerConnect(bool privileged,
                                          NULL)))
         goto error;
 
-    if (virNetClientAddProgram(client, *prog) < 0)
-        goto error;
+    virNetClientAddProgram(client, *prog);
 
     VIR_FREE(daemonPath);
     VIR_FREE(logdpath);
diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 811d6685e5..cf2fd1897f 100644
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -169,9 +169,7 @@ virLXCMonitor *virLXCMonitorNew(virDomainObj *vm,
                                                 mon)))
         goto error;
 
-    if (virNetClientAddProgram(mon->client,
-                               mon->program) < 0)
-        goto error;
+    virNetClientAddProgram(mon->client, mon->program);
 
     mon->vm = virObjectRef(vm);
     memcpy(&mon->cb, cb, sizeof(mon->cb));
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 132d0194c6..8db638d6cc 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1160,10 +1160,9 @@ doRemoteOpen(virConnectPtr conn,
                                                      conn)))
         goto error;
 
-    if (virNetClientAddProgram(priv->client, priv->remoteProgram) < 0 ||
-        virNetClientAddProgram(priv->client, priv->lxcProgram) < 0 ||
-        virNetClientAddProgram(priv->client, priv->qemuProgram) < 0)
-        goto error;
+    virNetClientAddProgram(priv->client, priv->remoteProgram);
+    virNetClientAddProgram(priv->client, priv->lxcProgram);
+    virNetClientAddProgram(priv->client, priv->qemuProgram);
 
     /* Try and authenticate with server */
     VIR_DEBUG("Trying authentication");
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 4ab8af68c5..c5be82abee 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -1053,7 +1053,7 @@ bool virNetClientIsOpen(virNetClient *client)
 }
 
 
-int virNetClientAddProgram(virNetClient *client,
+void virNetClientAddProgram(virNetClient *client,
                            virNetClientProgram *prog)
 {
     virObjectLock(client);
@@ -1062,7 +1062,6 @@ int virNetClientAddProgram(virNetClient *client,
     client->programs[client->nprograms-1] = virObjectRef(prog);
 
     virObjectUnlock(client);
-    return 0;
 }
 
 
diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index 1647a6cc71..7726b57ef4 100644
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -117,7 +117,7 @@ int virNetClientDupFD(virNetClient *client, bool cloexec);
 
 bool virNetClientHasPassFD(virNetClient *client);
 
-int virNetClientAddProgram(virNetClient *client,
+void virNetClientAddProgram(virNetClient *client,
                            virNetClientProgram *prog);
 
 int virNetClientAddStream(virNetClient *client,
-- 
2.34.1
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
Re: [PATCH v2 14/14] rpc: turn virNetClientAddProgram() to void
Posted by Jonathon Jongsma 2 years, 1 month ago 
On 12/14/23 8:51 AM, Dmitry Frolov wrote:
> virNetClientAddProgram() always returns 0.
> 
> Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
> ---
>   src/admin/admin_remote.c        | 3 +--
>   src/locking/lock_driver_lockd.c | 3 +--
>   src/logging/log_manager.c       | 3 +--
>   src/lxc/lxc_monitor.c           | 4 +---
>   src/remote/remote_driver.c      | 7 +++----
>   src/rpc/virnetclient.c          | 3 +--
>   src/rpc/virnetclient.h          | 2 +-
>   7 files changed, 9 insertions(+), 16 deletions(-)
> 
> diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c
> index 3291a1e965..5c4913a76e 100644
> --- a/src/admin/admin_remote.c
> +++ b/src/admin/admin_remote.c
> @@ -214,8 +214,7 @@ remoteAdminPrivNew(const char *sock_path)
>                                                    NULL, 0, NULL)))
>           goto error;
>   
> -    if (virNetClientAddProgram(priv->client, priv->program) < 0)
> -        goto error;
> +    virNetClientAddProgram(priv->client, priv->program);
>   
>       return priv;
>    error:
> diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
> index d75302dd0a..0b6c720477 100644
> --- a/src/locking/lock_driver_lockd.c
> +++ b/src/locking/lock_driver_lockd.c
> @@ -213,8 +213,7 @@ static virNetClient *virLockManagerLockDaemonConnectionNew(bool privileged,
>                                            NULL)))
>           goto error;
>   
> -    if (virNetClientAddProgram(client, *prog) < 0)
> -        goto error;
> +    virNetClientAddProgram(client, *prog);
>   
>       return client;
>   
> diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c
> index d8490f4e5a..19e23d65c5 100644
> --- a/src/logging/log_manager.c
> +++ b/src/logging/log_manager.c
> @@ -88,8 +88,7 @@ virLogManagerConnect(bool privileged,
>                                            NULL)))
>           goto error;
>   
> -    if (virNetClientAddProgram(client, *prog) < 0)
> -        goto error;
> +    virNetClientAddProgram(client, *prog);
>   
>       VIR_FREE(daemonPath);
>       VIR_FREE(logdpath);
> diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
> index 811d6685e5..cf2fd1897f 100644
> --- a/src/lxc/lxc_monitor.c
> +++ b/src/lxc/lxc_monitor.c
> @@ -169,9 +169,7 @@ virLXCMonitor *virLXCMonitorNew(virDomainObj *vm,
>                                                   mon)))
>           goto error;
>   
> -    if (virNetClientAddProgram(mon->client,
> -                               mon->program) < 0)
> -        goto error;
> +    virNetClientAddProgram(mon->client, mon->program);
>   
>       mon->vm = virObjectRef(vm);
>       memcpy(&mon->cb, cb, sizeof(mon->cb));
> diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
> index 132d0194c6..8db638d6cc 100644
> --- a/src/remote/remote_driver.c
> +++ b/src/remote/remote_driver.c
> @@ -1160,10 +1160,9 @@ doRemoteOpen(virConnectPtr conn,
>                                                        conn)))
>           goto error;
>   
> -    if (virNetClientAddProgram(priv->client, priv->remoteProgram) < 0 ||
> -        virNetClientAddProgram(priv->client, priv->lxcProgram) < 0 ||
> -        virNetClientAddProgram(priv->client, priv->qemuProgram) < 0)
> -        goto error;
> +    virNetClientAddProgram(priv->client, priv->remoteProgram);
> +    virNetClientAddProgram(priv->client, priv->lxcProgram);
> +    virNetClientAddProgram(priv->client, priv->qemuProgram);
>   
>       /* Try and authenticate with server */
>       VIR_DEBUG("Trying authentication");
> diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
> index 4ab8af68c5..c5be82abee 100644
> --- a/src/rpc/virnetclient.c
> +++ b/src/rpc/virnetclient.c
> @@ -1053,7 +1053,7 @@ bool virNetClientIsOpen(virNetClient *client)
>   }
>   
>   
> -int virNetClientAddProgram(virNetClient *client,
> +void virNetClientAddProgram(virNetClient *client,
>                              virNetClientProgram *prog)
>   {
>       virObjectLock(client);
> @@ -1062,7 +1062,6 @@ int virNetClientAddProgram(virNetClient *client,
>       client->programs[client->nprograms-1] = virObjectRef(prog);
>   
>       virObjectUnlock(client);
> -    return 0;
>   }
>   
>   
> diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
> index 1647a6cc71..7726b57ef4 100644
> --- a/src/rpc/virnetclient.h
> +++ b/src/rpc/virnetclient.h
> @@ -117,7 +117,7 @@ int virNetClientDupFD(virNetClient *client, bool cloexec);
>   
>   bool virNetClientHasPassFD(virNetClient *client);
>   
> -int virNetClientAddProgram(virNetClient *client,
> +void virNetClientAddProgram(virNetClient *client,
>                              virNetClientProgram *prog);

another minor alignment issue here (though not obvious in my email reply)

>   
>   int virNetClientAddStream(virNetClient *client,
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.