Commit 9dc1a769 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Eduardo Habkost
Browse files

hw/isa/vt82c686: Convert reset handler to DeviceReset 



The VIA VT82C686 Southbridge is a PCI device, 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: default avatarLi Qiang <liq3ea@gmail.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191010131527.32513-7-philmd@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 71d3bacd

hw/isa/vt82c686.c

+4 −7
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "hw/isa/apm.h"

#include "hw/acpi/acpi.h"

#include "hw/i2c/pm_smbus.h"

#include "sysemu/reset.h"

#include "qemu/module.h"

#include "qemu/timer.h"

#include "exec/address-spaces.h"
@@ -116,11 +115,10 @@ static const MemoryRegionOps superio_ops = { 
    },

};



static void vt82c686b_reset(void * opaque)

static void vt82c686b_isa_reset(DeviceState *dev)

{

    PCIDevice *d = opaque;

    uint8_t *pci_conf = d->config;

    VT82C686BState *vt82c = VT82C686B_DEVICE(d);

    VT82C686BState *vt82c = VT82C686B_DEVICE(dev);

    uint8_t *pci_conf = vt82c->dev.config;



    pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0);

    pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
@@ -476,8 +474,6 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp) 
     * But we do not emulate a floppy, so just set it here. */

    memory_region_add_subregion(isa_bus->address_space_io, 0x3f0,

                                &vt82c->superio);



    qemu_register_reset(vt82c686b_reset, d);

}



ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn)
@@ -501,6 +497,7 @@ static void via_class_init(ObjectClass *klass, void *data) 
    k->device_id = PCI_DEVICE_ID_VIA_ISA_BRIDGE;

    k->class_id = PCI_CLASS_BRIDGE_ISA;

    k->revision = 0x40;

    dc->reset = vt82c686b_isa_reset;

    dc->desc = "ISA bridge";

    dc->vmsd = &vmstate_via;

    /*