From patchwork Fri Sep 25 19:42:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 34301 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 C3E32B7BA6 for ; Sat, 26 Sep 2009 06:24:39 +1000 (EST) Received: from localhost ([127.0.0.1]:49116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MrHLJ-0007Aa-4S for incoming@patchwork.ozlabs.org; Fri, 25 Sep 2009 16:24:37 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MrGhL-0006aB-Gv for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MrGhG-0006Ub-8n for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:18 -0400 Received: from [199.232.76.173] (port=56061 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MrGhF-0006U3-0Q for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47881) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MrGhE-0004g2-H1 for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:12 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8PJhBhO000307 for ; Fri, 25 Sep 2009 15:43:11 -0400 Received: from zweiblum.home.kraxel.org (vpn2-8-108.ams2.redhat.com [10.36.8.108]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8PJh5x4018184; Fri, 25 Sep 2009 15:43:06 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id A2562700F6; Fri, 25 Sep 2009 21:42:50 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 25 Sep 2009 21:42:43 +0200 Message-Id: <1253907769-1067-19-git-send-email-kraxel@redhat.com> In-Reply-To: <1253907769-1067-1-git-send-email-kraxel@redhat.com> References: <1253907769-1067-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 18/24] scsi: hotplug windup 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 Signed-off-by: Gerd Hoffmann --- hw/scsi-bus.c | 2 ++ hw/usb-msd.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 27defc4..fe8991e 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -23,6 +23,7 @@ void scsi_bus_new(SCSIBus *bus, DeviceState *host, int tcq, int ndev, bus->tcq = tcq; bus->ndev = ndev; bus->complete = complete; + bus->qbus.allow_hotplug = 1; } static int scsi_qdev_init(DeviceState *qdev, DeviceInfo *base) @@ -75,6 +76,7 @@ void scsi_qdev_register(SCSIDeviceInfo *info) { info->qdev.bus_info = &scsi_bus_info; info->qdev.init = scsi_qdev_init; + info->qdev.unplug = qdev_simple_unplug_cb; info->qdev.exit = scsi_qdev_exit; qdev_register(&info->qdev); } diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 843a22f..a19b31d 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -527,6 +527,7 @@ static int usb_msd_initfn(USBDevice *dev) s->dev.speed = USB_SPEED_FULL; scsi_bus_new(&s->bus, &s->dev.qdev, 0, 1, usb_msd_command_complete); s->scsi_dev = scsi_bus_legacy_add_drive(&s->bus, s->dinfo, 0); + s->bus.qbus.allow_hotplug = 0; usb_msd_handle_reset(dev); return 0; }