diff options
| author | Markus Armbruster <armbru@redhat.com> | 2022-12-22 11:03:24 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2023-01-08 01:54:22 -0500 |
| commit | 674b0a5784a5c0fc5d954b9f42fc1eb1a9648bf0 (patch) | |
| tree | ad8fac09c39f38e9f4a57c5bc664a548357379c9 /include/hw/cxl | |
| parent | 9d94c21363537903a594a3f44d2cf7fa7d4b2ea7 (diff) | |
| download | qemu-674b0a5784a5c0fc5d954b9f42fc1eb1a9648bf0.zip qemu-674b0a5784a5c0fc5d954b9f42fc1eb1a9648bf0.tar.gz qemu-674b0a5784a5c0fc5d954b9f42fc1eb1a9648bf0.tar.bz2 | |
include/hw/pci: Break inclusion loop pci_bridge.h and cxl.h
hw/pci/pci_bridge.h and hw/cxl/cxl.h include each other.
Fortunately, breaking the loop is merely a matter of deleting
unnecessary includes from headers, and adding them back in places
where they are now missing.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221222100330.380143-2-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'include/hw/cxl')
| -rw-r--r-- | include/hw/cxl/cxl.h | 1 | ||||
| -rw-r--r-- | include/hw/cxl/cxl_cdat.h | 1 | ||||
| -rw-r--r-- | include/hw/cxl/cxl_device.h | 1 | ||||
| -rw-r--r-- | include/hw/cxl/cxl_pci.h | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/include/hw/cxl/cxl.h b/include/hw/cxl/cxl.h index 38e0e27..5129557 100644 --- a/include/hw/cxl/cxl.h +++ b/include/hw/cxl/cxl.h @@ -13,7 +13,6 @@ #include "qapi/qapi-types-machine.h" #include "qapi/qapi-visit-machine.h" -#include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" #include "cxl_pci.h" #include "cxl_component.h" diff --git a/include/hw/cxl/cxl_cdat.h b/include/hw/cxl/cxl_cdat.h index e9eda00..7f67638 100644 --- a/include/hw/cxl/cxl_cdat.h +++ b/include/hw/cxl/cxl_cdat.h @@ -11,6 +11,7 @@ #define CXL_CDAT_H #include "hw/cxl/cxl_pci.h" +#include "hw/pci/pcie_doe.h" /* * Reference: diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index 449b0ed..fd475b9 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -10,6 +10,7 @@ #ifndef CXL_DEVICE_H #define CXL_DEVICE_H +#include "hw/pci/pci.h" #include "hw/register.h" /* diff --git a/include/hw/cxl/cxl_pci.h b/include/hw/cxl/cxl_pci.h index 3cb79ec..aca1484 100644 --- a/include/hw/cxl/cxl_pci.h +++ b/include/hw/cxl/cxl_pci.h @@ -11,8 +11,6 @@ #define CXL_PCI_H #include "qemu/compiler.h" -#include "hw/pci/pci.h" -#include "hw/pci/pcie.h" #include "hw/cxl/cxl_cdat.h" #define CXL_VENDOR_ID 0x1e98 |