From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 00647C4332F for ; Sat, 10 Dec 2022 07:09:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3tz5-0000AX-OJ; Sat, 10 Dec 2022 02:09: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 1p3tz2-0000AI-Ua for qemu-devel@nongnu.org; Sat, 10 Dec 2022 02:09:16 -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 1p3tz1-0001es-3k for qemu-devel@nongnu.org; Sat, 10 Dec 2022 02:09:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670656153; 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: in-reply-to:in-reply-to:references:references; bh=QMJ8nFyO+bvHlFlX1UI5bpagTSGVl3u3KR/jyLqbJY4=; b=GGgDln5UOVcsyIJNXTBbPHzawoXdSZ+RWIA/+UYDCkAA0XinE3wJVYMqlpuk+PH/GSw0md 5bGXyXthYnk31GG8td1/mDlEl2oYvinQBx8lbld1uNNt/nB5zeOM4FB0wnthAakrpD5UCN 1pOhxkPk2skTKH4EpYvJoR1CPI0jRrA= 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-648-d8kfil5FM--B9DSi7obFyg-1; Sat, 10 Dec 2022 02:09:09 -0500 X-MC-Unique: d8kfil5FM--B9DSi7obFyg-1 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 92F258039A1; Sat, 10 Dec 2022 07:09:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31A75492B04; Sat, 10 Dec 2022 07:09:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 06CFB21E6921; Sat, 10 Dec 2022 08:09:06 +0100 (CET) From: Markus Armbruster To: Markus Armbruster Cc: qemu-devel@nongnu.org, mst@redhat.com, marcel.apfelbaum@gmail.com, ben.widawsky@intel.com, jonathan.cameron@huawei.com, philmd@linaro.org Subject: Re: [PATCH 6/5] include/hw/cxl: Break inclusion loop References: <20221209134802.3642942-1-armbru@redhat.com> <875yekehnx.fsf@pond.sub.org> Date: Sat, 10 Dec 2022 08:09:06 +0100 In-Reply-To: <875yekehnx.fsf@pond.sub.org> (Markus Armbruster's message of "Fri, 09 Dec 2022 16:11:14 +0100") Message-ID: <874ju3bur1.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Markus Armbruster writes: > hw/cxl/cxl_pci.h and hw/cxl/cxl_cdat.h include each other. Neither > header actually needs the other one. Drop both #include directives. > > Signed-off-by: Markus Armbruster > --- > include/hw/cxl/cxl_cdat.h | 1 - > include/hw/cxl/cxl_pci.h | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/include/hw/cxl/cxl_cdat.h b/include/hw/cxl/cxl_cdat.h > index 7f67638685..e3fd737f9d 100644 > --- a/include/hw/cxl/cxl_cdat.h > +++ b/include/hw/cxl/cxl_cdat.h > @@ -10,7 +10,6 @@ > #ifndef CXL_CDAT_H > #define CXL_CDAT_H > > -#include "hw/cxl/cxl_pci.h" > #include "hw/pci/pcie_doe.h" > > /* > diff --git a/include/hw/cxl/cxl_pci.h b/include/hw/cxl/cxl_pci.h > index aca14845ab..01e15ed5b4 100644 > --- a/include/hw/cxl/cxl_pci.h > +++ b/include/hw/cxl/cxl_pci.h > @@ -11,7 +11,6 @@ > #define CXL_PCI_H > > #include "qemu/compiler.h" > -#include "hw/cxl/cxl_cdat.h" > > #define CXL_VENDOR_ID 0x1e98 Friday afternoon post with insufficient testing... Everything still builds fine, but cxl_component.h is no longer self-contained. I'll squash in the appended patch and revise the commit message. diff --git a/include/hw/cxl/cxl_component.h b/include/hw/cxl/cxl_component.h index 5dca21e95b..78f83ed742 100644 --- a/include/hw/cxl/cxl_component.h +++ b/include/hw/cxl/cxl_component.h @@ -19,6 +19,7 @@ #include "qemu/range.h" #include "qemu/typedefs.h" #include "hw/cxl/cxl_cdat.h" +#include "hw/cxl/cxl_pci.h" #include "hw/register.h" #include "qapi/error.h"