| Message ID | 1363323879-682-1-git-send-email-peter.crosthwaite@xilinx.com |
|---|---|
| State | New |
| Headers | show |
On 15.03.2013, at 06:04, Peter Crosthwaite 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 <peter.crosthwaite@xilinx.com> Thanks, this fixes the build for me on openSUSE 11.1 as well. Acked-by: Alexander Graf <agraf@suse.de> I also applied to patch to ppc-next, as I can't build without it, but I'd prefer if someone applies the patch directly to the tree ASAP. Alex > --- > 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 > >
On Fri, Mar 15, 2013 at 12:04 AM, Peter Crosthwaite <peter.crosthwaite@xilinx.com> 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 <peter.crosthwaite@xilinx.com> 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 <mdroth@linux.vnet.ibm.com> > --- > 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 >
Applied. Thanks. Regards, Anthony Liguori
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,
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 <peter.crosthwaite@xilinx.com> --- qga/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)