[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 05/11] savevm: add error parameter to qemu_sa
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v4 05/11] savevm: add error parameter to qemu_savevm_state_complete() |
Date: |
Tue, 09 Apr 2013 15:56:34 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) |
Pavel Hrdina <address@hidden> writes:
> Signed-off-by: Pavel Hrdina <address@hidden>
> Reviewed-by: Eric Blake <address@hidden>
> ---
> include/sysemu/sysemu.h | 2 +-
> migration.c | 2 +-
> savevm.c | 5 +++--
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
> index af4f699..9e6a4a9 100644
> --- a/include/sysemu/sysemu.h
> +++ b/include/sysemu/sysemu.h
> @@ -77,7 +77,7 @@ void qemu_savevm_state_begin(QEMUFile *f,
> const MigrationParams *params,
> Error **errp);
> int qemu_savevm_state_iterate(QEMUFile *f, Error **errp);
> -void qemu_savevm_state_complete(QEMUFile *f);
> +void qemu_savevm_state_complete(QEMUFile *f, Error **errp);
> void qemu_savevm_state_cancel(void);
> uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);
> int qemu_loadvm_state(QEMUFile *f);
> diff --git a/migration.c b/migration.c
> index e9d2f40..c891a45 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -525,7 +525,7 @@ static void *migration_thread(void *opaque)
> old_vm_running = runstate_is_running();
> vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
> qemu_file_set_rate_limit(s->file, INT_MAX);
> - qemu_savevm_state_complete(s->file);
> + qemu_savevm_state_complete(s->file, NULL);
> qemu_mutex_unlock_iothread();
> if (!qemu_file_get_error(s->file)) {
> migrate_finish_set_state(s, MIG_STATE_COMPLETED);
> diff --git a/savevm.c b/savevm.c
> index 575f1b2..7598934 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -1823,7 +1823,7 @@ int qemu_savevm_state_iterate(QEMUFile *f, Error **errp)
> return ret;
> }
>
> -void qemu_savevm_state_complete(QEMUFile *f)
> +void qemu_savevm_state_complete(QEMUFile *f, Error **errp)
> {
> SaveStateEntry *se;
> int ret;
> @@ -1848,6 +1848,7 @@ void qemu_savevm_state_complete(QEMUFile *f)
> trace_savevm_section_end(se->section_id);
> if (ret < 0) {
> qemu_file_set_error(f, ret);
> + error_setg(errp, "failed to complete vmstate save");
> return;
> }
> }
Unlike PATCH 3+4, this one returns an error via the Error parameter on
qemu_file_set_error().
If I remember correctly, qemu_file_set_error() takes a -errno argument,
here: ret. error_setg_errno(), perhaps?
> @@ -1933,7 +1934,7 @@ static int qemu_savevm_state(QEMUFile *f)
>
> ret = qemu_file_get_error(f);
> if (ret == 0) {
> - qemu_savevm_state_complete(f);
> + qemu_savevm_state_complete(f, NULL);
> ret = qemu_file_get_error(f);
> }
> if (ret != 0) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH v4 05/11] savevm: add error parameter to qemu_savevm_state_complete(),
Markus Armbruster <=