From nobody Mon Feb 9 17:59:19 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580296959387325.55559354296315; Wed, 29 Jan 2020 03:22:39 -0800 (PST) Received: from localhost ([::1]:44526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwlQb-0003dx-UZ for importer@patchew.org; Wed, 29 Jan 2020 06:22:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60168) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwlKl-00027e-Pf for qemu-devel@nongnu.org; Wed, 29 Jan 2020 06:16:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwlKk-0006aj-Nk for qemu-devel@nongnu.org; Wed, 29 Jan 2020 06:16:35 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51785 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwlKW-0006Wu-P4 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 06:16:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-MCn5TOF6OlqQkBcxtv8L6g-1; Wed, 29 Jan 2020 06:16:19 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 147998F70C1 for ; Wed, 29 Jan 2020 11:16:18 +0000 (UTC) Received: from secure.mitica (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 869BC8E9E4; Wed, 29 Jan 2020 11:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580296580; 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=ODGnHSNVJSUkrrQsMhUmiBKE7p98IabU3841tLj6X7c=; b=SoYhqVFd/Idg2Ic2BRRX13wYadUIJY2Wtbcw+O/dZIq4tJP7x8TtXb6l5ByLMza9NUleQC f7U7ojAs7lNL2qccJWmiBCjWoV2CI+5Q5h03GQnZ/8BbHzkUGnfFvMp9pBtPedOfnYDqcU 24FgiZVYEL1W9UHt05tc9bznekdrx4s= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 10/18] multifd: multifd_queue_page only needs the qemufile Date: Wed, 29 Jan 2020 12:15:28 +0100 Message-Id: <20200129111536.9497-11-quintela@redhat.com> In-Reply-To: <20200129111536.9497-1-quintela@redhat.com> References: <20200129111536.9497-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: MCn5TOF6OlqQkBcxtv8L6g-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 602e9ca5a0..ad9cc3e7bd 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -974,7 +974,7 @@ static int multifd_send_pages(QEMUFile *f) return 1; } =20 -static int multifd_queue_page(RAMState *rs, RAMBlock *block, ram_addr_t of= fset) +static int multifd_queue_page(QEMUFile *f, RAMBlock *block, ram_addr_t off= set) { MultiFDPages_t *pages =3D multifd_send_state->pages; =20 @@ -993,12 +993,12 @@ static int multifd_queue_page(RAMState *rs, RAMBlock = *block, ram_addr_t offset) } } =20 - if (multifd_send_pages(rs->f) < 0) { + if (multifd_send_pages(f) < 0) { return -1; } =20 if (pages->block !=3D block) { - return multifd_queue_page(rs, block, offset); + return multifd_queue_page(f, block, offset); } =20 return 1; @@ -2136,7 +2136,7 @@ static int ram_save_page(RAMState *rs, PageSearchStat= us *pss, bool last_stage) static int ram_save_multifd_page(RAMState *rs, RAMBlock *block, ram_addr_t offset) { - if (multifd_queue_page(rs, block, offset) < 0) { + if (multifd_queue_page(rs->f, block, offset) < 0) { return -1; } ram_counters.normal++; --=20 2.24.1