diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-10-10 15:15:21 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2019-10-15 18:18:08 -0300 |
| commit | fd52c20f2c58152f6f23bed658474ae1d1a2fe52 (patch) | |
| tree | 26420a2f956e7f5e02474f4ffb278e14459999f5 /hw/isa | |
| parent | 217e8ef9c975fee3aa823391cd1d2fd24d6a546e (diff) | |
| download | qemu-fd52c20f2c58152f6f23bed658474ae1d1a2fe52.zip qemu-fd52c20f2c58152f6f23bed658474ae1d1a2fe52.tar.gz qemu-fd52c20f2c58152f6f23bed658474ae1d1a2fe52.tar.bz2 | |
hw/isa/piix4: Convert reset handler to DeviceReset
The PIIX4/ISA is a PCI device within the PIIX4 chipset, it will be reset
when the PCI bus it stands on is reset.
Convert its reset handler into a proper Device reset method.
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191010131527.32513-3-philmd@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/isa')
| -rw-r--r-- | hw/isa/piix4.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 3294056..890d999 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; /* |