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

hw/ide/piix: Convert reset handler to DeviceReset 



The PIIX/IDE is a PCI device within a PIIX chipset, it will be reset
when the PCI bus it stands on is reset.

Convert its reset handler into a proper Device reset method.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191010131527.32513-4-philmd@redhat.com>
Reviewed-by: default avatarLi Qiang <liq3ea@gmail.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent fd52c20f

hw/ide/piix.c

+4 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "sysemu/block-backend.h"

#include "sysemu/blockdev.h"

#include "sysemu/dma.h"

#include "sysemu/reset.h"



#include "hw/ide/pci.h"

#include "trace.h"
@@ -103,9 +102,9 @@ static void bmdma_setup_bar(PCIIDEState *d) 
    }

}



static void piix3_reset(void *opaque)

static void piix_ide_reset(DeviceState *dev)

{

    PCIIDEState *d = opaque;

    PCIIDEState *d = PCI_IDE(dev);

    PCIDevice *pd = PCI_DEVICE(d);

    uint8_t *pci_conf = pd->config;

    int i;
@@ -154,8 +153,6 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error **errp) 


    pci_conf[PCI_CLASS_PROG] = 0x80; // legacy ATA mode



    qemu_register_reset(piix3_reset, d);



    bmdma_setup_bar(d);

    pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
@@ -247,6 +244,7 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    dc->reset = piix_ide_reset;

    k->realize = pci_piix_ide_realize;

    k->exit = pci_piix_ide_exitfn;

    k->vendor_id = PCI_VENDOR_ID_INTEL;
@@ -273,6 +271,7 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    dc->reset = piix_ide_reset;

    k->realize = pci_piix_ide_realize;

    k->exit = pci_piix_ide_exitfn;

    k->vendor_id = PCI_VENDOR_ID_INTEL;