[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 04/14] sdhci: refactor common sysbus/pci class_in
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v7 04/14] sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init() |
Date: |
Sat, 13 Jan 2018 02:07:07 -0300 |
Now both inherited classes appear as DEVICE_CATEGORY_STORAGE.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
---
hw/sd/sdhci.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 6c3389cfdc..191f0d26ee 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1280,6 +1280,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 --- */
static void sdhci_pci_realize(PCIDevice *dev, Error **errp)
@@ -1304,7 +1313,6 @@ static void sdhci_pci_exit(PCIDevice *dev)
static void sdhci_pci_class_init(ObjectClass *klass, void *data)
{
- DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->realize = sdhci_pci_realize;
@@ -1312,9 +1320,8 @@ static void sdhci_pci_class_init(ObjectClass *klass, void
*data)
k->vendor_id = PCI_VENDOR_ID_REDHAT;
k->device_id = PCI_DEVICE_ID_REDHAT_SDHCI;
k->class_id = PCI_CLASS_SYSTEM_SDHCI;
- set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
- dc->vmsd = &sdhci_vmstate;
- dc->reset = sdhci_poweron_reset;
+
+ sdhci_common_class_init(klass, data);
}
static const TypeInfo sdhci_pci_info = {
@@ -1368,9 +1375,9 @@ static void sdhci_sysbus_class_init(ObjectClass *klass,
void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- dc->vmsd = &sdhci_vmstate;
dc->realize = sdhci_sysbus_realize;
- dc->reset = sdhci_poweron_reset;
+
+ sdhci_common_class_init(klass, data);
}
static const TypeInfo sdhci_sysbus_info = {
--
2.15.1
- [Qemu-devel] [PATCH v7 00/14] SDHCI: housekeeping (part 1), Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 01/14] sdhci: clean up includes, Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 02/14] sdhci: remove dead code, Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 04/14] sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v7 03/14] sdhci: refactor same sysbus/pci properties into a common one, Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 05/14] sdhci: refactor common sysbus/pci realize() into sdhci_common_realize(), Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 07/14] sdhci: use qemu_log_mask(UNIMP) instead of fprintf(), Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 06/14] sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize(), Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 08/14] sdhci: convert the DPRINT() calls into trace events, Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 09/14] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 10/14] sdhci: rename the SDHC_CAPAB register, Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 11/14] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only, Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 12/14] sdhci: Implement write method of ACMD12ERRSTS register, Philippe Mathieu-Daudé, 2018/01/13
- [Qemu-devel] [PATCH v7 14/14] sdhci: add a 'dma' property to the sysbus devices, Philippe Mathieu-Daudé, 2018/01/13