OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

scsi: introduce hotplug() and hot_unplug() interfaces for SCSI bus

Browse Source 
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 <senwang@linux.vnet.ibm.com>
Signed-off-by: Cong Meng <mc@linux.vnet.ibm.com>
[ Fixed braces and indentation - Paolo ]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Cong Meng 2012-06-20 14:47:10 +08:00 committed by Paolo Bonzini
parent 814589c450
commit 350e6e4199
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/scsi-bus.c
View File

@ -186,6 +186,10 @@ static int scsi_qdev_init(DeviceState *qdev)
dev); dev);
} }
if (bus->info->hotplug) {
bus->info->hotplug(bus, dev);
}
err: err:
return rc; return rc;
} }
@ -1650,6 +1654,17 @@ static int get_scsi_requests(QEMUFile *f, void *pv, size_t size)
return 0; 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 = { static const VMStateInfo vmstate_info_scsi_requests = {
.name = "scsi-requests", .name = "scsi-requests",
.get = get_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); DeviceClass *k = DEVICE_CLASS(klass);
k->bus_type = TYPE_SCSI_BUS; k->bus_type = TYPE_SCSI_BUS;
k->init = scsi_qdev_init; k->init = scsi_qdev_init;
k->unplug = qdev_simple_unplug_cb; k->unplug = scsi_qdev_unplug;
k->exit = scsi_qdev_exit; k->exit = scsi_qdev_exit;
k->props = scsi_props; k->props = scsi_props;
} }

2
hw/scsi.h
View File

@ -131,6 +131,8 @@ struct SCSIBusInfo {
void (*transfer_data)(SCSIRequest *req, uint32_t arg); void (*transfer_data)(SCSIRequest *req, uint32_t arg);
void (*complete)(SCSIRequest *req, uint32_t arg, size_t resid); void (*complete)(SCSIRequest *req, uint32_t arg, size_t resid);
void (*cancel)(SCSIRequest *req); void (*cancel)(SCSIRequest *req);
void (*hotplug)(SCSIBus *bus, SCSIDevice *dev);
void (*hot_unplug)(SCSIBus *bus, SCSIDevice *dev);
QEMUSGList *(*get_sg_list)(SCSIRequest *req); QEMUSGList *(*get_sg_list)(SCSIRequest *req);
void (*save_request)(QEMUFile *f, SCSIRequest *req); void (*save_request)(QEMUFile *f, SCSIRequest *req);