From nobody Tue Feb 10 04:55:17 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 ARC-Seal: i=1; a=rsa-sha256; t=1579785996; cv=none; d=zohomail.com; s=zohoarc; b=W+/VQwhFhUaqtp228xIT5F+2Ssb6BZ9On/KKlb+XpZwgITFCm0hJ0x2kf+sBqPuRa+peNkKsmBW4V3IlhQPJYZdY+Em7e9+lRrNf8zu4O5CHTA8QxoNDOWMbHAD2WyA6Ti8NPKD2GusQsN2eFTQhOSiVF5LObGcq8uT3Ewit5dc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579785996; h=Content-Type: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=OBMjeyeAZyM2/vGJZhH1BtgKby+UDT6rTZKWS6FFQ30=; b=fO/9EZpEZtDMRGN4Gj5XoONwyOw+otdvFRAH/jBPpJWil+N1LOAlU3MXQhhpjLafugx5dJ4DRumvsVbWxT2OZeOyJUMLUR0yHop+tZApPj25GxAzMIzV7PuQ85Z00vLqKeM2p19x0Stm/SnuTMnu/yNg93GAMonl64rflwcODPY= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579785996480416.72641270692145; Thu, 23 Jan 2020 05:26:36 -0800 (PST) Received: from localhost ([::1]:57018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iucVG-0001TM-O9 for importer@patchew.org; Thu, 23 Jan 2020 08:26:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40360) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iub8t-00025V-3x for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iub8s-000536-3r for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:23 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:26194) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iub8s-00052D-0J for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:22 -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-1-ljTShN33Mdqqg0pUQ0bhIw-1; Thu, 23 Jan 2020 06:59:19 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22E1618A6ED2 for ; Thu, 23 Jan 2020 11:59:18 +0000 (UTC) Received: from secure.mitica (ovpn-116-207.ams2.redhat.com [10.36.116.207]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E1C819C69; Thu, 23 Jan 2020 11:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579780760; 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=OBMjeyeAZyM2/vGJZhH1BtgKby+UDT6rTZKWS6FFQ30=; b=aIBx+DB6xeKHA8O1Ja/pVKXDlU2fxlvQBqwcV3cyNv8l0OnYp+ObuCGFk6N2PNkQiC+joT OWlEHIrOG9qCoHwzEF/hvY9J9JrPlrzx4lPNotyTn6cmyCp9iWXqoWPgQKiCAcuPhmmQXu Y3yMrBNALHozWLs/s6QfoRd8T7stz/E= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 12/21] multifd: multifd_queue_page only needs the qemufile Date: Thu, 23 Jan 2020 12:58:22 +0100 Message-Id: <20200123115831.36842-13-quintela@redhat.com> In-Reply-To: <20200123115831.36842-1-quintela@redhat.com> References: <20200123115831.36842-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: ljTShN33Mdqqg0pUQ0bhIw-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] X-Received-From: 207.211.31.81 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 , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , Markus Armbruster , "Dr. David Alan Gilbert" , Paolo Bonzini 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 19caf5ed4d..d4c829bc77 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; @@ -2128,7 +2128,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