On Tue, 17 Apr 2012 12:07:38 -0500
Michael Roth <mdr...@linux.vnet.ibm.com> wrote:
> When linux-specific commands (including guest-fsfreeze-*) were consolidated
> under defined(__linux__), we forgot to account for the case where
> defined(__linux__) && !defined(FIFREEZE). As a result stubs are no longer
> being generated on linux hosts that don't have FIFREEZE support. Fix
> this.
>
> Tested-by: Andreas Färber <afaer...@suse.de>
> Signed-off-by: Michael Roth <mdr...@linux.vnet.ibm.com>
Reviewed-by: Luiz Capitulino <lcapitul...@redhat.com>
> ---
> qga/commands-posix.c | 36 ++++++++++++++++++++----------------
> 1 files changed, 20 insertions(+), 16 deletions(-)
>
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index faf970d..087c3af 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -881,46 +881,50 @@ error:
>
> #else /* defined(__linux__) */
>
> -GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **err)
> +void qmp_guest_suspend_disk(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> -
> - return 0;
> }
>
> -int64_t qmp_guest_fsfreeze_freeze(Error **err)
> +void qmp_guest_suspend_ram(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> -
> - return 0;
> }
>
> -int64_t qmp_guest_fsfreeze_thaw(Error **err)
> +void qmp_guest_suspend_hybrid(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> -
> - return 0;
> }
>
> -void qmp_guest_suspend_disk(Error **err)
> +GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
> {
> - error_set(err, QERR_UNSUPPORTED);
> + error_set(errp, QERR_UNSUPPORTED);
> + return NULL;
> }
>
> -void qmp_guest_suspend_ram(Error **err)
> +#endif
> +
> +#if !defined(CONFIG_FSFREEZE)
> +
> +GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> +
> + return 0;
> }
>
> -void qmp_guest_suspend_hybrid(Error **err)
> +int64_t qmp_guest_fsfreeze_freeze(Error **err)
> {
> error_set(err, QERR_UNSUPPORTED);
> +
> + return 0;
> }
>
> -GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp)
> +int64_t qmp_guest_fsfreeze_thaw(Error **err)
> {
> - error_set(errp, QERR_UNSUPPORTED);
> - return NULL;
> + error_set(err, QERR_UNSUPPORTED);
> +
> + return 0;
> }
>
> #endif
