aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorHalil Pasic <pasic@linux.vnet.ibm.com>2017-06-23 16:48:23 +0200
committerJuan Quintela <quintela@redhat.com>2017-06-28 11:18:44 +0200
commitd2164ad35c411d97abd2aa5c6f160283d215e214 (patch)
treefffb1821aade0b81089fc02cd5d6880024a265b0 /migration
parent01f6e14c78f480ade5521139019fdf930a7affaa (diff)
downloadqemu-d2164ad35c411d97abd2aa5c6f160283d215e214.zip
qemu-d2164ad35c411d97abd2aa5c6f160283d215e214.tar.gz
qemu-d2164ad35c411d97abd2aa5c6f160283d215e214.tar.bz2
vmstate: error hint for failed equal checks
In some cases a failing VMSTATE_*_EQUAL does not mean we detected a bug, but it's actually the best we can do. Especially in these cases a verbose error message is required. Let's introduce infrastructure for specifying a error hint to be used if equal check fails. Let's do this by adding a parameter to the _EQUAL macros called _err_hint. Also change all current users to pass NULL as last parameter so nothing changes for them. Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com> Message-Id: <20170623144823.42936-1-pasic@linux.vnet.ibm.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/vmstate-types.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
index 02f05a3..c056c98 100644
--- a/migration/vmstate-types.c
+++ b/migration/vmstate-types.c
@@ -126,6 +126,9 @@ static int get_int32_equal(QEMUFile *f, void *pv, size_t size,
return 0;
}
error_report("%" PRIx32 " != %" PRIx32, *v, v2);
+ if (field->err_hint) {
+ error_printf("%s\n", field->err_hint);
+ }
return -EINVAL;
}
@@ -267,6 +270,9 @@ static int get_uint32_equal(QEMUFile *f, void *pv, size_t size,
return 0;
}
error_report("%" PRIx32 " != %" PRIx32, *v, v2);
+ if (field->err_hint) {
+ error_printf("%s\n", field->err_hint);
+ }
return -EINVAL;
}
@@ -341,6 +347,9 @@ static int get_uint64_equal(QEMUFile *f, void *pv, size_t size,
return 0;
}
error_report("%" PRIx64 " != %" PRIx64, *v, v2);
+ if (field->err_hint) {
+ error_printf("%s\n", field->err_hint);
+ }
return -EINVAL;
}
@@ -364,6 +373,9 @@ static int get_uint8_equal(QEMUFile *f, void *pv, size_t size,
return 0;
}
error_report("%x != %x", *v, v2);
+ if (field->err_hint) {
+ error_printf("%s\n", field->err_hint);
+ }
return -EINVAL;
}
@@ -387,6 +399,9 @@ static int get_uint16_equal(QEMUFile *f, void *pv, size_t size,
return 0;
}
error_report("%x != %x", *v, v2);
+ if (field->err_hint) {
+ error_printf("%s\n", field->err_hint);
+ }
return -EINVAL;
}