From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:37309)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1QkL7X-0008Dc-Bd
	for qemu-devel@nongnu.org; Fri, 22 Jul 2011 15:10:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1QkL7V-0008MV-Ik
	for qemu-devel@nongnu.org; Fri, 22 Jul 2011 15:10:47 -0400
Received: from mx1.redhat.com ([209.132.183.28]:45498)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1QkL7V-0008MJ-AG
	for qemu-devel@nongnu.org; Fri, 22 Jul 2011 15:10:45 -0400
Date: Fri, 22 Jul 2011 16:10:40 -0300
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20110722161040.28f3dd7f@doriath>
In-Reply-To: <CAAu8pHvsOdYB=zbdeOgadmNdVjQ5wdGod_trQVsQdriLmbyB_g@mail.gmail.com>
References: <CAAu8pHvsOdYB=zbdeOgadmNdVjQ5wdGod_trQVsQdriLmbyB_g@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] qga: fsfreeze is only supported on Linux
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Blue Swirl <blauwirbel@gmail.com>
Cc: Michael Roth <mdroth@linux.vnet.ibm.com>, qemu-devel <qemu-devel@nongnu.org>

On Fri, 22 Jul 2011 21:56:39 +0300
Blue Swirl <blauwirbel@gmail.com> wrote:

> Fix build breakage on non-Linux hosts.
> 
> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

Looks good to me.

This will return a command not found error, maybe unsupported is better,
but can be done later.

> ---
>  qga/guest-agent-commands.c |   25 ++++++++++++++++++++++++-
>  1 files changed, 24 insertions(+), 1 deletions(-)
> 
> diff --git a/qga/guest-agent-commands.c b/qga/guest-agent-commands.c
> index 8c0d67e..918aaa2 100644
> --- a/qga/guest-agent-commands.c
> +++ b/qga/guest-agent-commands.c
> @@ -11,10 +11,12 @@
>   */
> 
>  #include <glib.h>
> -#include <mntent.h>
>  #include <sys/types.h>
>  #include <sys/ioctl.h>
> +#ifdef __linux__
> +#include <mntent.h>
>  #include <linux/fs.h>
> +#endif
>  #include "qga/guest-agent-core.h"
>  #include "qga-qmp-commands.h"
>  #include "qerror.h"
> @@ -22,6 +24,7 @@
> 
>  static GAState *ga_state;
> 
> +#ifdef __linux__
>  static void disable_logging(void)
>  {
>      ga_disable_logging(ga_state);
> @@ -31,6 +34,7 @@ static void enable_logging(void)
>  {
>      ga_enable_logging(ga_state);
>  }
> +#endif
> 
>  /* Note: in some situations, like with the fsfreeze, logging may be
>   * temporarilly disabled. if it is necessary that a command be able
> @@ -323,6 +327,7 @@ static void guest_file_init(void)
>      QTAILQ_INIT(&guest_file_state.filehandles);
>  }
> 
> +#ifdef __linux__
>  typedef struct GuestFsfreezeMount {
>      char *dirname;
>      char *devtype;
> @@ -508,11 +513,29 @@ static void guest_fsfreeze_cleanup(void)
>          }
>      }
>  }
> +#else
> +GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **err)
> +{
> +    return GUEST_FSFREEZE_STATUS_ERROR;
> +}
> +
> +int64_t qmp_guest_fsfreeze_freeze(Error **err)
> +{
> +    return -1;
> +}
> +
> +int64_t qmp_guest_fsfreeze_thaw(Error **err)
> +{
> +    return 0;
> +}
> +#endif
> 
>  /* register init/cleanup routines for stateful command groups */
>  void ga_command_state_init(GAState *s, GACommandState *cs)
>  {
>      ga_state = s;
> +#ifdef __linux__
>      ga_command_state_add(cs, guest_fsfreeze_init, guest_fsfreeze_cleanup);
> +#endif
>      ga_command_state_add(cs, guest_file_init, NULL);
>  }