From patchwork Fri Sep 18 15:26:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Mauerer X-Patchwork-Id: 33924 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 7F389B7B68 for ; Sat, 19 Sep 2009 16:15:22 +1000 (EST) Received: from localhost ([127.0.0.1]:33489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MotE7-00038x-GZ for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2009 02:15:19 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MofK1-0003wv-Dy for qemu-devel@nongnu.org; Fri, 18 Sep 2009 11:24:29 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MofJw-0003tc-LV for qemu-devel@nongnu.org; Fri, 18 Sep 2009 11:24:29 -0400 Received: from [199.232.76.173] (port=38579 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MofJw-0003tL-Ax for qemu-devel@nongnu.org; Fri, 18 Sep 2009 11:24:24 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:20324) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MofJv-0003JP-Ju for qemu-devel@nongnu.org; Fri, 18 Sep 2009 11:24:24 -0400 Received: from mail2.sbs.de (localhost [127.0.0.1]) by lizzard.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n8IFO5Bq011204; Fri, 18 Sep 2009 17:24:05 +0200 Received: from localhost.localdomain (mchn315c.mchp.siemens.de [139.25.109.82]) by mail2.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n8IFO5WF024032; Fri, 18 Sep 2009 17:24:05 +0200 From: Wolfgang Mauerer To: qemu-devel@nongnu.org Date: Fri, 18 Sep 2009 17:26:31 +0200 Message-Id: <1253287594-12905-2-git-send-email-wolfgang.mauerer@siemens.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1253287594-12905-1-git-send-email-wolfgang.mauerer@siemens.com> References: <1253287594-12905-1-git-send-email-wolfgang.mauerer@siemens.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 X-Mailman-Approved-At: Sat, 19 Sep 2009 02:10:29 -0400 Cc: jan.kiszka@siemens.com, wlm.libvirt@googlemail.com Subject: [Qemu-devel] [PATCH 1/4] SCSI-hotdel: Add detach method to LSI SCSI driver 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 Introduce lsi_scsi_detach, which destroys and de-registers a device from the LSI SCSI host Signed-off-by: Wolfgang Mauerer Signed-off-by: Jan Kiszka --- hw/lsi53c895a.c | 16 ++++++++++++++++ hw/pci.h | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 62bdca8..7e975b4 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -1959,6 +1959,22 @@ static void lsi_mmio_mapfunc(PCIDevice *pci_dev, int region_num, cpu_register_physical_memory(addr + 0, 0x400, s->mmio_io_addr); } +void lsi_scsi_detach(DeviceState *host, BlockDriverState *bd, int id) +{ + LSIState *s = (LSIState *)host; + + if (id >= LSI_MAX_DEVS || id < 0) { + BADF("Bad Device ID %d\n", id); + return; + } + + if (s->bus->devs[id]) { + DPRINTF("Destroying device %d\n", id); + s->bus->devs[id]->info->destroy(s->bus->devs[id]); + } + s->bus->devs[id] = NULL; +} + static void lsi_scsi_save(QEMUFile *f, void *opaque) { LSIState *s = opaque; diff --git a/hw/pci.h b/hw/pci.h index 4e901be..1127c87 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -382,6 +382,7 @@ PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name); /* lsi53c895a.c */ #define LSI_MAX_DEVS 7 +void lsi_scsi_detach(DeviceState *host, BlockDriverState *bd, int id); /* vmware_vga.c */ void pci_vmsvga_init(PCIBus *bus);