[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/51] include/hw/cxl: Move typedef PXBDev to cxl.h, and put it to
From: |
Michael S. Tsirkin |
Subject: |
[PULL 28/51] include/hw/cxl: Move typedef PXBDev to cxl.h, and put it to use |
Date: |
Thu, 5 Jan 2023 04:21:42 -0500 |
From: Markus Armbruster <armbru@redhat.com>
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>
---
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)
--
MST
- [PULL 46/51] tests: virt: Update expected ACPI tables for virt test, (continued)
- [PULL 46/51] tests: virt: Update expected ACPI tables for virt test, Michael S. Tsirkin, 2023/01/05
- [PULL 47/51] tests: acpi: Add and whitelist *.topology blobs, Michael S. Tsirkin, 2023/01/05
- [PULL 48/51] tests: acpi: aarch64: Add topology test for aarch64, Michael S. Tsirkin, 2023/01/05
- [PULL 49/51] tests: acpi: aarch64: Add *.topology tables, Michael S. Tsirkin, 2023/01/05
- [PULL 50/51] acpi: cpuhp: fix guest-visible maximum access size to the legacy reg block, Michael S. Tsirkin, 2023/01/05
[PULL 51/51] vhost-scsi: fix memleak of vsc->inflight, Michael S. Tsirkin, 2023/01/05
[PULL 28/51] include/hw/cxl: Move typedef PXBDev to cxl.h, and put it to use,
Michael S. Tsirkin <=
[PULL 32/51] include/hw/pci: Include hw/pci/pci.h where needed, Michael S. Tsirkin, 2023/01/05
[PULL 33/51] include/hw/cxl: Break inclusion loop cxl_pci.h and cxl_cdat_h, Michael S. Tsirkin, 2023/01/05
Re: [PULL 00/51] virtio,pc,pci: features, cleanups, fixes, Michael S. Tsirkin, 2023/01/05
- Re: [PULL 00/51] virtio,pc,pci: features, cleanups, fixes, Michael S. Tsirkin, 2023/01/05
- Re: [PULL 00/51] virtio,pc,pci: features, cleanups, fixes, Peter Maydell, 2023/01/05
- Re: [PULL 00/51] virtio,pc,pci: features, cleanups, fixes, Michael S. Tsirkin, 2023/01/05
- Re: [PULL 00/51] virtio,pc,pci: features, cleanups, fixes, Michael S. Tsirkin, 2023/01/05
- Re: [PULL 00/51] virtio,pc,pci: features, cleanups, fixes, Peter Maydell, 2023/01/06
- Re: [PULL 00/51] virtio,pc,pci: features, cleanups, fixes, Michael S. Tsirkin, 2023/01/08
- Re: [PULL 00/51] virtio,pc,pci: features, cleanups, fixes, Markus Armbruster, 2023/01/09