From nobody Mon Feb 9 17:36:11 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=1685472257; cv=none; d=zohomail.com; s=zohoarc; b=bg0ot5kXaZL56Ck2tHXcUsFQtKlbz5T9NSSt7XDIePdiRFZD1LnBVj6rKkv0GSdyv1CpFDxt4YRHkzjc1H2lYeGs/fyBef81dQgfMdslulDVcYXzzVuaXqaZSTNFtxMzVgmMDOA8CjWH1Tj7xyesxtrGTrZdbM9ygWOM47u2ojk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685472257; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1YwXG5f3ncM0Xjakg0KJOZwETAUNV4nQ2cRcIhH4H40=; b=Kfwpjg95zfp/zTFlLQ3cvjNsiUGAh18hyw/ipqNwhSQ8aFM1R2250E/Uk83O9KZKzBYoIaFtQpKViR3MaLH/hGUntXFRM0EeTRIJr2SnA2w59J3Rqg2fanXTPrs2rbIYp0t8b1pmXuZG7ilrt8KwPq1Lv8ueNq0XDkBdlppxnNo= 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 1685472257437138.71983056786667; Tue, 30 May 2023 11:44:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q44GI-0000Te-7B; Tue, 30 May 2023 14:40:02 -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 1q44GG-0000S7-59 for qemu-devel@nongnu.org; Tue, 30 May 2023 14:40:00 -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 1q44GD-00048r-QL for qemu-devel@nongnu.org; Tue, 30 May 2023 14:39:59 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-517-zz3q8jZyPWiVSY2cKzSYgg-1; Tue, 30 May 2023 14:39:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 01FE929AA386; Tue, 30 May 2023 18:39:53 +0000 (UTC) Received: from secure.mitica (unknown [10.39.195.148]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69404C154D1; Tue, 30 May 2023 18:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685471996; 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=1YwXG5f3ncM0Xjakg0KJOZwETAUNV4nQ2cRcIhH4H40=; b=i+adfJ8j1WV3mWlJkacf31hICis/j2JTlTXx6U63+hrVnus3Ko+yQCSefNNBVWL2RvR2Je fOsgRAMa4Bek/u/nZTOuAbS5ql6S/gkWNF0SbQmBhWDLpT0TB9lPALTfZ78FBDWNW6mEBl hlbWwEtz3usIBe2PH2vpWPmc9PxZb6I= X-MC-Unique: zz3q8jZyPWiVSY2cKzSYgg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Leonardo Bras , Hailiang Zhang , Fiona Ebner , Peter Xu , Stefan Hajnoczi , qemu-block@nongnu.org, Juan Quintela , Fam Zheng Subject: [PATCH v2 04/20] qemu-file: We only call qemu_file_transferred_* on the sending side Date: Tue, 30 May 2023 20:39:25 +0200 Message-Id: <20230530183941.7223-5-quintela@redhat.com> In-Reply-To: <20230530183941.7223-1-quintela@redhat.com> References: <20230530183941.7223-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685472259578100003 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 Reviewed-by: Peter Xu --- 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 7a5c1a5e32..be3dab85cb 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -342,7 +342,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 { @@ -632,6 +631,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; } @@ -641,6 +642,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.40.1