[RFC 20/22] migration: VMStateInfo: remove old .get / .set handlers

Vladimir Sementsov-Ogievskiy posted 22 patches 2 weeks, 2 days ago
[RFC 20/22] migration: VMStateInfo: remove old .get / .set handlers
Posted by Vladimir Sementsov-Ogievskiy 2 weeks, 2 days ago
They are unused now.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
 include/migration/vmstate.h |  5 -----
 migration/vmstate.c         | 14 +-------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index f0ffd8f9c5..aaeb33045e 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -41,11 +41,6 @@ typedef struct VMStateField VMStateField;
  */
 struct VMStateInfo {
     const char *name;
-    int coroutine_mixed_fn (*get)(QEMUFile *f, void *pv, size_t size,
-                                  const VMStateField *field);
-    int coroutine_mixed_fn (*put)(QEMUFile *f, void *pv, size_t size,
-                                  const VMStateField *field,
-                                  JSONWriter *vmdesc);
     bool coroutine_mixed_fn (*load)(QEMUFile *f, void *pv, size_t size,
                                     const VMStateField *field,
                                     Error **errp);
diff --git a/migration/vmstate.c b/migration/vmstate.c
index 1d291ff556..6f1e878f36 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -212,16 +212,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
                                              inner_field->struct_version_id,
                                              errp);
                 } else {
-                    if (inner_field->info->get) {
-                        ret = inner_field->info->get(f, curr_elem, size,
-                                                     inner_field);
-                        if (ret < 0) {
-                            error_setg(errp,
-                                       "Failed to load element of type %s for %s: "
-                                       "%d", inner_field->info->name,
-                                       inner_field->name, ret);
-                        }
-                    } else if (!inner_field->info->load(
+                    if (!inner_field->info->load(
                         f, curr_elem, size, inner_field, errp)) {
                             error_prepend(
                                 errp,
@@ -545,9 +536,6 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
                                                curr_elem, vmdesc_loop,
                                                inner_field->struct_version_id,
                                                errp);
-                } else if (inner_field->info->put) {
-                    ret = inner_field->info->put(f, curr_elem, size,
-                                                 inner_field, vmdesc_loop);
                 } else if (!inner_field->info->save(
                     f, curr_elem, size, inner_field, vmdesc_loop, errp)) {
                     ret = -EINVAL;
-- 
2.48.1