[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] scsi: add free_request callback
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 1/6] scsi: add free_request callback |
Date: |
Thu, 12 Jul 2012 15:08:34 +0200 |
From: Paolo Bonzini <address@hidden>
Most device models have a simple lifecycle for the hba_private field
and they can free it when a request is completed or cancelled.
However, in some cases it may be simpler to tie the lifetime
of hba_private to that of the included SCSIRequest. This patch
adds a free_request callback to SCSIBusInfo that lets an HBA
device model do exactly that.
Normally, device models use req->hba_private == NULL to flag requests
that have been completed already. Device models that use free_request
will still need to track this using a flag. This is the reason why
"converting" existing HBAs to use free_request adds complexity and
makes little sense. It is simply an additional convenience that is
provided by the SCSI layer. USB-attached storage will be the first
user.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/scsi-bus.c | 5 +++++
hw/scsi.h | 1 +
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 5ad1013..dc74063 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -1354,6 +1354,7 @@ static const char *scsi_command_name(uint8_t cmd)
SCSIRequest *scsi_req_ref(SCSIRequest *req)
{
+ assert(req->refcount > 0);
req->refcount++;
return req;
}
@@ -1362,6 +1363,10 @@ void scsi_req_unref(SCSIRequest *req)
{
assert(req->refcount > 0);
if (--req->refcount == 0) {
+ SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, req->dev->qdev.parent_bus);
+ if (bus->info->free_request && req->hba_private) {
+ bus->info->free_request(bus, req->hba_private);
+ }
if (req->ops->free_req) {
req->ops->free_req(req);
}
diff --git a/hw/scsi.h b/hw/scsi.h
index 76f06d4..367a346 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -134,6 +134,7 @@ struct SCSIBusInfo {
void (*save_request)(QEMUFile *f, SCSIRequest *req);
void *(*load_request)(QEMUFile *f, SCSIRequest *req);
+ void (*free_request)(SCSIBus *bus, void *priv);
};
#define TYPE_SCSI_BUS "SCSI"
--
1.7.1
- [Qemu-devel] [PULL 0/6] usb patch queue, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 3/6] uhci: initialize expire_time when loading v1 vmstate, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 5/6] ehci: implement Interrupt Threshold Control support, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 4/6] ehci: raise irq in the frame timer, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 1/6] scsi: add free_request callback,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 6/6] ehci: improve expire time calculation, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 2/6] usb: add usb attached scsi emulation, Gerd Hoffmann, 2012/07/12