mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Correctly handle subsections with no 'needed' function

Browse Source 
Currently the vmstate subsection handling code treats a subsection
with no 'needed' function pointer as if it were the subsection
list terminator, so the subsection is never transferred and nor
is any subsection following it in the list.

Handle NULL 'needed' function pointers in subsections in the same
way that we do for top level VMStateDescription structures:
treat the subsection as always being needed.

This doesn't change behaviour for the current set of devices
in the tree, because all subsections declare a 'needed' function.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Peter Maydell 2018-08-07 14:03:55 +01:00 committed by Juan Quintela
parent be1d2c49ea
commit 6f4923fcad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/vmstate.c
View File

@ -418,7 +418,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
static const VMStateDescription * static const VMStateDescription *
vmstate_get_subsection(const VMStateDescription **sub, char *idstr) vmstate_get_subsection(const VMStateDescription **sub, char *idstr)
{ {
while (sub && *sub && (*sub)->needed) { while (sub && *sub) {
if (strcmp(idstr, (*sub)->name) == 0) { if (strcmp(idstr, (*sub)->name) == 0) {
return *sub; return *sub;
} }
@ -486,8 +486,8 @@ static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,
int ret = 0; int ret = 0;
trace_vmstate_subsection_save_top(vmsd->name); trace_vmstate_subsection_save_top(vmsd->name);
while (sub && *sub && (*sub)->needed) { while (sub && *sub) {
if ((*sub)->needed(opaque)) { if (vmstate_save_needed(*sub, opaque)) {
const VMStateDescription *vmsdsub = *sub; const VMStateDescription *vmsdsub = *sub;
uint8_t len; uint8_t len;