From patchwork Tue Apr 2 21:45:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 233155 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 CEF762C0164 for ; Wed, 3 Apr 2013 08:54:06 +1100 (EST) Received: from localhost ([::1]:59407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN99Z-0002jC-1i for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 17:54:05 -0400 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 Received: from mail-gh0-f179.google.com ([209.85.160.179]:36963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN97L-0000MZ-V7; Tue, 02 Apr 2013 17:51:48 -0400 Received: by mail-gh0-f179.google.com with SMTP id z12so142628ghb.38 for ; Tue, 02 Apr 2013 14:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=kUt9hKXm69yMgvVe6Tz7hRG/6W97Nqy++7mgB8+d5s0=; b=bEEc1k5eHH8rVzuqsJMW51FN8VeE+0X7bokPAjKX2OFgpryJR6tb7XMWO1lwcYpmio P8t+QweHtdRxzXSjAoFJvUfPJzoJr6nR75uI59BT4zhN+inYueDhtIUDIJzB74Q7W4JY ljrwA5NNhKRiZZhY9jvvSovMwuLFVUffBMZdXtktbhbMnfyvdjhb4zx5ysrMMm+56bVB ew5RUE5iY61zHRtbzVWsZuGVFup0kYttljAZFj4r61nMXQs+nosumu4AJvS8WfUUZOn2 yOylFusMKJjZP2ogGqdYjT36xKY//QJbYlrG3+AVzJBWUfVYA4uIKyYnoxJQatMyIBHA I2Qw== X-Received: by 10.236.98.66 with SMTP id u42mr16985898yhf.157.1364939506773; Tue, 02 Apr 2013 14:51:46 -0700 (PDT) Received: from localhost ([32.97.110.51]) by mx.google.com with ESMTPS id f70sm5759732yhi.12.2013.04.02.14.51.45 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 14:51:46 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:45:25 -0500 Message-Id: <1364939142-30066-21-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.179 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 20/37] 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 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,