From nobody Thu Jan 1 09:18:33 2026 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=1698160456; cv=none; d=zohomail.com; s=zohoarc; b=PYapnNyI72xTzAqjbWe2vOpgGHYQOfaxRIW9TEWcyXaKhdl0hDWP3e+sY/tBsg/pJH6yr5WUt/hguWTPQzLtQhYen0fNLq3Ns94TaGaCJXU5GNBYLkfLoZVhTCcQrbhuSo9nCV1rlkmhZuoiAJ66ly8jZpYMlCvk+QNV0/ps6tw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698160456; h=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=lIFScqDEoE0BhtxwUU/Kj/DY4QAdAcDyVKxrfgpl/Xc=; b=S/X3PZbc+yO5WFBGjkA5f01TlWTqNYwmZEA3A+PUYmkDu3Imrks4ylfHsMX51IbVztMHfLe0fBmv6lUCZGFxH4pINARmS1M9URM9ICx85L8iXpTL/wZvuMTonQUWs945Rm3rcP7vwcpCMlvTkAUVALEQrOjYP897NmO2c0bIb1w= 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 1698160456494161.55728057017507; Tue, 24 Oct 2023 08:14:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvJ47-00050D-Mo; Tue, 24 Oct 2023 11:11:31 -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 1qvJ3r-0004te-CV for qemu-devel@nongnu.org; Tue, 24 Oct 2023 11:11:15 -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 1qvJ3n-0000o0-8T for qemu-devel@nongnu.org; Tue, 24 Oct 2023 11:11:13 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-685-Og_YZDQwOSmCtHiWLiNmzA-1; Tue, 24 Oct 2023 11:10:48 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A58B628040B7; Tue, 24 Oct 2023 15:10:47 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id D80952026D4C; Tue, 24 Oct 2023 15:10:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698160257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lIFScqDEoE0BhtxwUU/Kj/DY4QAdAcDyVKxrfgpl/Xc=; b=gwGRWEWWXJf0cbh124kYt3RZLgeQ/PcDbmJXW3VRPMnnlQC+xnZIN/HCrK49q0OnFKU/22 KeWxVtYQtdGH/s7oCk6yd/Me0t0WnG389BPOvxMbTQDGetNpmoQmtdSX6nbnNAvGDc5blj Qmr6APv79HKigsOIstv+VdBZnc0Unrg= X-MC-Unique: Og_YZDQwOSmCtHiWLiNmzA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Fam Zheng , qemu-block@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Juan Quintela , Hailiang Zhang , Stefan Hajnoczi , Fabiano Rosas , Peter Xu , Li Zhijian , Leonardo Bras Subject: [PATCH 01/12] qemu-file: We only call qemu_file_transferred_* on the sending side Date: Tue, 24 Oct 2023 17:10:31 +0200 Message-ID: <20231024151042.90349-2-quintela@redhat.com> In-Reply-To: <20231024151042.90349-1-quintela@redhat.com> References: <20231024151042.90349-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1698160457367100005 Content-Type: text/plain; charset="utf-8" Remove the increase in qemu_file_fill_buffer() and add asserts to qemu_file_transferred* functions. Signed-off-by: Juan Quintela --- migration/qemu-file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 3fb25148d1..6814c562e6 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -337,7 +337,6 @@ static ssize_t coroutine_mixed_fn qemu_fill_buffer(QEMU= File *f) =20 if (len > 0) { f->buf_size +=3D len; - f->total_transferred +=3D len; } else if (len =3D=3D 0) { qemu_file_set_error_obj(f, -EIO, local_error); } else { @@ -627,6 +626,8 @@ uint64_t qemu_file_transferred_noflush(QEMUFile *f) uint64_t ret =3D f->total_transferred; int i; =20 + g_assert(qemu_file_is_writable(f)); + for (i =3D 0; i < f->iovcnt; i++) { ret +=3D f->iov[i].iov_len; } @@ -636,6 +637,7 @@ uint64_t qemu_file_transferred_noflush(QEMUFile *f) =20 uint64_t qemu_file_transferred(QEMUFile *f) { + g_assert(qemu_file_is_writable(f)); qemu_fflush(f); return f->total_transferred; } --=20 2.41.0