ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/pci-host/designware: Declare CPU QOM types using DEFINE_TYPES() macro 

When multiple QOM types are registered in the same file,
it is simpler to use the the DEFINE_TYPES() macro. In
particular because type array declared with such macro
are easier to review.

Remove a pointless structure declaration in "designware.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Gustavo Romero <gustavo.romero@linaro.org>
Message-Id: <20231012121857.31873-2-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-12 10:35:09 +02:00
parent 28ae3179fc
commit 13a07eb146
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hw/pci-host/designware.c
View File

@ -752,28 +752,23 @@ static void designware_pcie_host_init(Object *obj)
qdev_prop_set_bit(DEVICE(root), "multifunction", false); qdev_prop_set_bit(DEVICE(root), "multifunction", false);
} }
static const TypeInfo designware_pcie_root_info = { static const TypeInfo designware_pcie_types[] = {
.name = TYPE_DESIGNWARE_PCIE_ROOT, {
.parent = TYPE_PCI_BRIDGE, .name = TYPE_DESIGNWARE_PCIE_HOST,
.instance_size = sizeof(DesignwarePCIERoot), .parent = TYPE_PCI_HOST_BRIDGE,
.class_init = designware_pcie_root_class_init, .instance_size = sizeof(DesignwarePCIEHost),
.interfaces = (InterfaceInfo[]) { .instance_init = designware_pcie_host_init,
{ INTERFACE_PCIE_DEVICE }, .class_init = designware_pcie_host_class_init,
{ } }, {
.name = TYPE_DESIGNWARE_PCIE_ROOT,
.parent = TYPE_PCI_BRIDGE,
.instance_size = sizeof(DesignwarePCIERoot),
.class_init = designware_pcie_root_class_init,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_PCIE_DEVICE },
{ }
},
}, },
}; };
static const TypeInfo designware_pcie_host_info = { DEFINE_TYPES(designware_pcie_types)
.name = TYPE_DESIGNWARE_PCIE_HOST,
.parent = TYPE_PCI_HOST_BRIDGE,
.instance_size = sizeof(DesignwarePCIEHost),
.instance_init = designware_pcie_host_init,
.class_init = designware_pcie_host_class_init,
};
static void designware_pcie_register(void)
{
type_register_static(&designware_pcie_root_info);
type_register_static(&designware_pcie_host_info);
}
type_init(designware_pcie_register)

2
include/hw/pci-host/designware.h
View File

@ -31,8 +31,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(DesignwarePCIEHost, DESIGNWARE_PCIE_HOST)
#define TYPE_DESIGNWARE_PCIE_ROOT "designware-pcie-root" #define TYPE_DESIGNWARE_PCIE_ROOT "designware-pcie-root"
OBJECT_DECLARE_SIMPLE_TYPE(DesignwarePCIERoot, DESIGNWARE_PCIE_ROOT) OBJECT_DECLARE_SIMPLE_TYPE(DesignwarePCIERoot, DESIGNWARE_PCIE_ROOT)
struct DesignwarePCIERoot;
typedef struct DesignwarePCIEViewport { typedef struct DesignwarePCIEViewport {
DesignwarePCIERoot *root; DesignwarePCIERoot *root;