scsi-disk: add need_fua_emulation to SCSIDiskClass
scsi-block will be able to do FUA just by passing the request through to the LUN (which is also more efficient); there is no need to emulate it like we do for scsi-disk. Add a new method to distinguish this. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
fcaafb1001
commit
94f8ba1125
|
@ -66,6 +66,7 @@ typedef struct SCSIDiskClass {
|
||||||
SCSIDeviceClass parent_class;
|
SCSIDeviceClass parent_class;
|
||||||
DMAIOFunc *dma_readv;
|
DMAIOFunc *dma_readv;
|
||||||
DMAIOFunc *dma_writev;
|
DMAIOFunc *dma_writev;
|
||||||
|
bool (*need_fua_emulation)(SCSICommand *cmd);
|
||||||
} SCSIDiskClass;
|
} SCSIDiskClass;
|
||||||
|
|
||||||
typedef struct SCSIDiskReq {
|
typedef struct SCSIDiskReq {
|
||||||
|
@ -75,6 +76,7 @@ typedef struct SCSIDiskReq {
|
||||||
uint32_t sector_count;
|
uint32_t sector_count;
|
||||||
uint32_t buflen;
|
uint32_t buflen;
|
||||||
bool started;
|
bool started;
|
||||||
|
bool need_fua_emulation;
|
||||||
struct iovec iov;
|
struct iovec iov;
|
||||||
QEMUIOVector qiov;
|
QEMUIOVector qiov;
|
||||||
BlockAcctCookie acct;
|
BlockAcctCookie acct;
|
||||||
|
@ -236,7 +238,7 @@ static void scsi_write_do_fua(SCSIDiskReq *r)
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (scsi_is_cmd_fua(&r->req.cmd)) {
|
if (r->need_fua_emulation) {
|
||||||
block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, 0,
|
block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, 0,
|
||||||
BLOCK_ACCT_FLUSH);
|
BLOCK_ACCT_FLUSH);
|
||||||
r->req.aiocb = blk_aio_flush(s->qdev.conf.blk, scsi_aio_complete, r);
|
r->req.aiocb = blk_aio_flush(s->qdev.conf.blk, scsi_aio_complete, r);
|
||||||
|
@ -413,7 +415,7 @@ static void scsi_read_data(SCSIRequest *req)
|
||||||
|
|
||||||
first = !r->started;
|
first = !r->started;
|
||||||
r->started = true;
|
r->started = true;
|
||||||
if (first && scsi_is_cmd_fua(&r->req.cmd)) {
|
if (first && r->need_fua_emulation) {
|
||||||
block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, 0,
|
block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, 0,
|
||||||
BLOCK_ACCT_FLUSH);
|
BLOCK_ACCT_FLUSH);
|
||||||
r->req.aiocb = blk_aio_flush(s->qdev.conf.blk, scsi_do_read_cb, r);
|
r->req.aiocb = blk_aio_flush(s->qdev.conf.blk, scsi_do_read_cb, r);
|
||||||
|
@ -2153,6 +2155,7 @@ static int32_t scsi_disk_dma_command(SCSIRequest *req, uint8_t *buf)
|
||||||
{
|
{
|
||||||
SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
|
SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
|
||||||
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
|
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
|
||||||
|
SCSIDiskClass *sdc = (SCSIDiskClass *) object_get_class(OBJECT(s));
|
||||||
uint32_t len;
|
uint32_t len;
|
||||||
uint8_t command;
|
uint8_t command;
|
||||||
|
|
||||||
|
@ -2211,6 +2214,7 @@ static int32_t scsi_disk_dma_command(SCSIRequest *req, uint8_t *buf)
|
||||||
scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
|
scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
r->need_fua_emulation = sdc->need_fua_emulation(&r->req.cmd);
|
||||||
if (r->sector_count == 0) {
|
if (r->sector_count == 0) {
|
||||||
scsi_req_complete(&r->req, GOOD);
|
scsi_req_complete(&r->req, GOOD);
|
||||||
}
|
}
|
||||||
|
@ -2700,6 +2704,7 @@ static void scsi_disk_base_class_initfn(ObjectClass *klass, void *data)
|
||||||
dc->reset = scsi_disk_reset;
|
dc->reset = scsi_disk_reset;
|
||||||
sdc->dma_readv = scsi_dma_readv;
|
sdc->dma_readv = scsi_dma_readv;
|
||||||
sdc->dma_writev = scsi_dma_writev;
|
sdc->dma_writev = scsi_dma_writev;
|
||||||
|
sdc->need_fua_emulation = scsi_is_cmd_fua;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo scsi_disk_base_info = {
|
static const TypeInfo scsi_disk_base_info = {
|
||||||
|
|
Loading…
Reference in a new issue