From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Slcvx-0003XA-5z for qemu-devel@nongnu.org; Mon, 02 Jul 2012 05:28:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Slcvq-00036L-TF for qemu-devel@nongnu.org; Mon, 02 Jul 2012 05:28:40 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:59173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Slcvq-00035y-KY for qemu-devel@nongnu.org; Mon, 02 Jul 2012 05:28:34 -0400 Received: by wibhm2 with SMTP id hm2so2417179wib.10 for ; Mon, 02 Jul 2012 02:28:32 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 2 Jul 2012 11:28:25 +0200 Message-Id: <1341221307-24397-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1341221307-24397-1-git-send-email-pbonzini@redhat.com> References: <1341221307-24397-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] scsi: introduce hotplug() and hot_unplug() interfaces for SCSI bus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mc@linux.vnet.ibm.com, Sen Wang 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 14e2f73..a5a5982 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; } @@ -1571,6 +1575,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, @@ -1607,7 +1622,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 76f06d4..dd1cd45 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -130,6 +130,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); -- 1.7.10.2