From patchwork Thu Sep 30 05:07:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 66112 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 BE946B6F07 for ; Thu, 30 Sep 2010 15:08:53 +1000 (EST) Received: from localhost ([127.0.0.1]:58493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1BNZ-0000HD-Q9 for incoming@patchwork.ozlabs.org; Thu, 30 Sep 2010 01:08:25 -0400 Received: from [140.186.70.92] (port=37452 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1BMh-0000Fp-Et for qemu-devel@nongnu.org; Thu, 30 Sep 2010 01:07:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1P1BMg-0008Gx-5R for qemu-devel@nongnu.org; Thu, 30 Sep 2010 01:07:31 -0400 Received: from smtp104.sbc.mail.mud.yahoo.com ([68.142.198.203]:44093) by eggs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1P1BMf-0008Gq-Qe for qemu-devel@nongnu.org; Thu, 30 Sep 2010 01:07:30 -0400 Received: (qmail 55743 invoked from network); 30 Sep 2010 05:07:28 -0000 Received: from localhost.localdomain (nab@70.132.0.32 with login) by smtp104.sbc.mail.mud.yahoo.com with SMTP; 29 Sep 2010 22:07:28 -0700 PDT X-Yahoo-SMTP: fzDSGlOswBCWnIOrNw7KwwK1j9PqyNbe5PtLKiS4dDU.UNl_t6bdEZu9tTLW X-YMail-OSG: _nwCsxYVM1mC183ofESqxoWlBIdygjp4iP0Fp11_LXqHEm. t.jjUnxjQX9xH.kcx.PWMvwirC2Qe_4i0XTfFg.uCJlgf6t8Vlfpm686vJoS TVAY9_MiFI7J_JZ9uT2_ALpVMMdvfuCfL.g47PHs4LgOslM4bVji3KyxOCZP tHR9Z3ajbxt50YEXd4tivy1OWApTrAtXjBKb7O2Iufwgq7Rje8SYwuQFEiNf WTduFrl_Cg9eEE3X2MMEpBe8MLpwCy7PyK9s4E6.lYEYR00m9Cox4es15obs Fr9AGGsFdTERyngf.RzDm2qjRwGmgrW3_9hyHgvbwX1ueQZK5n5Q- X-Yahoo-Newman-Property: ymail-3 From: "Nicholas A. Bellinger" To: Paul Brook , Jan Kiszka , Kevin Wolf , Gerd Hoffmann Date: Wed, 29 Sep 2010 22:07:25 -0700 Message-Id: <1285823246-6680-1-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.5.6.5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kvm-devel , qemu-devel , Nicholas Bellinger , FUJITA Tomonori , Hannes Reinecke , Matthew Wilcox Subject: [Qemu-devel] [PATCH] scsi-generic: Add reset handler 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 From: Nicholas Bellinger This patch adds NOP scsi_generic_reset() caller to fix an OOPs which is expected to be set by hw/lsi53895a.c code for both scsi-disk and scsi-generic operation. Signed-off-by: Nicholas A. Bellinger --- hw/scsi-generic.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 1bb26e7..176fcaf 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -379,6 +379,11 @@ static int scsi_generic_initfn(SCSIDevice *dev) return 0; } +static void scsi_generic_reset(DeviceState *dev) +{ + DPRINTF("scsi_generic_reset\n"); +} + static void scsi_generic_unmap(SCSIGenericReq *r) { int is_write = !scsi_req_is_write(&r->req); @@ -552,6 +557,7 @@ static SCSIDeviceInfo scsi_generic_info = { .qdev.name = "scsi-generic", .qdev.desc = "pass through generic scsi device (/dev/sg*)", .qdev.size = sizeof(SCSIGenericState), + .qdev.reset = scsi_generic_reset, .init = scsi_generic_initfn, .destroy = scsi_destroy,