From nobody Sat Sep 21 02:52:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697450954; cv=none; d=zohomail.com; s=zohoarc; b=W+tyYeoV407hNYw145p8fXdK06oMUqVrD1EUrx3u5sKKQk1j+x17gPeiq8GDX4DfGE4+xsrYLWeFFGMvpi1QNybnclGyr34XQ3uKi0WZ+Io52FGzBfHgDN5K+e2gQK4LsABLhXEolIkNDlakEWteuw0rbMnkE6bWmzcR4Lp/2BY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697450954; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SCa7UV0SBwBCZHaFVezeV/WwGdhZrZhL/rnYvsu7CJQ=; b=PA+bYyWNVXDbizr2InDhN/btXhBA7eXrOeotZoAvI5Y7umMkrLhtOBdOP9nSsfz8pxMqEpZ5Yf/n0F2+wmd2LZo+f+UwZxpTKrlr6HadmmNAFZKJsfokSCLnXtomrxSqU32RUg1QL3XbS3Vd4dTMSH72YF60q+pyqAKqdZVU5xs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697450954464928.3213112794355; Mon, 16 Oct 2023 03:09:14 -0700 (PDT) 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 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 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) 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= X-MC-Unique: 4XYWvR2qPq-LDblEN26row-1 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=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697450955077100007 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 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, RAMBlo= ck *block) int ret =3D -EINVAL; /* from_dst_file is always valid because we're within rp_thread */ QEMUFile *file =3D s->rp_state.from_dst_file; - unsigned long *le_bitmap, nbits =3D block->used_length >> TARGET_PAGE_= BITS; + g_autofree unsigned long *le_bitmap =3D NULL; + unsigned long nbits =3D block->used_length >> TARGET_PAGE_BITS; uint64_t local_size =3D DIV_ROUND_UP(nbits, 8); uint64_t size, end_mark; RAMState *rs =3D ram_state; @@ -4188,8 +4189,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlo= ck *block) error_report("%s: ramblock '%s' bitmap size mismatch " "(0x%"PRIx64" !=3D 0x%"PRIx64")", __func__, block->idstr, size, local_size); - ret =3D -EINVAL; - goto out; + return -EINVAL; } =20 size =3D qemu_get_buffer(file, (uint8_t *)le_bitmap, local_size); @@ -4200,15 +4200,13 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMB= lock *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 =3D -EIO; - goto out; + return -EIO; } =20 if (end_mark !=3D RAMBLOCK_RECV_BITMAP_ENDING) { error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIx64, __func__, block->idstr, end_mark); - ret =3D -EINVAL; - goto out; + return -EINVAL; } =20 /* @@ -4240,10 +4238,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBl= ock *block) */ migration_rp_kick(s); =20 - ret =3D 0; -out: - g_free(le_bitmap); - return ret; + return 0; } =20 static int ram_resume_prepare(MigrationState *s, void *opaque) --=20 2.41.0