Re: [Qemu-devel] [PATCH build-breaker] qga/main.c: Don't use g_key_file_get/set_int64

[Michael Roth]

On Fri, Mar 15, 2013 at 12:04 AM, Peter Crosthwaite
<address@hidden> wrote:
> These functions don't exist until glib version 2.26. QEMU is currently only
> mandating glib 2.12.
>
> This patch replaces the functions with g_key_file_get/set_integer.
>
> Unbreaks the build on Ubuntu 10.04 and RHEL 5.6.
>
> Regression was introduced by 39097daf15c42243742667607d2cad2c9dc4f764
>
> Signed-off-by: Peter Crosthwaite <address@hidden>

This introduces a corner-case case when fd_counter reaches MAX_INT32 and
the agent is restarted, but since that's not likely to occur any time
soon, let's fix
the build now, and I can send a follow-up afterward.

Acked-by: Michael Roth <address@hidden>

> ---
>  qga/main.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/qga/main.c b/qga/main.c
> index 99346e1..74ef788 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -755,7 +755,7 @@ static void 
> persistent_state_from_keyfile(GAPersistentState *pstate,
>
>      if (g_key_file_has_key(keyfile, "global", "fd_counter", NULL)) {
>          pstate->fd_counter =
> -            g_key_file_get_int64(keyfile, "global", "fd_counter", NULL);
> +            g_key_file_get_integer(keyfile, "global", "fd_counter", NULL);
>      }
>  }
>
> @@ -765,7 +765,7 @@ static void persistent_state_to_keyfile(const 
> GAPersistentState *pstate,
>      g_assert(pstate);
>      g_assert(keyfile);
>
> -    g_key_file_set_int64(keyfile, "global", "fd_counter", 
> pstate->fd_counter);
> +    g_key_file_set_integer(keyfile, "global", "fd_counter", 
> pstate->fd_counter);
>  }
>
>  static gboolean write_persistent_state(const GAPersistentState *pstate,
> --
> 1.7.0.4
>