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

migration: Introduce qemu_savevm_send_* helpers

Browse Source 
Split qemu_savevm_state_header() into two parts.   This paves way for a
reuse elsewhere.

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Peter Xu <peterx@redhat.com>
Tested-by: Lukas Straub <lukasstraub2@web.de>
Link: https://lore.kernel.org/qemu-devel/20260127185254.3954634-2-peterx@redhat.com
Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
Peter Xu
2026-01-27 13:52:31 -05:00
committed by Fabiano Rosas
parent 3a4aa17821
commit fd5d166faf
2 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
migration/savevm.c
View File

@@ -1282,38 +1282,48 @@ void qemu_savevm_non_migratable_list(strList **reasons)
}
}
void qemu_savevm_state_header(QEMUFile *f)
void qemu_savevm_send_header(QEMUFile *f)
{
MigrationState *s = migrate_get_current();
JSONWriter *vmdesc = s->vmdesc;
Error *local_err = NULL;
trace_savevm_state_header();
qemu_put_be32(f, QEMU_VM_FILE_MAGIC);
qemu_put_be32(f, QEMU_VM_FILE_VERSION);
}
static void qemu_savevm_send_configuration(MigrationState *s, QEMUFile *f)
{
JSONWriter *vmdesc = s->vmdesc;
Error *local_err = NULL;
qemu_put_byte(f, QEMU_VM_CONFIGURATION);
if (vmdesc) {
/*
* This starts the main json object and is paired with the
* json_writer_end_object in
* qemu_savevm_state_complete_precopy_non_iterable
*/
json_writer_start_object(vmdesc, NULL);
json_writer_start_object(vmdesc, "configuration");
}
vmstate_save_state(f, &vmstate_configuration, &savevm_state,
vmdesc, &local_err);
if (local_err) {
error_report_err(local_err);
}
if (vmdesc) {
json_writer_end_object(vmdesc);
}
}
void qemu_savevm_state_header(QEMUFile *f)
{
MigrationState *s = migrate_get_current();
qemu_savevm_send_header(f);
if (s->send_configuration) {
qemu_put_byte(f, QEMU_VM_CONFIGURATION);
if (vmdesc) {
/*
* This starts the main json object and is paired with the
* json_writer_end_object in
* qemu_savevm_state_complete_precopy_non_iterable
*/
json_writer_start_object(vmdesc, NULL);
json_writer_start_object(vmdesc, "configuration");
}
vmstate_save_state(f, &vmstate_configuration, &savevm_state,
vmdesc, &local_err);
if (local_err) {
error_report_err(local_err);
}
if (vmdesc) {
json_writer_end_object(vmdesc);
}
qemu_savevm_send_configuration(s, f);
}
}

1
migration/savevm.h
View File

@@ -37,6 +37,7 @@ int qemu_savevm_state_prepare(Error **errp);
int qemu_savevm_state_setup(QEMUFile *f, Error **errp);
bool qemu_savevm_state_guest_unplug_pending(void);
int qemu_savevm_state_resume_prepare(MigrationState *s);
void qemu_savevm_send_header(QEMUFile *f);
void qemu_savevm_state_header(QEMUFile *f);
int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy);
void qemu_savevm_state_cleanup(void);