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

hw/ide/sii3112: Convert reset handler to DeviceReset 



The SiI3112A SATA controller 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-5-philmd@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent ee358e91

hw/ide/sii3112.c

+3 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "qemu/osdep.h"

#include "hw/ide/pci.h"

#include "qemu/module.h"

#include "sysemu/reset.h"

#include "trace.h"



#define TYPE_SII3112_PCI "sii3112"
@@ -237,9 +236,9 @@ static void sii3112_set_irq(void *opaque, int channel, int level) 
    sii3112_update_irq(s);

}



static void sii3112_reset(void *opaque)

static void sii3112_reset(DeviceState *dev)

{

    SiI3112PCIState *s = opaque;

    SiI3112PCIState *s = SII3112_PCI(dev);

    int i;



    for (i = 0; i < 2; i++) {
@@ -290,7 +289,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp) 
        s->bmdma[i].bus = &s->bus[i];

        ide_register_restart_cb(&s->bus[i]);

    }

    qemu_register_reset(sii3112_reset, s);

}



static void sii3112_pci_class_init(ObjectClass *klass, void *data)
@@ -303,6 +301,7 @@ static void sii3112_pci_class_init(ObjectClass *klass, void *data) 
    pd->class_id = PCI_CLASS_STORAGE_RAID;

    pd->revision = 1;

    pd->realize = sii3112_pci_realize;

    dc->reset = sii3112_reset;

    dc->desc = "SiI3112A SATA controller";

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

}