|
@@ -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;
|