david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi-block: Support rerror/werror

Browse Source 
This makes the werror/rerror options available on the scsi-block device,
to allow user specify error handling policy similar to scsi-hd.

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170821141008.19383-5-famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Fam Zheng 2017-08-21 22:10:08 +08:00 committed by Paolo Bonzini
parent a485b23425
commit 14b207487f
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/scsi/scsi-disk.c
View File

@ -39,6 +39,7 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
#include "hw/block/block.h" #include "hw/block/block.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "scsi/scsi.h"
#ifdef __linux #ifdef __linux
#include <scsi/sg.h> #include <scsi/sg.h>
@ -106,7 +107,7 @@ typedef struct SCSIDiskState
bool tray_locked; bool tray_locked;
} SCSIDiskState; } SCSIDiskState;
static int scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_failed); static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_failed);
static void scsi_free_request(SCSIRequest *req) static void scsi_free_request(SCSIRequest *req)
{ {
@ -184,19 +185,10 @@ static bool scsi_disk_req_check_error(SCSIDiskReq *r, int ret, bool acct_failed)
return true; return true;
} }
if (ret < 0) { if (ret < 0 || (r->status && *r->status)) {
return scsi_handle_rw_error(r, -ret, acct_failed); return scsi_handle_rw_error(r, -ret, acct_failed);
} }
if (r->status && *r->status) {
if (acct_failed) {
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct);
}
scsi_req_complete(&r->req, *r->status);
return true;
}
return false; return false;
} }
@ -422,13 +414,13 @@ static void scsi_read_data(SCSIRequest *req)
} }
/* /*
* scsi_handle_rw_error has two return values. 0 means that the error * scsi_handle_rw_error has two return values. False means that the error
* must be ignored, 1 means that the error has been processed and the * must be ignored, true means that the error has been processed and the
* caller should not do anything else for this request. Note that * caller should not do anything else for this request. Note that
* scsi_handle_rw_error always manages its reference counts, independent * scsi_handle_rw_error always manages its reference counts, independent
* of the return value. * of the return value.
*/ */
static int scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_failed) static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_failed)
{ {
bool is_read = (r->req.cmd.mode == SCSI_XFER_FROM_DEV); bool is_read = (r->req.cmd.mode == SCSI_XFER_FROM_DEV);
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
@ -440,6 +432,11 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_failed)
block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct); block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct);
} }
switch (error) { switch (error) {
case 0:
/* The command has run, no need to fake sense. */
assert(r->status && *r->status);
scsi_req_complete(&r->req, *r->status);
break;
case ENOMEDIUM: case ENOMEDIUM:
scsi_check_condition(r, SENSE_CODE(NO_MEDIUM)); scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));
break; break;
@ -457,6 +454,18 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_failed)
break; break;
} }
} }
if (!error) {
assert(r->status && *r->status);
error = scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.sense));
if (error == ECANCELED || error == EAGAIN || error == ENOTCONN ||
error == 0) {
/* These errors are handled by guest. */
scsi_req_complete(&r->req, *r->status);
return true;
}
}
blk_error_action(s->qdev.conf.blk, action, is_read, error); blk_error_action(s->qdev.conf.blk, action, is_read, error);
if (action == BLOCK_ERROR_ACTION_STOP) { if (action == BLOCK_ERROR_ACTION_STOP) {
scsi_req_retry(&r->req); scsi_req_retry(&r->req);
@ -2972,6 +2981,7 @@ static const TypeInfo scsi_cd_info = {
#ifdef __linux__ #ifdef __linux__
static Property scsi_block_properties[] = { static Property scsi_block_properties[] = {
DEFINE_BLOCK_ERROR_PROPERTIES(SCSIDiskState, qdev.conf), \
DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.blk), DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.blk),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };