From patchwork Fri Apr 30 12:06:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 51328 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0590CB7D12 for ; Fri, 30 Apr 2010 22:08:27 +1000 (EST) Received: from localhost ([127.0.0.1]:40300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7p15-0005pV-L1 for incoming@patchwork.ozlabs.org; Fri, 30 Apr 2010 08:08:23 -0400 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 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o3UC6D6X020108; Fri, 30 Apr 2010 14:06:13 +0200 Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o3UC6Dbi025423; Fri, 30 Apr 2010 14:06:13 +0200 Message-ID: <4BDAC7B5.4040005@siemens.com> Date: Fri, 30 Apr 2010 14:06:13 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 2/2] lsi: Properly initialize controller state on reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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,