[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/7] include/hw/cxl: Move typedef PXBDev to cxl.h, and put it
From: |
Markus Armbruster |
Subject: |
[PATCH v2 2/7] include/hw/cxl: Move typedef PXBDev to cxl.h, and put it to use |
Date: |
Thu, 22 Dec 2022 11:03:25 +0100 |
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>
---
include/hw/cxl/cxl.h | 4 +++-
include/hw/pci/pci_bridge.h | 1 -
hw/pci-bridge/pci_expander_bridge.c | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/hw/cxl/cxl.h b/include/hw/cxl/cxl.h
index 5129557bee..b161be59b7 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 ca6caf487e..58a3fb0c2c 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)
diff --git a/hw/pci-bridge/pci_expander_bridge.c
b/hw/pci-bridge/pci_expander_bridge.c
index c9e817aa58..870d9bab11 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)
--
2.38.1
- [PATCH v2 0/7] include/hw/pci include/hw/cxl: Clean up includes, Markus Armbruster, 2022/12/22
- [PATCH v2 6/7] include/hw/pci: Include hw/pci/pci.h where needed, Markus Armbruster, 2022/12/22
- [PATCH v2 3/7] include/hw/cxl: Include hw/cxl/*.h where needed, Markus Armbruster, 2022/12/22
- [PATCH v2 5/7] include/hw/pci: Split pci_device.h off pci.h, Markus Armbruster, 2022/12/22
- [PATCH v2 4/7] include/hw/pci: Clean up a few things checkpatch.pl would flag, Markus Armbruster, 2022/12/22
- [PATCH v2 1/7] include/hw/pci: Break inclusion loop pci_bridge.h and cxl.h, Markus Armbruster, 2022/12/22
- [PATCH v2 2/7] include/hw/cxl: Move typedef PXBDev to cxl.h, and put it to use,
Markus Armbruster <=
- [PATCH v2 7/7] include/hw/cxl: Break inclusion loop cxl_pci.h and cxl_cdat_h, Markus Armbruster, 2022/12/22
- Re: [PATCH v2 0/7] include/hw/pci include/hw/cxl: Clean up includes, Bernhard Beschow, 2022/12/22