diff options
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/savevm.c | 33 | ||||
| -rw-r--r-- | migration/trace-events | 3 |
2 files changed, 22 insertions, 14 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index 455d5bac1e..204012ecef 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2042,38 +2042,40 @@ int qemu_loadvm_state(QEMUFile *f) return ret; } -void hmp_savevm(Monitor *mon, const QDict *qdict) +int save_vmstate(Monitor *mon, const char *name) { BlockDriverState *bs, *bs1; QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1; - int ret; + int ret = -1; QEMUFile *f; int saved_vm_running; uint64_t vm_state_size; qemu_timeval tv; struct tm tm; - const char *name = qdict_get_try_str(qdict, "name"); Error *local_err = NULL; AioContext *aio_context; if (!bdrv_all_can_snapshot(&bs)) { monitor_printf(mon, "Device '%s' is writable but does not " "support snapshots.\n", bdrv_get_device_name(bs)); - return; + return ret; } /* Delete old snapshots of the same name */ - if (name && bdrv_all_delete_snapshot(name, &bs1, &local_err) < 0) { - error_reportf_err(local_err, - "Error while deleting snapshot on device '%s': ", - bdrv_get_device_name(bs1)); - return; + if (name) { + ret = bdrv_all_delete_snapshot(name, &bs1, &local_err); + if (ret < 0) { + error_reportf_err(local_err, + "Error while deleting snapshot on device '%s': ", + bdrv_get_device_name(bs1)); + return ret; + } } bs = bdrv_all_find_vmstate_bs(); if (bs == NULL) { monitor_printf(mon, "No block device can accept snapshots\n"); - return; + return ret; } aio_context = bdrv_get_aio_context(bs); @@ -2082,7 +2084,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) ret = global_state_store(); if (ret) { monitor_printf(mon, "Error saving global state\n"); - return; + return ret; } vm_stop(RUN_STATE_SAVE_VM); @@ -2128,13 +2130,22 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) if (ret < 0) { monitor_printf(mon, "Error while creating snapshot on '%s'\n", bdrv_get_device_name(bs)); + goto the_end; } + ret = 0; + the_end: aio_context_release(aio_context); if (saved_vm_running) { vm_start(); } + return ret; +} + +void hmp_savevm(Monitor *mon, const QDict *qdict) +{ + save_vmstate(mon, qdict_get_try_str(qdict, "name")); } void qmp_xen_save_devices_state(const char *filename, Error **errp) diff --git a/migration/trace-events b/migration/trace-events index 48e531d3b8..fa660e35b1 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -4,8 +4,6 @@ qemu_loadvm_state_section(unsigned int section_type) "%d" qemu_loadvm_state_section_command(int ret) "%d" qemu_loadvm_state_section_partend(uint32_t section_id) "%u" -qemu_loadvm_state_main(void) "" -qemu_loadvm_state_main_quit_parent(void) "" qemu_loadvm_state_post_main(int ret) "%d" qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint32_t instance_id, uint32_t version_id) "%u(%s) %u %u" qemu_savevm_send_packaged(void) "" @@ -118,7 +116,6 @@ qemu_rdma_accept_incoming_migration_accepted(void) "" qemu_rdma_accept_pin_state(bool pin) "%d" qemu_rdma_accept_pin_verbsc(void *verbs) "Verbs context after listen: %p" qemu_rdma_block_for_wrid_miss(const char *wcompstr, int wcomp, const char *gcompstr, uint64_t req) "A Wanted wrid %s (%d) but got %s (%" PRIu64 ")" -qemu_rdma_block_for_wrid_miss_b(const char *wcompstr, int wcomp, const char *gcompstr, uint64_t req) "B Wanted wrid %s (%d) but got %s (%" PRIu64 ")" qemu_rdma_cleanup_disconnect(void) "" qemu_rdma_cleanup_waiting_for_disconnect(void) "" qemu_rdma_close(void) "" |