migration: vmstate_load_state(): add some newlines
Split logical blocks by newlines, that simplify reading the code. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Reviewed-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Peter Xu <peterx@redhat.com> Link: https://lore.kernel.org/qemu-devel/20260304212303.667141-5-vsementsov@yandex-team.ru Signed-off-by: Fabiano Rosas <farosas@suse.de>
Vladimir Sementsov-Ogievskiy committed
Mar 5, 2026 at 00:22 UTC
b19d34c18b3e4bd5485912a68dc22e48900e2f18
1 file changed
+12
migration/vmstate.c
+12
@@ -139,6 +139,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
139
int ret = 0;
140
141
trace_vmstate_load_state(vmsd->name, version_id);
142
+
143
if (version_id > vmsd->version_id) {
144
error_setg(errp, "%s: incoming version_id %d is too new "
145
"for local version_id %d",
@@ -146,6 +147,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
147
trace_vmstate_load_state_end(vmsd->name, "too new", -EINVAL);
148
return -EINVAL;
149
}
150
+
151
if (version_id < vmsd->minimum_version_id) {
152
error_setg(errp, "%s: incoming version_id %d is too old "
153
"for local minimum version_id %d",
@@ -153,6 +155,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
155
trace_vmstate_load_state_end(vmsd->name, "too old", -EINVAL);
156
return -EINVAL;
157
}
158
+
159
if (vmsd->pre_load_errp) {
160
if (!vmsd->pre_load_errp(opaque, errp)) {
161
error_prepend(errp, "pre load hook failed for: '%s', "
@@ -171,9 +174,12 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
174
return ret;
175
}
176
}
177
+
178
while (field->name) {
179
bool exists = vmstate_field_exists(vmsd, field, opaque, version_id);
180
+
181
trace_vmstate_load_state_field(vmsd->name, field->name, exists);
182
+
183
if (exists) {
184
void *first_elem = opaque + field->offset;
185
int i, n_elems = vmstate_n_elems(opaque, field);
@@ -184,6 +190,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
190
first_elem = *(void **)first_elem;
191
assert(first_elem || !n_elems || !size);
192
}
193
+
194
for (i = 0; i < n_elems; i++) {
195
void *curr_elem = first_elem + size * i;
196
const VMStateField *inner_field;
@@ -235,6 +242,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
242
vmsd->name, ret);
243
}
244
}
245
+
246
if (ret < 0) {
247
qemu_file_set_error(f, ret);
248
trace_vmstate_load_field_error(field->name, ret);
@@ -249,11 +257,13 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
257
field++;
258
}
259
assert(field->flags == VMS_END);
260
+
261
ret = vmstate_subsection_load(f, vmsd, opaque, errp);
262
if (ret != 0) {
263
qemu_file_set_error(f, ret);
264
return ret;
265
}
266
+
267
if (vmsd->post_load_errp) {
268
if (!vmsd->post_load_errp(opaque, version_id, errp)) {
269
error_prepend(errp, "post load hook failed for: %s, version_id: "
@@ -271,7 +281,9 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
281
ret);
282
}
283
}
284
+
285
trace_vmstate_load_state_end(vmsd->name, "end", ret);
286
+
287
return ret;
288
}
289