From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN97Q-0000EQ-84 for qemu-devel@nongnu.org; Tue, 02 Apr 2013 17:51:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN97M-0000Mf-3V for qemu-devel@nongnu.org; Tue, 02 Apr 2013 17:51:52 -0400 Sender: fluxion From: Michael Roth Date: Tue, 2 Apr 2013 16:45:25 -0500 Message-Id: <1364939142-30066-21-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1364939142-30066-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1364939142-30066-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 20/37] qga/main.c: Don't use g_key_file_get/set_int64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Peter Crosthwaite 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 Message-id: 1363323879-682-1-git-send-email-peter.crosthwaite@xilinx.com Signed-off-by: Anthony Liguori (cherry picked from commit 4f306496183d81aed4b43762cf3bfd6e054de767) Signed-off-by: Michael Roth --- qga/main.c | 4 ++-- 1 file 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.9.5