From nobody Fri Apr 26 10:03:26 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1674477602; cv=none; d=zohomail.com; s=zohoarc; b=I5i6uE1oBaTEhyM2R+rs1MouCY6SjAbPhzCdhKXbTHYp4BOGVsDVOxpRWdeCS4G7qE3GmMhy4tcPXcY3Yq2tkzgB0i9Tp0Qg7lrhjjWa4XiIkiNKO0OvTaKOMUpPVZ2cDDC5zVlfGUypLtRn8o9iA3Ro2rAvY65FxHt8j6OyUiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674477602; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=saQvP9ryYug5b+iRNc6fPkMNAfFV4yEFfKvpjzIL6/I=; b=W2eG1ivLsFBtq/fHJpGxOFqBdbe164zWlc7XqQCEcWrxx+957mC1SPtWDxS+vTTh+JPj+nZLqFbGRHiEZTx8JB50/JGCCN4qW308f0AVMhB45BrqP9gneyLX/ix68VU/Q/ujL6gO8K2DG0p+8h00gFUWRjZxVrLbJPZo3KEe8JM= 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+importer2=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 1674477602175556.868947739678; Mon, 23 Jan 2023 04:40:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJw71-0005Q0-Ph; Mon, 23 Jan 2023 07:39:47 -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 1pJw6z-0005PL-He for qemu-devel@nongnu.org; Mon, 23 Jan 2023 07:39:45 -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 1pJw6x-0008RV-89 for qemu-devel@nongnu.org; Mon, 23 Jan 2023 07:39:44 -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-103-sjIU-G3VO-GpHqjtMaNTOQ-1; Mon, 23 Jan 2023 07:39:39 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EE7BD800B30; Mon, 23 Jan 2023 12:39:38 +0000 (UTC) Received: from speedmetal.lan (ovpn-208-29.brq.redhat.com [10.40.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 242E72026D2A; Mon, 23 Jan 2023 12:39:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674477582; 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; bh=saQvP9ryYug5b+iRNc6fPkMNAfFV4yEFfKvpjzIL6/I=; b=T6PEX9StWBEDfCsDtM3UAhvDddN1XUYefEgxMtfvA9cOKbX0GMy8bYXqOP84Mg/6nFERpq ml9X7xsxHLzkgg3ZZBTJEtF4hWNcjYONZ5H29r3NP7bVgWuWHGemTpVX4Cs705RcbjrZuH IHCizwVodL1wi3EGYe9l0bwr20EFJ+s= X-MC-Unique: sjIU-G3VO-GpHqjtMaNTOQ-1 From: Peter Krempa To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, Markus Armbruster , Peter Krempa Subject: [PATCH] block/blkio: Fix inclusion of required headers Date: Mon, 23 Jan 2023 13:39:27 +0100 Message-Id: <2bc956011404a1ab03342aefde0087b5b4762562.1674477350.git.pkrempa@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pkrempa@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=unavailable 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674477603358100001 After recent header file inclusion rework the build fails when the blkio module is enabled: ../block/blkio.c: In function =E2=80=98blkio_detach_aio_context=E2=80=99: ../block/blkio.c:321:24: error: implicit declaration of function =E2=80=98b= drv_get_aio_context=E2=80=99; did you mean =E2=80=98qemu_get_aio_context=E2= =80=99? [-Werror=3Dimplicit-function-declaration] 321 | aio_set_fd_handler(bdrv_get_aio_context(bs), | ^~~~~~~~~~~~~~~~~~~~ | qemu_get_aio_context ../block/blkio.c:321:24: error: nested extern declaration of =E2=80=98bdrv_= get_aio_context=E2=80=99 [-Werror=3Dnested-externs] ../block/blkio.c:321:24: error: passing argument 1 of =E2=80=98aio_set_fd_h= andler=E2=80=99 makes pointer from integer without a cast [-Werror=3Dint-co= nversion] 321 | aio_set_fd_handler(bdrv_get_aio_context(bs), | ^~~~~~~~~~~~~~~~~~~~~~~~ | | | int In file included from /home/pipo/git/qemu.git/include/qemu/job.h:33, from /home/pipo/git/qemu.git/include/block/blockjob.h:30, from /home/pipo/git/qemu.git/include/block/block_int-globa= l-state.h:28, from /home/pipo/git/qemu.git/include/block/block_int.h:27, from ../block/blkio.c:13: /home/pipo/git/qemu.git/include/block/aio.h:476:37: note: expected =E2=80= =98AioContext *=E2=80=99 but argument is of type =E2=80=98int=E2=80=99 476 | void aio_set_fd_handler(AioContext *ctx, | ~~~~~~~~~~~~^~~ ../block/blkio.c: In function =E2=80=98blkio_file_open=E2=80=99: ../block/blkio.c:821:34: error: passing argument 2 of =E2=80=98blkio_attach= _aio_context=E2=80=99 makes pointer from integer without a cast [-Werror=3D= int-conversion] 821 | blkio_attach_aio_context(bs, bdrv_get_aio_context(bs)); | ^~~~~~~~~~~~~~~~~~~~~~~~ | | | int Fix it by including 'block/block-io.h' which contains the required declarations. Fixes: e2c1c34f139f49ef909bb4322607fb8b39002312 Signed-off-by: Peter Krempa Reviewed-by: Markus Armbruster --- block/blkio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/blkio.c b/block/blkio.c index 5eae3adfaf..6ad86b23d1 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -19,6 +19,8 @@ #include "qemu/module.h" #include "exec/memory.h" /* for ram_block_discard_disable() */ +#include "block/block-io.h" + /* * Keep the QEMU BlockDriver names identical to the libblkio driver names. * Using macros instead of typing out the string literals avoids typos. --=20 2.38.1