Changeset 32983 in vbox for trunk/include/VBox

Timestamp:

Oct 7, 2010 3:14:54 PM (14 years ago)

Author:

vboxsync

Message:

LsiLogic: Suspend the VM on a recoverable error without changing the saved state format

Location:

trunk/include/VBox

Files:

• pdmifs.h (modified) (1 diff)
• scsi.h (modified) (1 diff)
• vscsi.h (modified) (2 diffs)

trunk/include/VBox/pdmifs.h

@@ -2639 +2639 @@
      * @param   pSCSIRequest  Pointer to the finished SCSI request.
      * @param   rcCompletion  SCSI_STATUS_* code for the completed request.
-     */
-     DECLR3CALLBACKMEMBER(int, pfnSCSIRequestCompleted, (PPDMISCSIPORT pInterface, PPDMSCSIREQUEST pSCSIRequest, int rcCompletion));
+     * @param   fRedo         Flag whether the request can to be redone
+     *                        when it failed.
+     * @param   rcReq         The status code the request completed with (VERR_*)
+     *                        Should be only used to choose the correct error message
+     *                        displayed to the user if the error can be fixed by him
+     *                        (fRedo is true).
+     */
+     DECLR3CALLBACKMEMBER(int, pfnSCSIRequestCompleted, (PPDMISCSIPORT pInterface, PPDMSCSIREQUEST pSCSIRequest,
+                                                         int rcCompletion, bool fRedo, int rcReq));
 
 } PDMISCSIPORT;
 /** PDMISCSIPORT interface ID. */
-#define PDMISCSIPORT_IID                        "0f894add-714d-4a77-818e-a32fe3586ba4"
+#define PDMISCSIPORT_IID                        "9d185b3b-1051-41f6-83ad-2a2a23f04e40"
 
 

trunk/include/VBox/scsi.h

@@ -179 +179 @@
 /* additional sense keys */
 #define SCSI_ASC_NONE                               0x00
+#define SCSI_ASC_WRITE_ERROR                        0x0c
 #define SCSI_ASC_READ_ERROR                         0x11
 #define SCSI_ASC_ILLEGAL_OPCODE                     0x20

trunk/include/VBox/vscsi.h

@@ -135 +135 @@
                                                void *pvVScsiDeviceUser,
                                                void *pvVScsiReqUser,
+                                               int rcScsiCode,
+                                               bool fRedoPossible,
                                                int rcReq);
 /** Pointer to a virtual SCSI request completed callback. */
@@ -253 +255 @@
  *                                  the LUN is called by the virtual SCSI layer.
  * @param   rcIoReq                 The status code the I/O request completed with.
- */
-VBOXDDU_DECL(int) VSCSIIoReqCompleted(VSCSIIOREQ hVScsiIoReq, int rcIoReq);
+ * @param   fRedoPossible           Flag whether it is possible to redo the request.
+ *                                  If true setting any sense code will be omitted
+ *                                  in case of an error to not alter the device state.
+ */
+VBOXDDU_DECL(int) VSCSIIoReqCompleted(VSCSIIOREQ hVScsiIoReq, int rcIoReq, bool fRedoPossible);
 
 /**