[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/11] hw/isa/piix4: Convert reset handler to DeviceReset
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 03/11] hw/isa/piix4: Convert reset handler to DeviceReset |
Date: |
Thu, 26 Sep 2019 17:17:25 +0200 |
Convert the reset handler into a proper Device reset method.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/isa/piix4.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 3294056cd5..890d999abf 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -28,7 +28,6 @@
#include "hw/isa/isa.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "sysemu/reset.h"
PCIDevice *piix4_dev;
@@ -40,9 +39,9 @@ typedef struct PIIX4State {
#define PIIX4_PCI_DEVICE(obj) \
OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE)
-static void piix4_reset(void *opaque)
+static void piix4_isa_reset(DeviceState *dev)
{
- PIIX4State *d = opaque;
+ PIIX4State *d = PIIX4_PCI_DEVICE(dev);
uint8_t *pci_conf = d->dev.config;
pci_conf[0x04] = 0x07; // master, memory and I/O
@@ -97,7 +96,6 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
return;
}
piix4_dev = &d->dev;
- qemu_register_reset(piix4_reset, d);
}
int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn)
@@ -118,6 +116,7 @@ static void piix4_class_init(ObjectClass *klass, void *data)
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->device_id = PCI_DEVICE_ID_INTEL_82371AB_0;
k->class_id = PCI_CLASS_BRIDGE_ISA;
+ dc->reset = piix4_isa_reset;
dc->desc = "ISA bridge";
dc->vmsd = &vmstate_piix4;
/*
--
2.20.1
- [PATCH 00/11] hw: Convert various reset() handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 01/11] hw/acpi/piix4: Convert reset handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 02/11] hw/ide/piix: Convert reset handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 03/11] hw/isa/piix4: Convert reset handler to DeviceReset,
Philippe Mathieu-Daudé <=
- [PATCH 04/11] hw/pci-host/piix: Convert reset handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 05/11] hw/ide/sii3112: Convert reset handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 07/11] hw/isa/vt82c686: Convert reset handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 06/11] hw/ide/via82c: Convert reset handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 09/11] hw/pci-host/bonito: Convert reset handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 08/11] hw/input/lm832x: Convert reset handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 11/11] hw/misc/vmcoreinfo: Convert reset handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 10/11] hw/timer/etraxfs: Convert reset handler to DeviceReset, Philippe Mathieu-Daudé, 2019/09/26
- Re: [PATCH 00/11] hw: Convert various reset() handler to DeviceReset, no-reply, 2019/09/27