From patchwork Fri Mar 15 05:04:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 227852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6853E2C00D8 for ; Fri, 15 Mar 2013 16:33:09 +1100 (EST) Received: from localhost ([::1]:37591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGNGN-0001CT-FA for incoming@patchwork.ozlabs.org; Fri, 15 Mar 2013 01:33:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGNG8-0001CC-OW for qemu-devel@nongnu.org; Fri, 15 Mar 2013 01:32:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGMpz-00029n-Gp for qemu-devel@nongnu.org; Fri, 15 Mar 2013 01:05:57 -0400 Received: from mail-pb0-f50.google.com ([209.85.160.50]:49271) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGMpz-00028h-9Y for qemu-devel@nongnu.org; Fri, 15 Mar 2013 01:05:51 -0400 Received: by mail-pb0-f50.google.com with SMTP id up1so3263495pbc.23 for ; Thu, 14 Mar 2013 22:05:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=DZlc8w1QoqaD5DcKX7x7Zc1gPrHy285rhuFFtWSWAKI=; b=CA+Doelfnl05VaQ6RgbCRuDwPwKuqptVmI8mjkQdYlh4ZlHVD1Yqkzb6WwbiTsDfPd lJi0UuLItCHWs58fmbsAmyWcMQnEbutmV6SJMo9WON5ByIV6Cygq0ImreC6gNczKba/f RJwOZb4VFG/+zsk84gAu8hHRIaENs37OtngmLJKo7QnygBOPj7LHyAdUFbSjjx9LGuKu yxzrO29j8cNcgb3Eh0iG9u9sz+jCwZ8oiqvd9HAJEd50YnaTAFPsjiQSGbLi2FXN3e0d WAno6T3bm83UnT2V+bfAQ4/swswe+alU0XjqeB2MljV7JqgELk8g6paq9SkDy9rZ7o3O WAXQ== X-Received: by 10.69.1.101 with SMTP id bf5mr12372030pbd.208.1363323949959; Thu, 14 Mar 2013 22:05:49 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPS id kl4sm6759635pbc.31.2013.03.14.22.05.47 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Thu, 14 Mar 2013 22:05:48 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Fri, 15 Mar 2013 15:04:39 +1000 Message-Id: <1363323879-682-1-git-send-email-peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.7.0.4 X-Gm-Message-State: ALoCoQmWEGJr+an+FgYM1E2b4uepjYoXLLNH55E1TAzhHLAZSZEonR4TKwoG/m7vCNuLrRJaQfQy X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.50 Cc: blauwirbel@gmail.com, aliguori@us.ibm.com, Peter Crosthwaite , mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH build-breaker] qga/main.c: Don't use g_key_file_get/set_int64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Acked-by: Alexander Graf Acked-by: Michael Roth --- 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,