From patchwork Fri Jul 27 15:02:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 173737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3A9BE2C008E for ; Sat, 28 Jul 2012 02:31:52 +1000 (EST) Received: from localhost ([::1]:49690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sum5u-0008NK-Qn for incoming@patchwork.ozlabs.org; Fri, 27 Jul 2012 11:04:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sum5X-0007w5-Ev for qemu-devel@nongnu.org; Fri, 27 Jul 2012 11:04:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sum5T-0007Ud-9h for qemu-devel@nongnu.org; Fri, 27 Jul 2012 11:04:23 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:47452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sum5T-0007Pk-4j for qemu-devel@nongnu.org; Fri, 27 Jul 2012 11:04:19 -0400 Received: by mail-yx0-f173.google.com with SMTP id l1so3232039yen.4 for ; Fri, 27 Jul 2012 08:04:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=UokLJ6D7g4KqThgnGja/HJ4qvAnfI53nEWe3JpqcfOk=; b=ZKf+uwKwZjerubY6swHIMQhfwYYVUwq8WwvL5uTeM/DDT/Rhjft4zBroz3C6AWPiQ7 1t9nHKrq0nrRk3/qoxq2a503x9DOD2wjPXEHCRBQ57CNq2SWTHQcbd9YI76nFFx3ApKJ fvwyXg1FTIF1cNS35U79/fI9B2xOgwED+t9W36/JQs9Ngp2dHaeVv+W0w0J3WLu2zsCI Cuw5CudReqbPhd4HtcOBQoQ2Y0nw8PXP6Vltb0CuHCvIlUDmsdsgC1LpLtUzKjySONP0 AznQxtQSNAWglg4r5g5o/DNodvkTpZsRTFvf9hrUrTUPsvRUEcMfcbq770ajP0h8qxuq ZqVA== Received: by 10.66.76.170 with SMTP id l10mr6107588paw.57.1343401458552; Fri, 27 Jul 2012 08:04:18 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id nk3sm2062530pbc.27.2012.07.27.08.04.15 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 08:04:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 27 Jul 2012 17:02:50 +0200 Message-Id: <1343401379-19495-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343401379-19495-1-git-send-email-pbonzini@redhat.com> References: <1343401379-19495-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.213.173 Cc: Cong Meng , Sen Wang Subject: [Qemu-devel] [PATCH 23/32] scsi: introduce hotplug() and hot_unplug() interfaces for SCSI bus X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Cong Meng Add two interfaces hotplug() and hot_unplug() to scsi bus info. The scsi bus can implement these two interfaces to signal the HBA driver of guest kernel to add/remove the scsi device in question. Signed-off-by: Sen Wang Signed-off-by: Cong Meng [ Fixed braces and indentation - Paolo ] Signed-off-by: Paolo Bonzini --- hw/scsi-bus.c | 17 ++++++++++++++++- hw/scsi.h | 2 ++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 543d9d2..6ee0c10 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -186,6 +186,10 @@ static int scsi_qdev_init(DeviceState *qdev) dev); } + if (bus->info->hotplug) { + bus->info->hotplug(bus, dev); + } + err: return rc; } @@ -1650,6 +1654,17 @@ static int get_scsi_requests(QEMUFile *f, void *pv, size_t size) return 0; } +static int scsi_qdev_unplug(DeviceState *qdev) +{ + SCSIDevice *dev = SCSI_DEVICE(qdev); + SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, dev->qdev.parent_bus); + + if (bus->info->hot_unplug) { + bus->info->hot_unplug(bus, dev); + } + return qdev_simple_unplug_cb(qdev); +} + static const VMStateInfo vmstate_info_scsi_requests = { .name = "scsi-requests", .get = get_scsi_requests, @@ -1686,7 +1701,7 @@ static void scsi_device_class_init(ObjectClass *klass, void *data) DeviceClass *k = DEVICE_CLASS(klass); k->bus_type = TYPE_SCSI_BUS; k->init = scsi_qdev_init; - k->unplug = qdev_simple_unplug_cb; + k->unplug = scsi_qdev_unplug; k->exit = scsi_qdev_exit; k->props = scsi_props; } diff --git a/hw/scsi.h b/hw/scsi.h index fc9dc50..088d519 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -131,6 +131,8 @@ struct SCSIBusInfo { void (*transfer_data)(SCSIRequest *req, uint32_t arg); void (*complete)(SCSIRequest *req, uint32_t arg, size_t resid); void (*cancel)(SCSIRequest *req); + void (*hotplug)(SCSIBus *bus, SCSIDevice *dev); + void (*hot_unplug)(SCSIBus *bus, SCSIDevice *dev); QEMUSGList *(*get_sg_list)(SCSIRequest *req); void (*save_request)(QEMUFile *f, SCSIRequest *req);