[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/7] hw/net/eepro100: Convert reset handler to DeviceReset
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 3/7] hw/net/eepro100: Convert reset handler to DeviceReset |
Date: |
Mon, 13 Feb 2023 11:10:44 +0100 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/net/eepro100.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 4b5d45576b..722fb55e4a 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -486,8 +486,9 @@ static void eepro100_fcp_interrupt(EEPRO100State * s)
}
#endif
-static void e100_pci_reset(EEPRO100State *s, Error **errp)
+static void e100_pci_reset(DeviceState *dev)
{
+ EEPRO100State *s = EEPRO100(dev);
E100PCIDeviceInfo *info = eepro100_get_class(s);
uint32_t device = s->device;
uint8_t *pci_conf = s->dev.config;
@@ -1847,18 +1848,11 @@ static void e100_nic_realize(PCIDevice *pci_dev, Error
**errp)
{
EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev);
E100PCIDeviceInfo *info = eepro100_get_class(s);
- Error *local_err = NULL;
TRACE(OTHER, logout("\n"));
s->device = info->device;
- e100_pci_reset(s, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- return;
- }
-
/* Add 64 * 2 EEPROM. i82557 and i82558 support a 64 word EEPROM,
* i82559 and later support 64 or 256 word EEPROM. */
s->eeprom = eeprom93xx_new(&pci_dev->qdev, EEPROM_SIZE);
@@ -2076,6 +2070,7 @@ static void eepro100_base_class_init(ObjectClass *klass,
void *data)
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
device_class_set_props(dc, e100_properties);
+ dc->reset = e100_pci_reset;
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->class_id = PCI_CLASS_NETWORK_ETHERNET;
k->romfile = "pxe-eepro100.rom";
--
2.38.1
- [PATCH v2 0/7] hw/net/eepro100: Finish QDev conversion, Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 1/7] hw/net/eepro100: Abort if pci_add_capability() ever fail, Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 2/7] hw/net/eepro100: Introduce TYPE_EEPRO100 QOM abstract parent, Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 3/7] hw/net/eepro100: Convert reset handler to DeviceReset,
Philippe Mathieu-Daudé <=
- [PATCH v2 4/7] hw/net/eepro100: Pass E100PCIDeviceInfo as class init data, Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 5/7] hw/net/eepro100: Remove instance EEPRO100State::has_extended_tcb_support, Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 6/7] hw/net/eepro100: Remove instance's EEPRO100State::device, Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 7/7] hw/net/eepro100: Replace DO_UPCAST(EEPRO100State) by EEPRO100(), Philippe Mathieu-Daudé, 2023/02/13
- Re: [PATCH v2 0/7] hw/net/eepro100: Finish QDev conversion, Philippe Mathieu-Daudé, 2023/02/23