[v2,1/4] qga: Don't access global variable in run_agent_once()

Commit Message

Michal Privoznik Dec. 5, 2024, 4:18 p.m. UTC

The run_agent_once() function is already given GAState via an
argument. There's no need to access the global ga_state variable
which points to the argument anyways (thanks to
initialize_agent()). Worse, some parts of the function use the
argument and the other use the global variable.  Stick with the
function argument.

Signed-off-by: Michal Privoznik <[e-mail]>
Reviewed-by: Ján Tomko <[e-mail]>
Reviewed-by: Konstantin Kostiuk <[e-mail]>
---
 qga/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Konstantin Kostiuk Dec. 18, 2024, 12:05 p.m. UTC | #1

Hi Michal,

The PULL with this patch was sent. Skip it in the next version of this
series.

Best Regards,
Konstantin Kostiuk.


On Thu, Dec 5, 2024 at 6:19 PM Michal Privoznik <[e-mail]> wrote:

> The run_agent_once() function is already given GAState via an
> argument. There's no need to access the global ga_state variable
> which points to the argument anyways (thanks to
> initialize_agent()). Worse, some parts of the function use the
> argument and the other use the global variable.  Stick with the
> function argument.
>
> Signed-off-by: Michal Privoznik <[e-mail]>
> Reviewed-by: Ján Tomko <[e-mail]>
> Reviewed-by: Konstantin Kostiuk <[e-mail]>
> ---
>  qga/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/qga/main.c b/qga/main.c
> index 50186760bf..4a695235f0 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -1519,7 +1519,7 @@ static int run_agent_once(GAState *s)
>          return EXIT_FAILURE;
>      }
>
> -    g_main_loop_run(ga_state->main_loop);
> +    g_main_loop_run(s->main_loop);
>
>      if (s->channel) {
>          ga_channel_free(s->channel);
> --
> 2.45.2
>
>

Patch

diff --git a/qga/main.c b/qga/main.c
index 50186760bf..4a695235f0 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -1519,7 +1519,7 @@  static int run_agent_once(GAState *s)
         return EXIT_FAILURE;
     }
 
-    g_main_loop_run(ga_state->main_loop);
+    g_main_loop_run(s->main_loop);
 
     if (s->channel) {
         ga_channel_free(s->channel);