From nobody Sat May 18 04:46:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1670509518; cv=none; d=zohomail.com; s=zohoarc; b=OSTHLya9OYt4UAJwJxTFLnqDc9FkyA5huzV/ZAGUFkzfdFF30n9IWnRK9GtgZRdGHyiiH1HQzt1VneyZYSGUKxxjyx3BG62vTqxM+MVYbsO/PNXqdNR/vykLbDIkOOmO5kGpwvq5lfKZuj1fh4wLOSc1zt7eyCR+6gTnXvHhToI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670509518; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Gtaq/Q3/tHk1EJrECIph1qD6YjuqIwl+a5wAYVl4zT4=; b=mUkgi2Nge+OtcbGWgNfXchI+kCTc3DI34qqmHItl50iOgoeQik2z+esa9IWiVosMKUYlCFMIYTvcPP4ATOod3LILT0g052WAiDrHtgUjtjXZ6IQpenmFPCjeCRYnp7n87raI0zqI/njifHZ4lpoGDNYWBmeU1c9WmQJsuYqfvRE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1670509518769384.7467468896805; Thu, 8 Dec 2022 06:25:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3HoE-0003iu-DN; Thu, 08 Dec 2022 09:23:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Hnw-0003c7-3e for qemu-devel@nongnu.org; Thu, 08 Dec 2022 09:23:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Hns-0000e7-Ug for qemu-devel@nongnu.org; Thu, 08 Dec 2022 09:23:15 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-433-WozRLfdQNTyjAfJtiwtSJQ-1; Thu, 08 Dec 2022 09:23:09 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9E12729324BD for ; Thu, 8 Dec 2022 14:23:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54A241121331; Thu, 8 Dec 2022 14:23:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 42B7E21E6930; Thu, 8 Dec 2022 15:23:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670509391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gtaq/Q3/tHk1EJrECIph1qD6YjuqIwl+a5wAYVl4zT4=; b=YM3Q0FEHCMFpZ9+err3ELIBcEg+N7elD5bxhC+3U2Dv1acqtRWvyQT/0CtVtsV5xgtlt94 2JkJ4SALHxHMcUGOZfszWxeev0gj5oG/aw85mRAeP9TDQWD5grBTWau/WFvRoLbvtOVDTh VFgL16usrjbpl+Qa2Tpnd7w9Q5HQpnw= X-MC-Unique: WozRLfdQNTyjAfJtiwtSJQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, kwolf@redhat.com Subject: [PATCH 1/4] coroutine: Clean up superfluous inclusion of qemu/coroutine.h Date: Thu, 8 Dec 2022 15:23:03 +0100 Message-Id: <20221208142306.2642640-2-armbru@redhat.com> In-Reply-To: <20221208142306.2642640-1-armbru@redhat.com> References: <20221208142306.2642640-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1670509520778100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Stefan Hajnoczi --- crypto/block-luks-priv.h | 1 - include/block/raw-aio.h | 1 - include/scsi/pr-manager.h | 1 - nbd/nbd-internal.h | 1 - blockjob.c | 1 - crypto/block-luks.c | 1 - hw/9pfs/codir.c | 1 - hw/9pfs/cofile.c | 1 - hw/9pfs/cofs.c | 1 - hw/9pfs/coxattr.c | 1 - tests/unit/test-coroutine.c | 1 - tests/unit/test-vmstate.c | 1 - util/qemu-coroutine-lock.c | 1 - util/qemu-coroutine-sleep.c | 1 - util/qemu-coroutine.c | 1 - 15 files changed, 15 deletions(-) diff --git a/crypto/block-luks-priv.h b/crypto/block-luks-priv.h index 90a20d432b..dc2dd14e52 100644 --- a/crypto/block-luks-priv.h +++ b/crypto/block-luks-priv.h @@ -31,7 +31,6 @@ #include "crypto/random.h" #include "qemu/uuid.h" =20 -#include "qemu/coroutine.h" #include "qemu/bitmap.h" =20 /* diff --git a/include/block/raw-aio.h b/include/block/raw-aio.h index 21fc10c4c9..f8cda9df91 100644 --- a/include/block/raw-aio.h +++ b/include/block/raw-aio.h @@ -17,7 +17,6 @@ #define QEMU_RAW_AIO_H =20 #include "block/aio.h" -#include "qemu/coroutine.h" #include "qemu/iov.h" =20 /* AIO request types */ diff --git a/include/scsi/pr-manager.h b/include/scsi/pr-manager.h index e4ecbe00f6..45de28d354 100644 --- a/include/scsi/pr-manager.h +++ b/include/scsi/pr-manager.h @@ -5,7 +5,6 @@ #include "qapi/visitor.h" #include "qom/object_interfaces.h" #include "block/aio.h" -#include "qemu/coroutine.h" =20 #define TYPE_PR_MANAGER "pr-manager" =20 diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index 1b2141ab4b..df42fef706 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -13,7 +13,6 @@ #include "sysemu/block-backend.h" #include "io/channel-tls.h" =20 -#include "qemu/coroutine.h" #include "qemu/iov.h" =20 #ifndef _WIN32 diff --git a/blockjob.c b/blockjob.c index f51d4e18f3..c3d3e14a92 100644 --- a/blockjob.c +++ b/blockjob.c @@ -32,7 +32,6 @@ #include "qapi/error.h" #include "qapi/qapi-events-block-core.h" #include "qapi/qmp/qerror.h" -#include "qemu/coroutine.h" #include "qemu/main-loop.h" #include "qemu/timer.h" =20 diff --git a/crypto/block-luks.c b/crypto/block-luks.c index df2b4105d6..2ee679a2fa 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -32,7 +32,6 @@ #include "crypto/random.h" #include "qemu/uuid.h" =20 -#include "qemu/coroutine.h" #include "qemu/bitmap.h" =20 /* diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c index 93ba44fb75..7ba63be489 100644 --- a/hw/9pfs/codir.c +++ b/hw/9pfs/codir.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" -#include "qemu/coroutine.h" #include "qemu/main-loop.h" #include "coth.h" #include "9p-xattr.h" diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c index 20f93a90e7..9c5344039e 100644 --- a/hw/9pfs/cofile.c +++ b/hw/9pfs/cofile.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" -#include "qemu/coroutine.h" #include "qemu/main-loop.h" #include "coth.h" =20 diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c index 9d0adc2e78..67e3ae5c5c 100644 --- a/hw/9pfs/cofs.c +++ b/hw/9pfs/cofs.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" -#include "qemu/coroutine.h" #include "qemu/main-loop.h" #include "coth.h" =20 diff --git a/hw/9pfs/coxattr.c b/hw/9pfs/coxattr.c index dbcd09e0fd..cd0f8488ac 100644 --- a/hw/9pfs/coxattr.c +++ b/hw/9pfs/coxattr.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" -#include "qemu/coroutine.h" #include "qemu/main-loop.h" #include "coth.h" =20 diff --git a/tests/unit/test-coroutine.c b/tests/unit/test-coroutine.c index e16b80c245..513800d3db 100644 --- a/tests/unit/test-coroutine.c +++ b/tests/unit/test-coroutine.c @@ -12,7 +12,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/coroutine.h" #include "qemu/coroutine_int.h" #include "qemu/lockable.h" =20 diff --git a/tests/unit/test-vmstate.c b/tests/unit/test-vmstate.c index 541bb4f63e..79357b29ca 100644 --- a/tests/unit/test-vmstate.c +++ b/tests/unit/test-vmstate.c @@ -29,7 +29,6 @@ #include "migration/qemu-file-types.h" #include "../migration/qemu-file.h" #include "../migration/savevm.h" -#include "qemu/coroutine.h" #include "qemu/module.h" #include "io/channel-file.h" =20 diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c index 45c6b57374..58f3f77181 100644 --- a/util/qemu-coroutine-lock.c +++ b/util/qemu-coroutine-lock.c @@ -27,7 +27,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/coroutine.h" #include "qemu/coroutine_int.h" #include "qemu/processor.h" #include "qemu/queue.h" diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c index 571ab521ff..af59f9af98 100644 --- a/util/qemu-coroutine-sleep.c +++ b/util/qemu-coroutine-sleep.c @@ -12,7 +12,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/coroutine.h" #include "qemu/coroutine_int.h" #include "qemu/timer.h" #include "block/aio.h" diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c index 356b746f0b..8494523692 100644 --- a/util/qemu-coroutine.c +++ b/util/qemu-coroutine.c @@ -16,7 +16,6 @@ #include "trace.h" #include "qemu/thread.h" #include "qemu/atomic.h" -#include "qemu/coroutine.h" #include "qemu/coroutine_int.h" #include "qemu/coroutine-tls.h" #include "block/aio.h" --=20 2.37.3 From nobody Sat May 18 04:46:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1670509471; cv=none; d=zohomail.com; s=zohoarc; b=dPJRiMnYq5VERyaAgenzOLFggu17t6v164ck/hxZSH0ga/0r7JzPyyHZFmNjoDC3Wi3akfG4PpdCbHIunnNZCFlQWgWGakLZKAKpuT1oBpCiaDTyUW5BIJbAodAnl9KFI3Mm30zlnzGU8OtBus+xtPIm2oQjAaoZDi18pQ6jFyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670509471; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=11mJbKf5IfuVCVdGNxPkc+W9o1A2eLBy/HgkZ+OUY/A=; b=G67f2I0ef40P0bdT9Vydn1Zh3svZQOqy75n0rRfb45d+xLVUldMmY9unuE85vJOKRQYFseEigaOI6BHhF2FXi4gumFmAhXxNcmRH6SsrVW6UJ2+yy7jWohTiHfHCNYspVHMsgINL/pyep9Vq2+XbOsXwLQbSsrp6LXUseRJ58+s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1670509471950223.40215178041638; Thu, 8 Dec 2022 06:24:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Ho2-0003eJ-3K; Thu, 08 Dec 2022 09:23:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Hnw-0003c5-33 for qemu-devel@nongnu.org; Thu, 08 Dec 2022 09:23:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Hns-0000dq-I3 for qemu-devel@nongnu.org; Thu, 08 Dec 2022 09:23:15 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-488-bLHLN1MtOnGxjpsew2Z20w-1; Thu, 08 Dec 2022 09:23:09 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 87A438032E3 for ; Thu, 8 Dec 2022 14:23:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5564A17582; Thu, 8 Dec 2022 14:23:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4537621E6936; Thu, 8 Dec 2022 15:23:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670509391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=11mJbKf5IfuVCVdGNxPkc+W9o1A2eLBy/HgkZ+OUY/A=; b=P4ty0V856GqAV+UchbQ8aaoqzjU+NW/d3eG8BvxZeJMHh7nOFbdyspdOQ7+MnGXyNXQ9xB z86o15ILkhhq0WeTWArS6X6bJFfrc4oOVsbYjB3YozmWUD2BJDSNfutf5ynWl028xAo+se oyEaMes7EjkHSRNHKej+rKIlgu/jbB8= X-MC-Unique: bLHLN1MtOnGxjpsew2Z20w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, kwolf@redhat.com Subject: [PATCH 2/4] coroutine: Move coroutine_fn to qemu/osdep.h, trim includes Date: Thu, 8 Dec 2022 15:23:04 +0100 Message-Id: <20221208142306.2642640-3-armbru@redhat.com> In-Reply-To: <20221208142306.2642640-1-armbru@redhat.com> References: <20221208142306.2642640-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1670509472469100001 Content-Type: text/plain; charset="utf-8" block/block-hmp-cmds.h and qemu/co-shared-resource.h use coroutine_fn without including qemu/coroutine.h. They compile only if it's already included from elsewhere. I could fix that, but pulling in qemu/coroutine.h and everything it includes just for a macro that expands into nothing feels silly. Instead, move the macro to qemu/osdep.h. Inclusions of qemu/coroutine.h just for coroutine_fn become superfluous. Drop them. Signed-off-by: Markus Armbruster Reviewed-by: Stefan Hajnoczi --- include/block/aio_task.h | 2 -- include/block/block-common.h | 1 - include/monitor/hmp.h | 1 - include/qemu/coroutine.h | 18 +++++++----------- include/qemu/osdep.h | 16 ++++++++++++++++ 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/include/block/aio_task.h b/include/block/aio_task.h index 50bc1e1817..18a9c41f4e 100644 --- a/include/block/aio_task.h +++ b/include/block/aio_task.h @@ -25,8 +25,6 @@ #ifndef BLOCK_AIO_TASK_H #define BLOCK_AIO_TASK_H =20 -#include "qemu/coroutine.h" - typedef struct AioTaskPool AioTaskPool; typedef struct AioTask AioTask; typedef int coroutine_fn (*AioTaskFunc)(AioTask *task); diff --git a/include/block/block-common.h b/include/block/block-common.h index 297704c1e9..0f6b8422bd 100644 --- a/include/block/block-common.h +++ b/include/block/block-common.h @@ -27,7 +27,6 @@ #include "block/aio.h" #include "block/aio-wait.h" #include "qemu/iov.h" -#include "qemu/coroutine.h" #include "block/accounting.h" #include "block/dirty-bitmap.h" #include "block/blockjob.h" diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index dfbc0c9a2f..c92f69da8b 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -15,7 +15,6 @@ #define HMP_H =20 #include "qemu/readline.h" -#include "qemu/coroutine.h" #include "qapi/qapi-types-common.h" =20 bool hmp_handle_error(Monitor *mon, Error *err); diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h index 89650a2d7f..2496a4f4ef 100644 --- a/include/qemu/coroutine.h +++ b/include/qemu/coroutine.h @@ -26,23 +26,19 @@ * waiting for events to complete. * * These functions are re-entrant and may be used outside the global mutex. - */ - -/** - * Mark a function that executes in coroutine context * - * Functions that execute in coroutine context cannot be called directly f= rom - * normal functions. In the future it would be nice to enable compiler or - * static checker support for catching such errors. This annotation might= make - * it possible and in the meantime it serves as documentation. - * - * For example: + * Functions that execute in coroutine context cannot be called + * directly from normal functions. Use @coroutine_fn to mark such + * functions. For example: * * static void coroutine_fn foo(void) { * .... * } + * + * In the future it would be nice to have the compiler or a static + * checker catch misuse of such functions. This annotation might make + * it possible and in the meantime it serves as documentation. */ -#define coroutine_fn =20 typedef struct Coroutine Coroutine; =20 diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index b9c4307779..8e97e5d79a 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -157,6 +157,22 @@ extern "C" { =20 #include "qemu/typedefs.h" =20 +/** + * Mark a function that executes in coroutine context + * + * Functions that execute in coroutine context cannot be called directly f= rom + * normal functions. In the future it would be nice to enable compiler or + * static checker support for catching such errors. This annotation might= make + * it possible and in the meantime it serves as documentation. + * + * For example: + * + * static void coroutine_fn foo(void) { + * .... + * } + */ +#define coroutine_fn + /* * For mingw, as of v6.0.0, the function implementing the assert macro is * not marked as noreturn, so the compiler cannot delete code following an --=20 2.37.3 From nobody Sat May 18 04:46:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1670509432; cv=none; d=zohomail.com; s=zohoarc; b=SdEMQf0pHtRfhxsqF9nIpsIjzwe7RJG2VxGOdcvdO2JH2wSwZ/JOrfbLKsXjA+ciqTVTe6s1LElBJn9T9AhKr2FpWQSi6g4CzgOn7jTC/tTKRpuOIQWTnlJ5d118QLYGxrHfbIxLU1lEHCZMos5q1TQhbchTU22O7J9LQe5wgQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670509432; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=b9V4aGV7kbNn55y/PL//dCfI37apzIXh65RAvofpdNc=; b=CzHHE4zcsfD5A6Jg7XyRiEDQzh0t5eDJnn2og8ksybtT7hRlUxge0k73ClwGqoUAiNSrbpkuJOIwChhrXtdQ/l7JeDEuLcowtMYjK7rF1pKEobb1Z2b3D9d15gVxuKl4hopP/ESaImBKxNunZgZ/Ujbi+oL6qZ4Skmq9Ce8VEBQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1670509432413837.4975529680015; Thu, 8 Dec 2022 06:23:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Hnz-0003ct-2L; Thu, 08 Dec 2022 09:23:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Hnu-0003b3-4N for qemu-devel@nongnu.org; Thu, 08 Dec 2022 09:23:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Hns-0000dr-I6 for qemu-devel@nongnu.org; Thu, 08 Dec 2022 09:23:13 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-444-GY37zHHNM7-jNckubJB3VQ-1; Thu, 08 Dec 2022 09:23:09 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 80D7085A588 for ; Thu, 8 Dec 2022 14:23:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 553691121333; Thu, 8 Dec 2022 14:23:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4795C21E688F; Thu, 8 Dec 2022 15:23:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670509391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b9V4aGV7kbNn55y/PL//dCfI37apzIXh65RAvofpdNc=; b=MVMHADjhd+16XfcfyRiXAKYUD2OOIV3EUC2KGpvNycyghR8eAjlSPLFy/TvjqM2IXhbNMc MK6mzhrFBiv/kyGnJbZ5lTx81d5T7T1ntKfnOa1BnRBwVGs8SiJOrUDBCCzN0uVk8Vk9LK fVE2t8GSKDFQ0+H/cI+d0D8D/kTq7wI= X-MC-Unique: GY37zHHNM7-jNckubJB3VQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, kwolf@redhat.com Subject: [PATCH 3/4] coroutine: Clean up superfluous inclusion of qemu/lockable.h Date: Thu, 8 Dec 2022 15:23:05 +0100 Message-Id: <20221208142306.2642640-4-armbru@redhat.com> In-Reply-To: <20221208142306.2642640-1-armbru@redhat.com> References: <20221208142306.2642640-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1670509434425100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Stefan Hajnoczi --- include/qemu/progress_meter.h | 2 +- block/progress_meter.c | 2 ++ tests/unit/test-coroutine.c | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/qemu/progress_meter.h b/include/qemu/progress_meter.h index dadf822bbf..0f2c0a32d2 100644 --- a/include/qemu/progress_meter.h +++ b/include/qemu/progress_meter.h @@ -27,7 +27,7 @@ #ifndef QEMU_PROGRESS_METER_H #define QEMU_PROGRESS_METER_H =20 -#include "qemu/lockable.h" +#include "qemu/thread.h" =20 typedef struct ProgressMeter { /** diff --git a/block/progress_meter.c b/block/progress_meter.c index aa2e60248c..31a170a2cd 100644 --- a/block/progress_meter.c +++ b/block/progress_meter.c @@ -23,7 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include "qemu/coroutine.h" #include "qemu/progress_meter.h" =20 void progress_init(ProgressMeter *pm) diff --git a/tests/unit/test-coroutine.c b/tests/unit/test-coroutine.c index 513800d3db..b0d21d673a 100644 --- a/tests/unit/test-coroutine.c +++ b/tests/unit/test-coroutine.c @@ -13,7 +13,6 @@ =20 #include "qemu/osdep.h" #include "qemu/coroutine_int.h" -#include "qemu/lockable.h" =20 /* * Check that qemu_in_coroutine() works --=20 2.37.3 From nobody Sat May 18 04:46:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1670509494; cv=none; d=zohomail.com; s=zohoarc; b=jMNiwZO6Y5liNyYqR26LpkLU83grsn7RMm2ZzKCUCjOHJgk1x5aDGiVzoMd3KB98x7mcd9l3Fv60n0vcTgH9cYYlRnDTW6FDT5x2kRdICim0ZV3lJO/QqzLwj0aMvmXZzw5dOQFRmTxFEz2g4nXwRpbLkEwEQwcjehqIbAI/j6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670509494; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GJ0zivdehtiQHg/ydxt4oRt66UPbthkD1hdhBDqfinI=; b=MJZ1DZvWY6mN1rXqWrH/jRDwtyh16fIV6R0SNKWxvbc5w3rd8BN17M1LCG/lm1+VrVqsErEsZnBZ2yN/btWCk7LnIpSr1z6AQJrdWqN+kX4Y1DJxHTzTz1rmP93Pl8I2PNF85YjvY2X9JXdjgnUT3o7X4PrRBEv+3jThuJLybnY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1670509494300681.1546261489195; Thu, 8 Dec 2022 06:24:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3HoI-0003jr-9D; Thu, 08 Dec 2022 09:23:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Hny-0003cu-Pg for qemu-devel@nongnu.org; Thu, 08 Dec 2022 09:23:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Hnw-0000fL-ON for qemu-devel@nongnu.org; Thu, 08 Dec 2022 09:23:18 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-13-iVK0dh3MOw-uhX-Jw2dhlw-1; Thu, 08 Dec 2022 09:23:14 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D8D89805AC5 for ; Thu, 8 Dec 2022 14:23:13 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54D77492B04; Thu, 8 Dec 2022 14:23:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4A0C821E66CB; Thu, 8 Dec 2022 15:23:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670509395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GJ0zivdehtiQHg/ydxt4oRt66UPbthkD1hdhBDqfinI=; b=ZMhtUhIEWHpYv5ufau2YuSlAbqu+4EtsRLiTqpzuNdbgH28iOOFG6nTx1UI5JlbZV1uAOH c9yPxi8hy1pZYQXL3pP4LGCfkkcV+R/k8PkvwU3+MsrKUCW7oiVdMLDjmv9CxtR0/sP+PT ImEjIIcANwp2UWev55ict5VUU8nV7KY= X-MC-Unique: iVK0dh3MOw-uhX-Jw2dhlw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, kwolf@redhat.com Subject: [PATCH 4/4] coroutine: Break inclusion loop Date: Thu, 8 Dec 2022 15:23:06 +0100 Message-Id: <20221208142306.2642640-5-armbru@redhat.com> In-Reply-To: <20221208142306.2642640-1-armbru@redhat.com> References: <20221208142306.2642640-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1670509494588100001 Content-Type: text/plain; charset="utf-8" qemu/coroutine.h and qemu/lockable.h include each other. Neither header actually needs the other one. Drop #include "qemu/coroutine.h" from qemu/lockable.h to break the loop. All users of lockable.h actually need qemu/coroutine.h, so adjust their #include directives. I'm not dropping the #include "qemu/lockable" from qemu/coroutine.h, because that would require adding it back next to #include "qemu/coroutine.h" all over the place. It's in an unusual place, though. Move it to the usual place, next to the other #include directives. Signed-off-by: Markus Armbruster Reviewed-by: Stefan Hajnoczi --- include/qemu/coroutine.h | 3 +-- include/qemu/lockable.h | 1 - include/qemu/ratelimit.h | 2 +- include/qemu/seqlock.h | 2 +- linux-user/fd-trans.h | 2 +- backends/tpm/tpm_emulator.c | 2 +- cpus-common.c | 2 +- hw/hyperv/hyperv.c | 2 +- hw/usb/ccid-card-emulated.c | 2 +- hw/vfio/platform.c | 2 +- plugins/core.c | 2 +- plugins/loader.c | 2 +- ui/spice-display.c | 2 +- util/log.c | 2 +- util/qemu-timer.c | 2 +- util/rcu.c | 2 +- util/vfio-helpers.c | 2 +- util/yank.c | 2 +- 18 files changed, 17 insertions(+), 19 deletions(-) diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h index 2496a4f4ef..2504d4757f 100644 --- a/include/qemu/coroutine.h +++ b/include/qemu/coroutine.h @@ -15,6 +15,7 @@ #ifndef QEMU_COROUTINE_H #define QEMU_COROUTINE_H =20 +#include "qemu/lockable.h" #include "qemu/queue.h" #include "qemu/timer.h" =20 @@ -376,8 +377,6 @@ void qemu_coroutine_inc_pool_size(unsigned int addition= al_pool_size); */ void qemu_coroutine_dec_pool_size(unsigned int additional_pool_size); =20 -#include "qemu/lockable.h" - /** * Sends a (part of) iovec down a socket, yielding when the socket is full= , or * Receives data into a (part of) iovec from a socket, diff --git a/include/qemu/lockable.h b/include/qemu/lockable.h index 86db7cb04c..7d6cdeb750 100644 --- a/include/qemu/lockable.h +++ b/include/qemu/lockable.h @@ -13,7 +13,6 @@ #ifndef QEMU_LOCKABLE_H #define QEMU_LOCKABLE_H =20 -#include "qemu/coroutine.h" #include "qemu/thread.h" =20 typedef void QemuLockUnlockFunc(void *); diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h index 48bf59e857..4e07e1e2a4 100644 --- a/include/qemu/ratelimit.h +++ b/include/qemu/ratelimit.h @@ -14,7 +14,7 @@ #ifndef QEMU_RATELIMIT_H #define QEMU_RATELIMIT_H =20 -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "qemu/timer.h" =20 typedef struct { diff --git a/include/qemu/seqlock.h b/include/qemu/seqlock.h index ecb7d2c864..79a0af625b 100644 --- a/include/qemu/seqlock.h +++ b/include/qemu/seqlock.h @@ -16,7 +16,7 @@ =20 #include "qemu/atomic.h" #include "qemu/thread.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" =20 typedef struct QemuSeqLock QemuSeqLock; =20 diff --git a/linux-user/fd-trans.h b/linux-user/fd-trans.h index 1b9fa2041c..e662d644bc 100644 --- a/linux-user/fd-trans.h +++ b/linux-user/fd-trans.h @@ -16,7 +16,7 @@ #ifndef FD_TRANS_H #define FD_TRANS_H =20 -#include "qemu/lockable.h" +#include "qemu/coroutine.h" =20 typedef abi_long (*TargetFdDataFunc)(void *, size_t); typedef abi_long (*TargetFdAddrFunc)(void *, abi_ulong, socklen_t); diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index 49cc3d749d..f364b089ad 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -30,7 +30,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/sockets.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "io/channel-socket.h" #include "sysemu/runstate.h" #include "sysemu/tpm_backend.h" diff --git a/cpus-common.c b/cpus-common.c index 793364dc0e..1b1f8f75c9 100644 --- a/cpus-common.c +++ b/cpus-common.c @@ -22,7 +22,7 @@ #include "exec/cpu-common.h" #include "hw/core/cpu.h" #include "sysemu/cpus.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" =20 static QemuMutex qemu_cpu_list_lock; static QemuCond exclusive_cond; diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c index 57b402b956..41f3e9f1ca 100644 --- a/hw/hyperv/hyperv.c +++ b/hw/hyperv/hyperv.c @@ -15,7 +15,7 @@ #include "sysemu/kvm.h" #include "qemu/bitops.h" #include "qemu/error-report.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "qemu/queue.h" #include "qemu/rcu.h" #include "qemu/rcu_queue.h" diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index ee41a81801..6962143c29 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -30,7 +30,7 @@ #include =20 #include "qemu/thread.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "qemu/main-loop.h" #include "qemu/module.h" #include "ccid.h" diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 5af73f9287..e252edc04a 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -22,7 +22,7 @@ #include "hw/vfio/vfio-platform.h" #include "migration/vmstate.h" #include "qemu/error-report.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/range.h" diff --git a/plugins/core.c b/plugins/core.c index ccb770a485..313a631ecf 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -15,7 +15,7 @@ #include "qemu/error-report.h" #include "qemu/config-file.h" #include "qapi/error.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "qemu/option.h" #include "qemu/rcu_queue.h" #include "qemu/xxhash.h" diff --git a/plugins/loader.c b/plugins/loader.c index 88c30bde2d..0e0a19730e 100644 --- a/plugins/loader.c +++ b/plugins/loader.c @@ -19,7 +19,7 @@ #include "qemu/error-report.h" #include "qemu/config-file.h" #include "qapi/error.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "qemu/option.h" #include "qemu/rcu_queue.h" #include "qemu/qht.h" diff --git a/ui/spice-display.c b/ui/spice-display.c index 494168e7fe..8e2245309e 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "ui/qemu-spice.h" #include "qemu/timer.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "qemu/main-loop.h" #include "qemu/option.h" #include "qemu/queue.h" diff --git a/util/log.c b/util/log.c index c2198badf2..157c25f0b5 100644 --- a/util/log.c +++ b/util/log.c @@ -25,7 +25,7 @@ #include "qemu/cutils.h" #include "trace/control.h" #include "qemu/thread.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "qemu/rcu.h" #ifdef CONFIG_LINUX #include diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 6a0de33dd2..6d5d21cb92 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "qemu/timer.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "sysemu/cpu-timers.h" #include "sysemu/replay.h" #include "sysemu/cpus.h" diff --git a/util/rcu.c b/util/rcu.c index b6d6c71cff..013700bb5c 100644 --- a/util/rcu.c +++ b/util/rcu.c @@ -31,7 +31,7 @@ #include "qemu/atomic.h" #include "qemu/thread.h" #include "qemu/main-loop.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #if defined(CONFIG_MALLOC_TRIM) #include #endif diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 0d1520caac..8584db8416 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -22,7 +22,7 @@ #include "standard-headers/linux/pci_regs.h" #include "qemu/event_notifier.h" #include "qemu/vfio-helpers.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "trace.h" =20 #define QEMU_VFIO_DEBUG 0 diff --git a/util/yank.c b/util/yank.c index abf47c346d..1fd3e550c1 100644 --- a/util/yank.c +++ b/util/yank.c @@ -11,7 +11,7 @@ #include "qapi/error.h" #include "qemu/thread.h" #include "qemu/queue.h" -#include "qemu/lockable.h" +#include "qemu/coroutine.h" #include "qapi/qapi-commands-yank.h" #include "qapi/qapi-visit-yank.h" #include "qapi/clone-visitor.h" --=20 2.37.3