From patchwork Tue Oct 17 08:29:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 734365 Delivered-To: patch@linaro.org Received: by 2002:adf:f0cd:0:b0:32d:baff:b0ca with SMTP id x13csp363984wro; Tue, 17 Oct 2023 01:32:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBWJLar1bD6cm22XcpQANwAQxJrfDBqfQHCfBXZue1Z+W8lLcNWiYLJ1CI/BofbnyaSZgb X-Received: by 2002:a05:620a:318a:b0:76a:ece7:2071 with SMTP id bi10-20020a05620a318a00b0076aece72071mr2011540qkb.41.1697531521002; Tue, 17 Oct 2023 01:32:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697531520; cv=none; d=google.com; s=arc-20160816; b=e5x+9yFg5rbF25+XgEsFXBl8OGjdnyZRx/Hqh6IaI64pcms5eqLKbYwm96KTJIfofO s05KlsxW+c4QloUlPq1Uk/jYZqntQJfQ71xBasSffKgyk0Eu7M00fg8qF3tHqlQoC6WA 9rgsW726EaoEGHCqfAZ9K2KefLlU9w0Le5RETPtkFN5it807hdRKv9E5kCCPp1gMFM3I 75n/m8NaAZu4RZdBIdys7N57ZbA476hQ4LhjHkEvH6Borw4oY/HcIqqQKYdiSODcEDUP lVrbju7+CtCjEN4L3FzpHcrlftDW0spTmLFrbBnftik96usC8njRLoPUPL0xC+QXRmbi M04w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SCa7UV0SBwBCZHaFVezeV/WwGdhZrZhL/rnYvsu7CJQ=; fh=eq3ngHES1tIqvQTchRyZJTAf9txL6gh5q1zmMWLMC8A=; b=ViEuDY7ug8dk13G7xsC6xq/DhUtG5TCyG7sFYWO+oh4ERn0iQOOykifV4TBthO6xob wA9DkoRlLT7RAfPpJR3WzECFwQwHJGrqCQLrvAgAZhoIS0h0h2a0VJHelJBTHNfkSu8l GqMl0EUH+VyTuVvtHvyW9kvLXaXB3BRMmhFvyUOtCNQl/tFkwCAaDZf3v3yavuOmosCq 07g3jtnJ78WrtithCRLMjbC1RrTRNE7eHwq7jb+llmtZQzY/fG9SsDPCfM7EgK1vbCbb +5gDGEfTtZVCQIv6XDIF9RbIogd1q6eHB4aWR/ng8+Xk+sd9qkeEua0LSq6Y3DRS+uAz qaSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PmmQIdEX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id vu23-20020a05620a561700b0077771d8a8f2si725077qkn.570.2023.10.17.01.32.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Oct 2023 01:32:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PmmQIdEX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qsfTp-00052l-9M; Tue, 17 Oct 2023 04:31:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qsfT8-0004hw-G9 for qemu-devel@nongnu.org; Tue, 17 Oct 2023 04:30:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qsfT5-000581-Iq for qemu-devel@nongnu.org; Tue, 17 Oct 2023 04:30:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697531422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SCa7UV0SBwBCZHaFVezeV/WwGdhZrZhL/rnYvsu7CJQ=; b=PmmQIdEXV9czYn7QEpAssET3yoX6tih1iYDiApcUSuphxOkuEvqLwuNXVlmwo/CdDsEylW 5/8zLpNlkgqkZ0hlmHch8QWAsdFM+twB4DI0LApj0fVPTrF30NKsJz+YCoqZy92ARPGEsn Z8kBCwYsNOAcp6RqqfEHRnjfH/v7Pjo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-625-EVLYXZakPvu5H8i2db3yAQ-1; Tue, 17 Oct 2023 04:30:14 -0400 X-MC-Unique: EVLYXZakPvu5H8i2db3yAQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 012F685A5A8; Tue, 17 Oct 2023 08:30:14 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46C511C060AE; Tue, 17 Oct 2023 08:30:11 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: Eric Blake , Thomas Huth , Fabiano Rosas , Leonardo Bras , Vladimir Sementsov-Ogievskiy , Markus Armbruster , Peter Xu , Paolo Bonzini , Fam Zheng , Stefan Hajnoczi , Li Zhijian , John Snow , qemu-block@nongnu.org, Cleber Rosa , Juan Quintela , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 02/38] migration: Use g_autofree to simplify ram_dirty_bitmap_reload() Date: Tue, 17 Oct 2023 10:29:27 +0200 Message-ID: <20231017083003.15951-3-quintela@redhat.com> In-Reply-To: <20231017083003.15951-1-quintela@redhat.com> References: <20231017083003.15951-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Markus Armbruster Reviewed-by: Fabiano Rosas Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela Message-ID: <20231011023627.86691-1-philmd@linaro.org> --- migration/ram.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 2f5ce4d60b..24d91de8b3 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -4159,7 +4159,8 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block) int ret = -EINVAL; /* from_dst_file is always valid because we're within rp_thread */ QEMUFile *file = s->rp_state.from_dst_file; - unsigned long *le_bitmap, nbits = block->used_length >> TARGET_PAGE_BITS; + g_autofree unsigned long *le_bitmap = NULL; + unsigned long nbits = block->used_length >> TARGET_PAGE_BITS; uint64_t local_size = DIV_ROUND_UP(nbits, 8); uint64_t size, end_mark; RAMState *rs = ram_state; @@ -4188,8 +4189,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block) error_report("%s: ramblock '%s' bitmap size mismatch " "(0x%"PRIx64" != 0x%"PRIx64")", __func__, block->idstr, size, local_size); - ret = -EINVAL; - goto out; + return -EINVAL; } size = qemu_get_buffer(file, (uint8_t *)le_bitmap, local_size); @@ -4200,15 +4200,13 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block) error_report("%s: read bitmap failed for ramblock '%s': %d" " (size 0x%"PRIx64", got: 0x%"PRIx64")", __func__, block->idstr, ret, local_size, size); - ret = -EIO; - goto out; + return -EIO; } if (end_mark != RAMBLOCK_RECV_BITMAP_ENDING) { error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIx64, __func__, block->idstr, end_mark); - ret = -EINVAL; - goto out; + return -EINVAL; } /* @@ -4240,10 +4238,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block) */ migration_rp_kick(s); - ret = 0; -out: - g_free(le_bitmap); - return ret; + return 0; } static int ram_resume_prepare(MigrationState *s, void *opaque)