diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-09-25 12:29:17 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-09-27 11:44:18 +0100 |
| commit | 2f168d0708581c33baf6c78d75a89e8cd705f9f6 (patch) | |
| tree | fd78df5cfa57d44091879e6906fd4d5736e35747 /migration | |
| parent | 687433f61173a9ed80609f16f8bc4b9255bd815c (diff) | |
| download | qemu-2f168d0708581c33baf6c78d75a89e8cd705f9f6.zip | |
migration: Route more error paths
vmstate_save_state is called in lots of places.
Route error returns from the easier cases back up; there are lots
of more complex cases where their own error paths need fixing.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20170925112917.21340-7-dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Commit message fix up as Peter's review
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/vmstate-types.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c index c056c98bdb..48184c380d 100644 --- a/migration/vmstate-types.c +++ b/migration/vmstate-types.c @@ -550,13 +550,14 @@ static int put_tmp(QEMUFile *f, void *pv, size_t size, VMStateField *field, { const VMStateDescription *vmsd = field->vmsd; void *tmp = g_malloc(size); + int ret; /* Writes the parent field which is at the start of the tmp */ *(void **)tmp = pv; - vmstate_save_state(f, vmsd, tmp, vmdesc); + ret = vmstate_save_state(f, vmsd, tmp, vmdesc); g_free(tmp); - return 0; + return ret; } const VMStateInfo vmstate_info_tmp = { @@ -657,12 +658,16 @@ static int put_qtailq(QEMUFile *f, void *pv, size_t unused_size, /* offset of the QTAILQ entry in a QTAILQ element*/ size_t entry_offset = field->start; void *elm; + int ret; trace_put_qtailq(vmsd->name, vmsd->version_id); QTAILQ_RAW_FOREACH(elm, pv, entry_offset) { qemu_put_byte(f, true); - vmstate_save_state(f, vmsd, elm, vmdesc); + ret = vmstate_save_state(f, vmsd, elm, vmdesc); + if (ret) { + return ret; + } } qemu_put_byte(f, false); |