Re: [PATCH-for-9.0 05/25] memory: Simplify memory_region_init_ram_from_fd() calls

[Manos Pitsidianakis]

On Mon, 20 Nov 2023 23:32, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
> Mechanical change using the following coccinelle script:
>
> @@
> expression mr, owner, arg3, arg4, arg5, arg6, arg7, errp;
> @@
> -   memory_region_init_ram_from_fd(mr, owner, arg3, arg4, arg5, arg6, arg7, 
> &errp);
>    if (
> -       errp
> +       !memory_region_init_ram_from_fd(mr, owner, arg3, arg4, arg5, arg6, arg7, 
> &errp)
>    ) {
>        ...
>        return;
>    }
>
> and removing the local Error variable.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> system/memory.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/system/memory.c b/system/memory.c
> index 2fe4c3861b..ca05c4defa 100644
> --- a/system/memory.c
> +++ b/system/memory.c
> @@ -3604,11 +3604,8 @@ void memory_region_init_ram(MemoryRegion *mr,
>                             Error **errp)
> {
>     DeviceState *owner_dev;
> -    Error *err = NULL;
>
> -    memory_region_init_ram_nomigrate(mr, owner, name, size, &err);
> -    if (err) {
> -        error_propagate(errp, err);
> +    if (!memory_region_init_ram_nomigrate(mr, owner, name, size, errp)) {
>         return;
>     }
>     /* This will assert if owner is neither NULL nor a DeviceState.
> --
> 2.41.0

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>