[Qemu-devel] [PATCH 07/14] scsi-disk: add dpofua property

[Paolo Bonzini]

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 pbonz...@redhat.com
---
 hw/scsi-disk.c |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index e04b469..e0f1821 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(),
 };
 
-- 
1.7.9.3

Re: [Qemu-devel] [PATCH 07/14] scsi-disk: add dpofua property

[Stefan Weil]

Am 04.05.2012 10:45, schrieb Paolo Bonzini:

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 Bonzinipbonz...@redhat.com
---
  hw/scsi-disk.c |7 ++-
  1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index e04b469..e0f1821 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




ERROR: code indent should never use tabs
#24: FILE: hw/scsi-disk.c:65:
+#define SCSI_DISK_F_DPOFUA^I1$

total: 1 errors, 0 warnings, 31 lines checked

0007-scsi-disk-add-dpofua-property.patch has style problems, please 
review.  If any of these errors

are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.