[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/51] e1000e: Configure ResettableClass
From: |
Jason Wang |
Subject: |
[PULL 15/51] e1000e: Configure ResettableClass |
Date: |
Tue, 7 Mar 2023 15:07:40 +0800 |
From: Akihiko Odaki <akihiko.odaki@daynix.com>
This is part of recent efforts of refactoring e1000 and e1000e.
DeviceClass's reset member is deprecated so migrate to ResettableClass.
There 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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/e1000e.c | 10 ++++++----
hw/net/trace-events | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 0bc222d..ec27431 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -513,11 +513,11 @@ static void e1000e_pci_uninit(PCIDevice *pci_dev)
msi_uninit(pci_dev);
}
-static void e1000e_qdev_reset(DeviceState *dev)
+static void e1000e_qdev_reset_hold(Object *obj)
{
- E1000EState *s = E1000E(dev);
+ E1000EState *s = E1000E(obj);
- trace_e1000e_cb_qdev_reset();
+ trace_e1000e_cb_qdev_reset_hold();
e1000e_core_reset(&s->core);
@@ -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_hold;
+
dc->desc = "Intel 82574L GbE Controller";
- dc->reset = e1000e_qdev_reset;
dc->vmsd = &e1000e_vmstate;
e1000e_prop_disable_vnet = qdev_prop_uint8;
diff --git a/hw/net/trace-events b/hw/net/trace-events
index 8fa4299..c98ad12 100644
--- a/hw/net/trace-events
+++ b/hw/net/trace-events
@@ -251,7 +251,7 @@ e1000e_vm_state_stopped(void) "VM state is stopped"
# e1000e.c
e1000e_cb_pci_realize(void) "E1000E PCI realize entry"
e1000e_cb_pci_uninit(void) "E1000E PCI unit entry"
-e1000e_cb_qdev_reset(void) "E1000E qdev reset entry"
+e1000e_cb_qdev_reset_hold(void) "E1000E qdev reset hold"
e1000e_cb_pre_save(void) "E1000E pre save entry"
e1000e_cb_post_load(void) "E1000E post load entry"
--
2.7.4
- [PULL 05/51] e1000: Mask registers when writing, (continued)
- [PULL 05/51] e1000: Mask registers when writing, Jason Wang, 2023/03/07
- [PULL 07/51] e1000e: Mask registers when writing, Jason Wang, 2023/03/07
- [PULL 06/51] e1000e: Introduce E1000E_LOW_BITS_SET_FUNC, Jason Wang, 2023/03/07
- [PULL 09/51] e1000e: Use more constant definitions, Jason Wang, 2023/03/07
- [PULL 08/51] e1000: Use more constant definitions, Jason Wang, 2023/03/07
- [PULL 10/51] e1000: Use memcpy to intialize registers, Jason Wang, 2023/03/07
- [PULL 11/51] e1000e: Use memcpy to intialize registers, Jason Wang, 2023/03/07
- [PULL 12/51] e1000e: Remove pending interrupt flags, Jason Wang, 2023/03/07
- [PULL 13/51] e1000e: Improve software reset, Jason Wang, 2023/03/07
- [PULL 14/51] e1000: Configure ResettableClass, Jason Wang, 2023/03/07
- [PULL 15/51] e1000e: Configure ResettableClass,
Jason Wang <=
- [PULL 16/51] e1000e: Introduce e1000_rx_desc_union, Jason Wang, 2023/03/07
- [PULL 17/51] e1000e: Set MII_ANER_NWAY, Jason Wang, 2023/03/07
- [PULL 18/51] e1000e: Remove extra pointer indirection, Jason Wang, 2023/03/07
- [PULL 19/51] net: Check L4 header size, Jason Wang, 2023/03/07
- [PULL 20/51] e1000x: Alter the signature of e1000x_is_vlan_packet, Jason Wang, 2023/03/07
- [PULL 21/51] net: Strip virtio-net header when dumping, Jason Wang, 2023/03/07
- [PULL 22/51] hw/net/net_tx_pkt: Automatically determine if virtio-net header is used, Jason Wang, 2023/03/07
- [PULL 23/51] hw/net/net_rx_pkt: Remove net_rx_pkt_has_virt_hdr, Jason Wang, 2023/03/07
- [PULL 24/51] e1000e: Perform software segmentation for loopback, Jason Wang, 2023/03/07
- [PULL 27/51] e1000e: Do not assert when MSI-X is disabled later, Jason Wang, 2023/03/07