On Fri, Jul 25, 2025 at 4:20 PM Arun Menon <arme...@redhat.com> wrote:
> This is an incremental step in converting vmstate loading
> code to report error via Error objects instead of directly
> printing it to console/monitor.
> It is ensured that ram_postcopy_incoming_init() must report an error
> in errp, in case of failure.
>
> Signed-off-by: Arun Menon <arme...@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> migration/postcopy-ram.c | 9 ++++++---
> migration/postcopy-ram.h | 2 +-
> migration/ram.c | 4 ++--
> migration/ram.h | 2 +-
> migration/savevm.c | 2 +-
> 5 files changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
> index
> 45af9a361e8eacaad0fb217a5da2c5004416c1da..05617e5fbcad62226a54fe17d9f7d9a316baf1e4
> 100644
> --- a/migration/postcopy-ram.c
> +++ b/migration/postcopy-ram.c
> @@ -681,6 +681,7 @@ out:
> */
> static int init_range(RAMBlock *rb, void *opaque)
> {
> + Error **errp = opaque;
> const char *block_name = qemu_ram_get_idstr(rb);
> void *host_addr = qemu_ram_get_host_addr(rb);
> ram_addr_t offset = qemu_ram_get_offset(rb);
> @@ -701,6 +702,8 @@ static int init_range(RAMBlock *rb, void *opaque)
> * (Precopy will just overwrite this data, so doesn't need the
> discard)
> */
> if (ram_discard_range(block_name, 0, length)) {
> + error_setg(errp, "failed to discard RAM block %s len=%zu",
> + block_name, length);
> return -1;
> }
>
> @@ -749,9 +752,9 @@ static int cleanup_range(RAMBlock *rb, void *opaque)
> * postcopy later; must be called prior to any precopy.
> * called from arch_init's similarly named ram_postcopy_incoming_init
> */
> -int postcopy_ram_incoming_init(MigrationIncomingState *mis)
> +int postcopy_ram_incoming_init(MigrationIncomingState *mis, Error **errp)
> {
> - if (foreach_not_ignored_block(init_range, NULL)) {
> + if (foreach_not_ignored_block(init_range, errp)) {
> return -1;
> }
>
> @@ -1703,7 +1706,7 @@ bool
> postcopy_ram_supported_by_host(MigrationIncomingState *mis, Error **errp)
> return false;
> }
>
> -int postcopy_ram_incoming_init(MigrationIncomingState *mis)
> +int postcopy_ram_incoming_init(MigrationIncomingState *mis, Error **errp)
> {
> error_report("postcopy_ram_incoming_init: No OS support");
> return -1;
> diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h
> index
> 3852141d7e37ab18bada4b46c137fef0969d0070..ca19433b246893fa5105bcebffb442c58a9a4f48
> 100644
> --- a/migration/postcopy-ram.h
> +++ b/migration/postcopy-ram.h
> @@ -30,7 +30,7 @@ int postcopy_ram_incoming_setup(MigrationIncomingState
> *mis);
> * postcopy later; must be called prior to any precopy.
> * called from ram.c's similarly named ram_postcopy_incoming_init
> */
> -int postcopy_ram_incoming_init(MigrationIncomingState *mis);
> +int postcopy_ram_incoming_init(MigrationIncomingState *mis, Error **errp);
>
> /*
> * At the end of a migration where postcopy_ram_incoming_init was called.
> diff --git a/migration/ram.c b/migration/ram.c
> index
> 7208bc114fb5c366740db380ee6956a91b3871a0..6a0dcc04f436524a37672c41c38f201f06773374
> 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -3716,9 +3716,9 @@ static int ram_load_cleanup(void *opaque)
> * postcopy-ram. postcopy-ram's similarly names
> * postcopy_ram_incoming_init does the work.
> */
> -int ram_postcopy_incoming_init(MigrationIncomingState *mis)
> +int ram_postcopy_incoming_init(MigrationIncomingState *mis, Error **errp)
> {
> - return postcopy_ram_incoming_init(mis);
> + return postcopy_ram_incoming_init(mis, errp);
> }
>
> /**
> diff --git a/migration/ram.h b/migration/ram.h
> index
> 921c39a2c5c45bc2344be80854c46e4c10c09aeb..275709a99187f9429ccb4111e05281ec268ba0db
> 100644
> --- a/migration/ram.h
> +++ b/migration/ram.h
> @@ -86,7 +86,7 @@ void ram_postcopy_migrated_memory_release(MigrationState
> *ms);
> void ram_postcopy_send_discard_bitmap(MigrationState *ms);
> /* For incoming postcopy discard */
> int ram_discard_range(const char *block_name, uint64_t start, size_t
> length);
> -int ram_postcopy_incoming_init(MigrationIncomingState *mis);
> +int ram_postcopy_incoming_init(MigrationIncomingState *mis, Error **errp);
> int ram_load_postcopy(QEMUFile *f, int channel);
>
> void ram_handle_zero(void *host, uint64_t size);
> diff --git a/migration/savevm.c b/migration/savevm.c
> index
> 63cf488d9f411c0fb8d5f1bc8a719aa575bbabdc..60a055f3e1f248b09e5e5d721f14d2eeafd0a7ad
> 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -1989,7 +1989,7 @@ static int
> loadvm_postcopy_handle_advise(MigrationIncomingState *mis,
> return -1;
> }
>
> - if (ram_postcopy_incoming_init(mis)) {
> + if (ram_postcopy_incoming_init(mis, NULL) < 0) {
> return -1;
> }
>
>
> --
> 2.50.0
>
>
