|
 |
70114f |
From 105071cc70a454680e6bf11e2d9d7b73c7ce7491 Mon Sep 17 00:00:00 2001
|
|
|
70114f |
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
|
70114f |
Date: Thu, 3 Apr 2014 19:50:31 +0300
|
|
|
70114f |
Subject: [PATCH] vmstate: add VMS_MUST_EXIST
|
|
|
70114f |
|
|
|
70114f |
Can be used to verify a required field exists or validate
|
|
|
70114f |
state in some other way.
|
|
|
70114f |
|
|
|
70114f |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
70114f |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
70114f |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
70114f |
(cherry picked from commit 5bf81c8d63db0216a4d29dc87f9ce530bb791dd1)
|
|
|
70114f |
---
|
|
|
70114f |
include/migration/vmstate.h | 1 +
|
|
|
70114f |
vmstate.c | 10 ++++++++++
|
|
|
70114f |
2 files changed, 11 insertions(+)
|
|
|
70114f |
|
|
|
70114f |
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
|
|
|
70114f |
index e7e1705..de970ab 100644
|
|
|
70114f |
--- a/include/migration/vmstate.h
|
|
|
70114f |
+++ b/include/migration/vmstate.h
|
|
|
70114f |
@@ -100,6 +100,7 @@ enum VMStateFlags {
|
|
|
70114f |
VMS_MULTIPLY = 0x200, /* multiply "size" field by field_size */
|
|
|
70114f |
VMS_VARRAY_UINT8 = 0x400, /* Array with size in uint8_t field*/
|
|
|
70114f |
VMS_VARRAY_UINT32 = 0x800, /* Array with size in uint32_t field*/
|
|
|
70114f |
+ VMS_MUST_EXIST = 0x1000, /* Field must exist in input */
|
|
|
70114f |
};
|
|
|
70114f |
|
|
|
70114f |
typedef struct {
|
|
|
70114f |
diff --git a/vmstate.c b/vmstate.c
|
|
|
70114f |
index b689f2f..d856319 100644
|
|
|
70114f |
--- a/vmstate.c
|
|
|
70114f |
+++ b/vmstate.c
|
|
|
70114f |
@@ -78,6 +78,10 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
|
|
|
70114f |
return ret;
|
|
|
70114f |
}
|
|
|
70114f |
}
|
|
|
70114f |
+ } else if (field->flags & VMS_MUST_EXIST) {
|
|
|
70114f |
+ fprintf(stderr, "Input validation failed: %s/%s\n",
|
|
|
70114f |
+ vmsd->name, field->name);
|
|
|
70114f |
+ return -1;
|
|
|
70114f |
}
|
|
|
70114f |
field++;
|
|
|
70114f |
}
|
|
|
70114f |
@@ -138,6 +142,12 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
|
|
|
70114f |
field->info->put(f, addr, size);
|
|
|
70114f |
}
|
|
|
70114f |
}
|
|
|
70114f |
+ } else {
|
|
|
70114f |
+ if (field->flags & VMS_MUST_EXIST) {
|
|
|
70114f |
+ fprintf(stderr, "Output state validation failed: %s/%s\n",
|
|
|
70114f |
+ vmsd->name, field->name);
|
|
|
70114f |
+ assert(!(field->flags & VMS_MUST_EXIST));
|
|
|
70114f |
+ }
|
|
|
70114f |
}
|
|
|
70114f |
field++;
|
|
|
70114f |
}
|