Convert them to bool return value, as preparation to further convertion of vmstate_save/load_state().
Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]> --- migration/vmstate.c | 55 +++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/migration/vmstate.c b/migration/vmstate.c index 6f1e878f36..2298f190de 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -21,11 +21,11 @@ #include "qemu/error-report.h" #include "trace.h" -static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, - void *opaque, JSONWriter *vmdesc, - Error **errp); -static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, - void *opaque, Error **errp); +static bool vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, + void *opaque, JSONWriter *vmdesc, + Error **errp); +static bool vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, + void *opaque, Error **errp); /* Whether this field should exist for either save or load the VM? */ static bool @@ -249,10 +249,9 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, field++; } assert(field->flags == VMS_END); - ret = vmstate_subsection_load(f, vmsd, opaque, errp); - if (ret != 0) { - qemu_file_set_error(f, ret); - return ret; + if (!vmstate_subsection_load(f, vmsd, opaque, errp)) { + qemu_file_set_error(f, -EINVAL); + return false; } if (vmsd->post_load_errp) { if (!vmsd->post_load_errp(opaque, version_id, errp)) { @@ -584,7 +583,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd, json_writer_end_array(vmdesc); } - ret = vmstate_subsection_save(f, vmsd, opaque, vmdesc, errp); + ret = vmstate_subsection_save(f, vmsd, opaque, vmdesc, errp) ? 0 : -EINVAL; if (vmsd->post_save) { int ps_ret = vmsd->post_save(opaque); @@ -610,15 +609,14 @@ vmstate_get_subsection(const VMStateDescription * const *sub, return NULL; } -static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, - void *opaque, Error **errp) +static bool vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, + void *opaque, Error **errp) { ERRP_GUARD(); trace_vmstate_subsection_load(vmsd->name); while (qemu_peek_byte(f, 0) == QEMU_VM_SUBSECTION) { char idstr[256], *idstr_ret; - int ret; uint8_t version_id, len, size; const VMStateDescription *sub_vmsd; @@ -626,12 +624,12 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, if (len < strlen(vmsd->name) + 1) { /* subsection name has to be "section_name/a" */ trace_vmstate_subsection_load_bad(vmsd->name, "(short)", ""); - return 0; + return true; } size = qemu_peek_buffer(f, (uint8_t **)&idstr_ret, len, 2); if (size != len) { trace_vmstate_subsection_load_bad(vmsd->name, "(peek fail)", ""); - return 0; + return true; } memcpy(idstr, idstr_ret, size); idstr[size] = 0; @@ -646,34 +644,32 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, trace_vmstate_subsection_load_bad(vmsd->name, idstr, "(lookup)"); error_setg(errp, "VM subsection '%s' in '%s' does not exist", idstr, vmsd->name); - return -ENOENT; + return false; } qemu_file_skip(f, 1); /* subsection */ qemu_file_skip(f, 1); /* len */ qemu_file_skip(f, len); /* idstr */ version_id = qemu_get_be32(f); - ret = vmstate_load_state(f, sub_vmsd, opaque, version_id, errp); - if (ret) { + if (!vmstate_load_vmsd(f, sub_vmsd, opaque, version_id, errp)) { trace_vmstate_subsection_load_bad(vmsd->name, idstr, "(child)"); error_prepend(errp, - "Loading VM subsection '%s' in '%s' failed: %d: ", - idstr, vmsd->name, ret); - return ret; + "Loading VM subsection '%s' in '%s' failed: ", + idstr, vmsd->name); + return false; } } trace_vmstate_subsection_load_good(vmsd->name); - return 0; + return true; } -static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, - void *opaque, JSONWriter *vmdesc, - Error **errp) +static bool vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, + void *opaque, JSONWriter *vmdesc, + Error **errp) { const VMStateDescription * const *sub = vmsd->subsections; bool vmdesc_has_subsections = false; - int ret = 0; trace_vmstate_subsection_save_top(vmsd->name); while (sub && *sub) { @@ -697,9 +693,8 @@ static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, qemu_put_byte(f, len); qemu_put_buffer(f, (uint8_t *)vmsdsub->name, len); qemu_put_be32(f, vmsdsub->version_id); - ret = vmstate_save_state(f, vmsdsub, opaque, vmdesc, errp); - if (ret) { - return ret; + if (!vmstate_save_vmsd(f, vmsdsub, opaque, vmdesc, errp)) { + return false; } if (vmdesc) { @@ -713,5 +708,5 @@ static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, json_writer_end_array(vmdesc); } - return ret; + return true; } -- 2.48.1
