From patchwork Mon Aug 5 18:44:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Shepherd X-Patchwork-Id: 264749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DDF252C007A for ; Tue, 6 Aug 2013 04:47:15 +1000 (EST) Received: from localhost ([::1]:50759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6PoF-0004FP-8x for incoming@patchwork.ozlabs.org; Mon, 05 Aug 2013 14:47:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6PmF-0001xV-IY for qemu-devel@nongnu.org; Mon, 05 Aug 2013 14:45:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6Pm9-0007Q2-Uu for qemu-devel@nongnu.org; Mon, 05 Aug 2013 14:45:07 -0400 Received: from mail6.webfaction.com ([74.55.86.74]:42606 helo=smtp.webfaction.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6Pm9-0007Pf-Qp for qemu-devel@nongnu.org; Mon, 05 Aug 2013 14:45:01 -0400 Received: from rhodium.sg.lan. (maths.r-prg.net.univ-paris7.fr [81.194.27.158]) by smtp.webfaction.com (Postfix) with ESMTP id 3C28D212A7C4; Mon, 5 Aug 2013 18:45:00 +0000 (UTC) From: Charlie Shepherd To: qemu-devel@nongnu.org Date: Mon, 5 Aug 2013 20:44:04 +0200 Message-Id: <1375728247-1306-3-git-send-email-charlie@ctshepherd.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1375728247-1306-1-git-send-email-charlie@ctshepherd.com> References: <1375728247-1306-1-git-send-email-charlie@ctshepherd.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 74.55.86.74 Cc: kwolf@redhat.com, pbonzini@redhat.com, Charlie Shepherd , gabriel@kerneis.info, stefanha@gmail.com Subject: [Qemu-devel] [PATCH 2/5] qemu_coroutine_self should not be marked coroutine_fn as it cannot yield 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: Charlie Shepherd While it only really makes sense to call qemu_coroutine_self() in a coroutine context, it cannot actually yield execution itself, so remove the coroutine_fn annotation. --- include/block/coroutine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/block/coroutine.h b/include/block/coroutine.h index 3b94b6d..563dcde 100644 --- a/include/block/coroutine.h +++ b/include/block/coroutine.h @@ -87,7 +87,7 @@ void coroutine_fn qemu_coroutine_yield(void); /** * Get the currently executing coroutine */ -Coroutine *coroutine_fn qemu_coroutine_self(void); +Coroutine *qemu_coroutine_self(void); /** * Return whether or not currently inside a coroutine