From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O7X0W-000788-II for qemu-devel@nongnu.org; Thu, 29 Apr 2010 12:54:36 -0400 Received: from [140.186.70.92] (port=37521 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7X0T-000780-RL for qemu-devel@nongnu.org; Thu, 29 Apr 2010 12:54:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7X0R-0008NJ-VH for qemu-devel@nongnu.org; Thu, 29 Apr 2010 12:54:33 -0400 Received: from goliath.siemens.de ([192.35.17.28]:16619) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7X0R-0008Mz-MJ for qemu-devel@nongnu.org; Thu, 29 Apr 2010 12:54:31 -0400 Received: from mail3.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o3TGsTr6023627 for ; Thu, 29 Apr 2010 18:54:29 +0200 Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail3.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o3TGsSRP031231 for ; Thu, 29 Apr 2010 18:54:28 +0200 Message-ID: <4BD9B9C4.5000702@siemens.com> Date: Thu, 29 Apr 2010 18:54:28 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] 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 The LSI controller was lacking any system reset handler. This is an attempt to fix it. Signed-off-by: Jan Kiszka --- hw/lsi53c895a.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 98b7f54..f328057 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -1996,6 +1996,16 @@ 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); + + s->dma_buf = NULL; + s->current_dma_len = 0; + s->active_commands = 0; + lsi_soft_reset(s); +} + static void lsi_pre_save(void *opaque) { LSIState *s = opaque; @@ -2149,6 +2159,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,