They are unused now.
Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]>
---
include/migration/vmstate.h | 8 --------
migration/vmstate.c | 20 ++------------------
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 1b7f295417e..5e53440115e 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -39,17 +39,9 @@ typedef struct VMStateField VMStateField;
* these two parameters should only be used in cases when customized
* handling is needed, such as QTAILQ. For primitive data types such as
* integer, field and vmdesc parameters should be ignored inside load/save.
- *
- * @get and @put are deprecated copies of @load and @save. For new interfaces
- * use @load and @save.
*/
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 50ebe378452..a4cf9214d54 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -189,18 +189,9 @@ static bool vmstate_load_field(QEMUFile *f, void *pv,
size_t size,
} else if (field->flags & VMS_VSTRUCT) {
return vmstate_load_vmsd(f, field->vmsd, pv, field->struct_version_id,
errp);
- } else if (field->info->load) {
- return field->info->load(f, pv, size, field, errp);
}
- if (field->info->get(f, pv, size, field) < 0) {
- error_setg(errp,
- "Failed to load element of type %s for %s",
- field->info->name, field->name);
- return false;
- }
-
- return true;
+ return field->info->load(f, pv, size, field, errp);
}
static bool vmstate_post_load(const VMStateDescription *vmsd,
@@ -583,16 +574,9 @@ static bool vmstate_save_field(QEMUFile *f, void *pv,
size_t size,
} else if (field->flags & VMS_VSTRUCT) {
return vmstate_save_vmsd_v(f, field->vmsd, pv, vmdesc,
field->struct_version_id, errp);
- } else if (field->info->save) {
- return field->info->save(f, pv, size, field, vmdesc, errp);
}
- if (field->info->put(f, pv, size, field, vmdesc) < 0) {
- error_setg(errp, "put failed");
- return false;
- }
-
- return true;
+ return field->info->save(f, pv, size, field, vmdesc, errp);
}
/*
--
2.43.0
