[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 14/31] e1000e: Configure ResettableClass
From: |
Akihiko Odaki |
Subject: |
[PATCH 14/31] e1000e: Configure ResettableClass |
Date: |
Thu, 12 Jan 2023 18:57:26 +0900 |
This is part of recent efforts of refactoring e1000 and e1000e.
DeviceClass's reset member is deprecated so migrate to ResettableClass.
Thre is no behavioral difference.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/net/e1000e.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 0bc222d354..40a4b97938 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -513,9 +513,9 @@ static void e1000e_pci_uninit(PCIDevice *pci_dev)
msi_uninit(pci_dev);
}
-static void e1000e_qdev_reset(DeviceState *dev)
+static void e1000e_qdev_reset(Object *obj)
{
- E1000EState *s = E1000E(dev);
+ E1000EState *s = E1000E(obj);
trace_e1000e_cb_qdev_reset();
@@ -669,6 +669,7 @@ static Property e1000e_properties[] = {
static void e1000e_class_init(ObjectClass *class, void *data)
{
DeviceClass *dc = DEVICE_CLASS(class);
+ ResettableClass *rc = RESETTABLE_CLASS(class);
PCIDeviceClass *c = PCI_DEVICE_CLASS(class);
c->realize = e1000e_pci_realize;
@@ -679,8 +680,9 @@ static void e1000e_class_init(ObjectClass *class, void
*data)
c->romfile = "efi-e1000e.rom";
c->class_id = PCI_CLASS_NETWORK_ETHERNET;
+ rc->phases.hold = e1000e_qdev_reset;
+
dc->desc = "Intel 82574L GbE Controller";
- dc->reset = e1000e_qdev_reset;
dc->vmsd = &e1000e_vmstate;
e1000e_prop_disable_vnet = qdev_prop_uint8;
--
2.39.0
- [PATCH 16/31] e1000e: Set MII_ANER_NWAY, (continued)
- [PATCH 16/31] e1000e: Set MII_ANER_NWAY, Akihiko Odaki, 2023/01/12
- [PATCH 23/31] igb: Rename identifiers, Akihiko Odaki, 2023/01/12
- [PATCH 26/31] tests/qtest/e1000e-test: Fabricate ethernet header, Akihiko Odaki, 2023/01/12
- [PATCH 30/31] tests/avocado: Add igb test, Akihiko Odaki, 2023/01/12
- [PATCH 27/31] tests/qtest/libqos/e1000e: Export macreg functions, Akihiko Odaki, 2023/01/12
- [PATCH 28/31] tests/qtest/libqos/igb: Copy e1000e code, Akihiko Odaki, 2023/01/12
- [PATCH 29/31] tests/qtest/libqos/igb: Transform to igb tests, Akihiko Odaki, 2023/01/12
- [PATCH 20/31] pcie: Introduce pcie_sriov_num_vfs, Akihiko Odaki, 2023/01/12
- [PATCH 14/31] e1000e: Configure ResettableClass,
Akihiko Odaki <=
- Re: [PATCH 00/31] Introduce igb, Philippe Mathieu-Daudé, 2023/01/12