diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-05-01 10:25:16 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-05-07 08:44:19 +0200 |
| commit | da8365dbab51c445832137aa637bb5b990174b24 (patch) | |
| tree | 78b11e4ace390d58585fb0561a5c2ec3536bee0f | |
| parent | bfe3d7ac6d838b1931678d96d01c45d84c7e3de8 (diff) | |
| download | qemu-da8365dbab51c445832137aa637bb5b990174b24.zip qemu-da8365dbab51c445832137aa637bb5b990174b24.tar.gz qemu-da8365dbab51c445832137aa637bb5b990174b24.tar.bz2 | |
scsi-disk: add dpofua property
Linux expects REQ_FUA to be advertised only if WRITE+FUA is faster than
WRITE+SYNCHRONIZE CACHE, so we should not set the DPOFUA bit. However,
it is useful to have it for testing purposes, so add a qdev property to
set it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/scsi-disk.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index b1f5ef0..43726ff 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -62,6 +62,7 @@ typedef struct SCSIDiskReq { } SCSIDiskReq; #define SCSI_DISK_F_REMOVABLE 0 +#define SCSI_DISK_F_DPOFUA 1 struct SCSIDiskState { @@ -1103,7 +1104,7 @@ static int scsi_disk_emulate_mode_sense(SCSIDiskReq *r, uint8_t *outbuf) p = outbuf; if (s->qdev.type == TYPE_DISK) { - dev_specific_param = 0x10; /* DPOFUA */ + dev_specific_param = s->features & (1 << SCSI_DISK_F_DPOFUA) ? 0x10 : 0; if (bdrv_is_read_only(s->qdev.conf.bs)) { dev_specific_param |= 0x80; /* Readonly. */ } @@ -1935,6 +1936,8 @@ static Property scsi_hd_properties[] = { DEFINE_SCSI_DISK_PROPERTIES(), DEFINE_PROP_BIT("removable", SCSIDiskState, features, SCSI_DISK_F_REMOVABLE, false), + DEFINE_PROP_BIT("dpofua", SCSIDiskState, features, + SCSI_DISK_F_DPOFUA, false), DEFINE_PROP_END_OF_LIST(), }; @@ -2038,6 +2041,8 @@ static Property scsi_disk_properties[] = { DEFINE_SCSI_DISK_PROPERTIES(), DEFINE_PROP_BIT("removable", SCSIDiskState, features, SCSI_DISK_F_REMOVABLE, false), + DEFINE_PROP_BIT("dpofua", SCSIDiskState, features, + SCSI_DISK_F_DPOFUA, false), DEFINE_PROP_END_OF_LIST(), }; |