From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O7oz6-000549-1e for qemu-devel@nongnu.org; Fri, 30 Apr 2010 08:06:20 -0400 Received: from [140.186.70.92] (port=35358 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7oz4-00053O-GE for qemu-devel@nongnu.org; Fri, 30 Apr 2010 08:06:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7oz1-0007N4-TJ for qemu-devel@nongnu.org; Fri, 30 Apr 2010 08:06:18 -0400 Received: from david.siemens.de ([192.35.17.14]:15735) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7oz1-0007Ma-EZ for qemu-devel@nongnu.org; Fri, 30 Apr 2010 08:06:15 -0400 Message-ID: <4BDAC7B5.4040005@siemens.com> Date: Fri, 30 Apr 2010 14:06:13 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v2 2/2] lsi: Properly initialize controller state on reset List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Gerd Hoffmann 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: Jan Kiszka --- hw/lsi53c895a.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index ad23ece..85eea15 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -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,