From patchwork Mon Oct 16 10:06:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 734031 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1045:b0:32d:baff:b0ca with SMTP id c5csp131956wrx; Mon, 16 Oct 2023 03:09:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhXaWW866ah09qVW58B3iMiy7e+824JOaC95iddLyNRTo2Tk4GNVlT8U91LaIwncP2pXoI X-Received: by 2002:a81:5404:0:b0:589:fad6:c17c with SMTP id i4-20020a815404000000b00589fad6c17cmr33658012ywb.45.1697450954109; Mon, 16 Oct 2023 03:09:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697450954; cv=none; d=google.com; s=arc-20160816; b=br2d7K+RPgabUtTgJZuHVRiN11WlFY/SAEBo+wZ9MTMXc7aSqPxkVR/aJRRUz5blFY N2YZQ1JOUtNyfl0cF2h6YU2C8AoukbFpJyVk59gQ3uGOwvngAe8Enrx1jemr0xP70zT5 i3iVOalIRZAqipMf7v5/ZsKdsqGfP+6flh8OZPDQyV5XFA6iOT1iEyL7HvaS65EXldDU xYHEbtM4v9uSAT3OJiU0PbBO9PlLzJRnJ+A8/jYih0XDi0XqT1DyOm4Tx/aZf0zLmlN8 pqcqTsfx49UK80KcM9JLoztPD9jSPYRrpZ9UxBEoZGic7rWLfYF74ijuXYxr7xLGKYPn V7HQ== 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=+vvjiOHVyaKs4gqWtD8xmDku3DAO2bCuhQeIJVd4kcY=; b=ZK/rJynhBmhHzKvB5M6rHR/ycOjhr3zpBzgAqejqkS9QRrnHJvZKDI4ZJPgGaZAx1U 8c/7iAya6aWEZgkJ6s8ja4lwQVQzld3hpSrtZ94XWOS+q56ni/hHbP2Wq8k1FvNwX7gc AiuOD4BMsGibzvVmiLzMvG6jIt32d3APjVB4m8dgIB/hGRzJFk3tf9IvO9K5wWkR1hzf BbIZmoT6fHMdHkWVGBcEXHxC5eVsqE32sHTb7CW2E3gggV1ZUflcOjBFc98DInbxaCIH EzvyMTJcnqKMy36+Pkc17zG6QMPwJ8Gf8O8OzMEEIGY4ZgTappgVYmSNO91aAqvnpyz3 2SFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MfscfUPn; 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 v4-20020a05620a440400b0076801d54d1csi5214145qkp.642.2023.10.16.03.09.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Oct 2023 03:09:14 -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=MfscfUPn; 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 1qsKVa-0001Op-Pv; Mon, 16 Oct 2023 06:07:36 -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 1qsKVO-0001ML-UP for qemu-devel@nongnu.org; Mon, 16 Oct 2023 06:07:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qsKVM-0007O8-3j for qemu-devel@nongnu.org; Mon, 16 Oct 2023 06:07:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697450839; 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=MfscfUPnEytyEMyoUPjm69aQY5/1cJW/InmrEQoyZgjuk5XEdNmZ32mj3a/1lTNB96AMbx hSpO0Ral/s3bZevvKwsVZmJ5CbdwrnzNFS6Jq0SOns7lD2avhs4Xfjktl04Pj2UmLTrRo0 hJ5bvSY2+pwQxx8crmKzYouJtmYze+A= 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-54-4XYWvR2qPq-LDblEN26row-1; Mon, 16 Oct 2023 06:07:17 -0400 X-MC-Unique: 4XYWvR2qPq-LDblEN26row-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 696251029F49; Mon, 16 Oct 2023 10:07:17 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE2ED63F21; Mon, 16 Oct 2023 10:07:14 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Paolo Bonzini , Vladimir Sementsov-Ogievskiy , Fam Zheng , Cleber Rosa , Eric Blake , Li Zhijian , Peter Xu , Markus Armbruster , John Snow , Stefan Hajnoczi , Juan Quintela , Leonardo Bras , Laurent Vivier , Fabiano Rosas , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 02/38] migration: Use g_autofree to simplify ram_dirty_bitmap_reload() Date: Mon, 16 Oct 2023 12:06:30 +0200 Message-ID: <20231016100706.2551-3-quintela@redhat.com> In-Reply-To: <20231016100706.2551-1-quintela@redhat.com> References: <20231016100706.2551-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass client-ip=170.10.133.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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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)