Skip to contentSkip to conversation

migration: Remove unused and deprecated load_state_old

PATCH New Juan Quintela 1 participant 2 messages Jan 25, 2022

lore
Share & tools
lore
#0 lore raw

cover migration: Remove unused and deprecated load_state_old

Based-on: <[email protected]> [PATCH] Remove unnecessary minimum_version_id_old fields

After applying this patch, there is other use of load_state_old and minimum_version_id_old. As there already were deprecated, just remove them.

Juan Quintela (1):
migration: Remove unused minimum_version_id_old and load_state_old

 docs/devel/migration.rst    | 7 +------
 include/migration/vmstate.h | 2 --
 migration/vmstate.c         | 6 ------
 3 files changed, 1 insertion(+), 14 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/1 migration: Remove unused minimum_version_id_old and load_state_old

They were already deprecated and after ppc removal no users on the tree. RIP.

---
 docs/devel/migration.rst    | 7 +------
 include/migration/vmstate.h | 2 --
 migration/vmstate.c         | 6 ------
 3 files changed, 1 insertion(+), 14 deletions(-)
docs/devel/migration.rst +1 -6
index 2401253482..98c5e4a13f 100644
@@ -394,14 +394,9 @@ You can see that there are several version fields:
 - ``version_id``: the maximum version_id supported by VMState for that device.
 - ``minimum_version_id``: the minimum version_id that VMState is able to understand
   for that device.
-- ``minimum_version_id_old``: For devices that were not able to port to vmstate, we can
-  assign a function that knows how to read this old state. This field is
-  ignored if there is no ``load_state_old`` handler.
 
 VMState is able to read versions from minimum_version_id to
-version_id.  And the function ``load_state_old()`` (if present) is able to
-load state from minimum_version_id_old to minimum_version_id.  This
-function is deprecated and will be removed when no more users are left.
+version_id.
 
 There are *_V* forms of many ``VMSTATE_`` macros to load fields for version dependent fields,
 e.g.
include/migration/vmstate.h +0 -2
index 017c03675c..ad24aa1934 100644
@@ -181,9 +181,7 @@ struct VMStateDescription {
     int unmigratable;
     int version_id;
     int minimum_version_id;
-    int minimum_version_id_old;
     MigrationPriority priority;
-    LoadStateHandler *load_state_old;
     int (*pre_load)(void *opaque);
     int (*post_load)(void *opaque, int version_id);
     int (*pre_save)(void *opaque);
migration/vmstate.c +0 -6
index 05f87cdddc..36ae8b9e19 100644
@@ -90,12 +90,6 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
         return -EINVAL;
     }
     if  (version_id < vmsd->minimum_version_id) {
-        if (vmsd->load_state_old &&
-            version_id >= vmsd->minimum_version_id_old) {
-            ret = vmsd->load_state_old(f, opaque, version_id);
-            trace_vmstate_load_state_end(vmsd->name, "old path", ret);
-            return ret;
-        }
         error_report("%s: incoming version_id %d is too old "
                      "for local minimum version_id  %d",
                      vmsd->name, version_id, vmsd->minimum_version_id);
Signature · 1 line
2.34.1