From patchwork Thu Apr 19 16:05:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 153830 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 E566EB6FF8 for ; Fri, 20 Apr 2012 02:06:38 +1000 (EST) Received: from localhost ([::1]:45443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKtsS-0004SJ-Nn for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2012 12:06:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKtrk-0002zC-5M for qemu-devel@nongnu.org; Thu, 19 Apr 2012 12:05:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKtrY-0007du-2q for qemu-devel@nongnu.org; Thu, 19 Apr 2012 12:05:51 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:48085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKtrX-0007dB-DQ for qemu-devel@nongnu.org; Thu, 19 Apr 2012 12:05:39 -0400 Received: by obbwd18 with SMTP id wd18so6189511obb.4 for ; Thu, 19 Apr 2012 09:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=dA5aAoWqCvEjTLpbZTaTfLmk0/iy7Ig5Lh39qBVHKpY=; b=JBFkHyeaTUbH58U/HWJXOJIo/68pGV3XqYqHIf7mdFaw/4ewx6ww90a0U981sDngIm 8r8cNIQ1N+MZjhxK43wMI6jswZWRRm03LMM9hovPWqdo9Su4up+0VbDmrHKpqw6BCYO4 aR69P4ElVFea4RKSMiizaUOUz87wGFTQ9lRdXeGQfa1qbLAtWza7zSsIcjhPm2IClwjq wZUPpg2LIREScVzwtJjIrUust3K/tWeTLhYUcDUzXTpgmq/TC0qMO/VtBHeP/Os6yphB DZpDxVPPRR5tYEeK9GB8C0SvyeOrDT1Lv83xuyvZ3thc6NhtRc/acNSvHrZzDoV1JKND h9MQ== Received: by 10.182.141.10 with SMTP id rk10mr3731601obb.48.1334851537094; Thu, 19 Apr 2012 09:05:37 -0700 (PDT) Received: from localhost.localdomain ([32.97.110.59]) by mx.google.com with ESMTPS id n9sm2571884oen.2.2012.04.19.09.05.35 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 09:05:36 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 19 Apr 2012 11:05:12 -0500 Message-Id: <1334851513-11988-2-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1334851513-11988-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1334851513-11988-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 Cc: aliguori@us.ibm.com, rth@twiddle.net, agraf@suse.de, afaerber@suse.de, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 1/2] qemu-ga: generate missing stubs for fsfreeze 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 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 Reviewed-by: Luiz Capitulino Signed-off-by: Michael Roth --- 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