From patchwork Wed May 23 18:48:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 161022 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 F0CEDB6FC2 for ; Thu, 24 May 2012 04:48:15 +1000 (EST) Received: from localhost ([::1]:43685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXGbV-0005cz-Rw for incoming@patchwork.ozlabs.org; Wed, 23 May 2012 14:48:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXGbI-0005V7-5E for qemu-devel@nongnu.org; Wed, 23 May 2012 14:48:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXGbG-0007h7-Ez for qemu-devel@nongnu.org; Wed, 23 May 2012 14:47:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXGbG-0007gc-69 for qemu-devel@nongnu.org; Wed, 23 May 2012 14:47:58 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4NIltPb001391 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 23 May 2012 14:47:55 -0400 Received: from localhost (ovpn-116-71.ams2.redhat.com [10.36.116.71]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q4NIlrTR024672; Wed, 23 May 2012 14:47:54 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 23 May 2012 15:48:05 -0300 Message-Id: <1337798885-23070-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1337798885-23070-1-git-send-email-lcapitulino@redhat.com> References: <1337798885-23070-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, eblake@redhat.com, mdroth@linux.vnet.ibm.com, afaerber@suse.de, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 2/2] qemu-ga: Fix missing environ declaration 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 Commit 3674838cd05268954bb6473239cd7f700a79bf0f uses the environ global variable, but is relying on environ to be declared somewhere else. This worked for me because on F16 environ is declared in , but that doesn't happen in OpenBSD for example, causing a build failure. This commit fixes the build error by declaring environ if it hasn't being declared yet. Also fixes a build warning due to a missing include. Signed-off-by: Luiz Capitulino --- qga/commands-posix.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 7664be1..dab3bf9 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -14,12 +14,17 @@ #include #include #include +#include #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" #include "qerror.h" #include "qemu-queue.h" #include "host-utils.h" +#ifndef CONFIG_HAS_ENVIRON +extern char **environ; +#endif + #if defined(__linux__) #include #include @@ -27,7 +32,6 @@ #include #include #include -#include #if defined(__linux__) && defined(FIFREEZE) #define CONFIG_FSFREEZE