Changeset 23752 in vbox for trunk/include/VBox

Timestamp:

Oct 14, 2009 10:12:28 AM (15 years ago)

Author:

vboxsync

Message:

SSM: Implemented SSMR3GetStructEx and SSMR3PutStructEx.

Location:

trunk/include/VBox

Files:

• err.h (modified) (1 diff)
• ssm.h (modified) (2 diffs)

trunk/include/VBox/err.h

@@ -600 +600 @@
 /** Complex SSM field fed to SSMR3PutStruct or SSMR3GetStruct.  Use the
  * extended API. */
-#define VERR_SSM_COMPLEX_FIELD                  (-1864)
+#define VERR_SSM_FIELD_COMPLEX                  (-1864)
 /** Invalid size of a SSM field with the specified transformation. */
-#define VERR_SSM_INVALID_FIELD_SIZE             (-1865)
+#define VERR_SSM_FIELD_INVALID_SIZE             (-1865)
+/** The specified field is outside the structure.  */
+#define VERR_SSM_FIELD_OUT_OF_BOUNDS            (-1866)
+/** The field does not follow immediately the previous one. */
+#define VERR_SSM_FIELD_NOT_CONSECUTIVE          (-1867)
+/** The field contains an invalid callback or transformation index. */
+#define VERR_SSM_FIELD_INVALID_CALLBACK         (-1868)
 /** @} */
 

trunk/include/VBox/ssm.h

@@ -176 +176 @@
 #define SSMFIELD_ENTRY_HCPTR(Type, Field)   SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_HCPTR)
 /** Emit a SSMFIELD array entry for a field that can be ignored.
- * It is stored if SSMSTRUCT_FLAGS_DONT_IGNORE is specified to SSMR3PutStructEx.
- * It is skipped if SSMSTRUCT_FLAGS_DONT_IGNORE is specified to
- * SSMR3GetStructEx, the structure member is never touched on restore. */
+ * It is stored as zeros if SSMSTRUCT_FLAGS_DONT_IGNORE is specified to
+ * SSMR3PutStructEx.  The member is never touched upon restore. */
 #define SSMFIELD_ENTRY_IGNORE(Type, Field)  SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_IGNORE)
 /** Emit a SSMFIELD array entry for a field with a custom callback. */
@@ -191 +190 @@
 /** The field descriptors must exactly cover the entire struct, A to Z. */
 #define SSMSTRUCT_FLAGS_FULL_STRUCT         RT_BIT_32(0)
+/** No start and end markers, just the raw bits. */
+#define SSMSTRUCT_FLAGS_NO_MARKERS          RT_BIT_32(1)
 /** Do not ignore any ignorable fields. */
-#define SSMSTRUCT_FLAGS_DONT_IGNORE         RT_BIT_32(1)
+#define SSMSTRUCT_FLAGS_DONT_IGNORE         RT_BIT_32(2)
 /** Band-aid for old SSMR3PutMem/SSMR3GetMem of structurs with host pointers. */
-#define SSMSTRUCT_FLAGS_MEM_BAND_AID        (SSMSTRUCT_FLAGS_DONT_IGNORE | SSMSTRUCT_FLAGS_FULL_STRUCT)
+#define SSMSTRUCT_FLAGS_MEM_BAND_AID        (SSMSTRUCT_FLAGS_DONT_IGNORE | SSMSTRUCT_FLAGS_FULL_STRUCT | SSMSTRUCT_FLAGS_NO_MARKERS)
+/** Mask of the valid bits. */
+#define SSMSTRUCT_FLAGS_VALID_MASK          UINT32_C(0x00000007)
 /** @} */