Commit 54eefd72 authored by Jan Kiszka's avatar Jan Kiszka Committed by Anthony Liguori
Browse files

lsi: Properly initialize controller state on reset 



The LSI controller was lacking a system reset handler. Simply invoke the
existing soft reset handler in this case. This also allows to drop its
explicit invocation during init.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 51336214

hw/lsi53c895a.c

+8 −2
Original line number Diff line number Diff line
@@ -2007,6 +2007,13 @@ static void lsi_mmio_mapfunc(PCIDevice *pci_dev, int region_num, 
    cpu_register_physical_memory(addr + 0, 0x400, s->mmio_io_addr);

}



static void lsi_scsi_reset(DeviceState *dev)

{

    LSIState *s = DO_UPCAST(LSIState, dev.qdev, dev);



    lsi_soft_reset(s);

}



static void lsi_pre_save(void *opaque)

{

    LSIState *s = opaque;
@@ -2147,8 +2154,6 @@ static int lsi_scsi_init(PCIDevice *dev) 
                           PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_ram_mapfunc);

    QTAILQ_INIT(&s->queue);



    lsi_soft_reset(s);



    scsi_bus_new(&s->bus, &dev->qdev, 1, LSI_MAX_DEVS, lsi_command_complete);

    if (!dev->qdev.hotplugged) {

        scsi_bus_legacy_handle_cmdline(&s->bus);
@@ -2160,6 +2165,7 @@ static PCIDeviceInfo lsi_info = { 
    .qdev.name  = "lsi53c895a",

    .qdev.alias = "lsi",

    .qdev.size  = sizeof(LSIState),

    .qdev.reset = lsi_scsi_reset,

    .qdev.vmsd  = &vmstate_lsi_scsi,

    .init       = lsi_scsi_init,

    .exit       = lsi_scsi_uninit,