david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init()

Browse Source 
Now both inherited classes appear as DEVICE_CATEGORY_STORAGE.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-id: 20180115182436.2066-5-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2018-01-16 13:28:16 +00:00 committed by Peter Maydell
parent b635d98cf3
commit 1c92c50543
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/sd/sdhci.c
View File

@ -1273,6 +1273,15 @@ const VMStateDescription sdhci_vmstate = {
}, },
}; };
static void sdhci_common_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
dc->vmsd = &sdhci_vmstate;
dc->reset = sdhci_poweron_reset;
}
/* --- qdev PCI --- */ /* --- qdev PCI --- */
static Property sdhci_pci_properties[] = { static Property sdhci_pci_properties[] = {
@ -1310,10 +1319,9 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data)
k->vendor_id = PCI_VENDOR_ID_REDHAT; k->vendor_id = PCI_VENDOR_ID_REDHAT;
k->device_id = PCI_DEVICE_ID_REDHAT_SDHCI; k->device_id = PCI_DEVICE_ID_REDHAT_SDHCI;
k->class_id = PCI_CLASS_SYSTEM_SDHCI; k->class_id = PCI_CLASS_SYSTEM_SDHCI;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
dc->vmsd = &sdhci_vmstate;
dc->props = sdhci_pci_properties; dc->props = sdhci_pci_properties;
dc->reset = sdhci_poweron_reset;
sdhci_common_class_init(klass, data);
} }
static const TypeInfo sdhci_pci_info = { static const TypeInfo sdhci_pci_info = {
@ -1366,10 +1374,10 @@ static void sdhci_sysbus_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
dc->vmsd = &sdhci_vmstate;
dc->props = sdhci_sysbus_properties; dc->props = sdhci_sysbus_properties;
dc->realize = sdhci_sysbus_realize; dc->realize = sdhci_sysbus_realize;
dc->reset = sdhci_poweron_reset;
sdhci_common_class_init(klass, data);
} }
static const TypeInfo sdhci_sysbus_info = { static const TypeInfo sdhci_sysbus_info = {