aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2022-12-22 11:03:25 +0100
committerMichael S. Tsirkin <mst@redhat.com>2023-01-08 01:54:22 -0500
commit65c326ce51939fa9d109c6fb9ad4d89b98eb4359 (patch)
tree5a1f8cef77644411621d20f532b9d62fd960ddcc
parent674b0a5784a5c0fc5d954b9f42fc1eb1a9648bf0 (diff)
downloadqemu-65c326ce51939fa9d109c6fb9ad4d89b98eb4359.zip
qemu-65c326ce51939fa9d109c6fb9ad4d89b98eb4359.tar.gz
qemu-65c326ce51939fa9d109c6fb9ad4d89b98eb4359.tar.bz2
include/hw/cxl: Move typedef PXBDev to cxl.h, and put it to use
hw/cxl/cxl.h uses the PXBDev structure tag instead of the typedef name. The typedef name is defined in hw/pci/pci_bridge.h. Its inclusion was dropped in the previous commit to break an inclusion loop. Move the typedef to hw/cxl/cxl.h, and use it there. Delete an extra typedef in hw/pci-bridge/pci_expander_bridge.c. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20221222100330.380143-3-armbru@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/pci-bridge/pci_expander_bridge.c1
-rw-r--r--include/hw/cxl/cxl.h4
-rw-r--r--include/hw/pci/pci_bridge.h1
3 files changed, 3 insertions, 3 deletions
diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index c9e817a..870d9ba 100644
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -50,7 +50,6 @@ struct PXBBus {
};
#define TYPE_PXB_DEVICE "pxb"
-typedef struct PXBDev PXBDev;
DECLARE_INSTANCE_CHECKER(PXBDev, PXB_DEV,
TYPE_PXB_DEVICE)
diff --git a/include/hw/cxl/cxl.h b/include/hw/cxl/cxl.h
index 5129557..b161be5 100644
--- a/include/hw/cxl/cxl.h
+++ b/include/hw/cxl/cxl.h
@@ -23,10 +23,12 @@
#define CXL_WINDOW_MAX 10
+typedef struct PXBDev PXBDev;
+
typedef struct CXLFixedWindow {
uint64_t size;
char **targets;
- struct PXBDev *target_hbs[8];
+ PXBDev *target_hbs[8];
uint8_t num_targets;
uint8_t enc_int_ways;
uint8_t enc_int_gran;
diff --git a/include/hw/pci/pci_bridge.h b/include/hw/pci/pci_bridge.h
index ca6caf4..58a3fb0 100644
--- a/include/hw/pci/pci_bridge.h
+++ b/include/hw/pci/pci_bridge.h
@@ -97,7 +97,6 @@ struct PXBDev {
} cxl;
};
-typedef struct PXBDev PXBDev;
#define TYPE_PXB_CXL_DEVICE "pxb-cxl"
DECLARE_INSTANCE_CHECKER(PXBDev, PXB_CXL_DEV,
TYPE_PXB_CXL_DEVICE)