From nobody Tue Feb 10 13:01:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=1557922991; cv=none; d=zoho.com; s=zohoarc; b=K/TZrC5VwuEhz0c6LuE9dF4MM+4jKQN9lpTa24Sx8VLv2lkCqub6sODE821Ba0ziG7G/b9yqgd1IL+OKRgr/ulI96mBHlSXcYd0XgcqKdxFNuIDTzwbNMNpKvqaoPqScQK8Hz47jR8Jacg4vcxJNNgLkT4w78RhU94sJByvRVcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557922991; 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:ARC-Authentication-Results; bh=MHQJqkkC4BMFUmU7bUfHshp6UYn8E9LnLh25RXdSKFQ=; b=AEHpUDEONHUIBqn2o+Ikvk0ey1cr1RS+y64Fx2m7hs07UHz5EfdRw93kgh7iY4syOUzMQktH9PvRWGV1G9XXs8zqpzDhwvoMQ2T6e+k2Z/WFZlYRaSGcT7EUR7AQBmcW3qxOZCTZ5iEkD9KyXLVBjQ4KIajogp0cEyMhJQ7IFmk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1557922991708127.9335925306192; Wed, 15 May 2019 05:23:11 -0700 (PDT) Received: from localhost ([127.0.0.1]:36421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQsw8-0005Vd-Ol for importer@patchew.org; Wed, 15 May 2019 08:23:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQsq1-0000NM-5v for qemu-devel@nongnu.org; Wed, 15 May 2019 08:16:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQsq0-0002ny-2c for qemu-devel@nongnu.org; Wed, 15 May 2019 08:16:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34376) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQspz-0002n0-R4 for qemu-devel@nongnu.org; Wed, 15 May 2019 08:16:48 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2CC92300414C for ; Wed, 15 May 2019 12:16:47 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42A105C236; Wed, 15 May 2019 12:16:45 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 15 May 2019 14:15:42 +0200 Message-Id: <20190515121544.4597-7-quintela@redhat.com> In-Reply-To: <20190515121544.4597-1-quintela@redhat.com> References: <20190515121544.4597-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 15 May 2019 12:16:47 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 6/8] migration: Make none operations into its own structure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" It will be used later. Signed-off-by: Juan Quintela --- migration/ram.c | 54 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 1ca9ba77b6..6679e4f213 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -700,6 +700,40 @@ typedef struct { QemuSemaphore sem_sync; } MultiFDRecvParams; =20 +typedef struct { + /* Prepare the send packet */ + int (*send_prepare)(MultiFDSendParams *p, uint32_t used); + /* Write the send packet */ + int (*send_write)(MultiFDSendParams *p, uint32_t used, Error **perr); + /* Read all pages */ + int (*recv_pages)(MultiFDRecvParams *p, uint32_t used, Error **perr); +} MultifdMethods; + +/* Multifd without compression */ + +static int none_send_prepare(MultiFDSendParams *p, uint32_t used) +{ + p->next_packet_size =3D used * qemu_target_page_size(); + return 0; +} + +static int none_send_write(MultiFDSendParams *p, uint32_t used, Error **pe= rr) +{ + return qio_channel_writev_all(p->c, p->pages->iov, used, perr); +} + +static int none_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **pe= rr) +{ + return qio_channel_readv_all(p->c, p->pages->iov, used, perr); + +} + +MultifdMethods multifd_none_ops =3D { + .send_prepare =3D none_send_prepare, + .send_write =3D none_send_write, + .recv_pages =3D none_recv_pages +}; + static int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp) { MultiFDInit_t msg; @@ -904,6 +938,8 @@ struct { uint64_t packet_num; /* send channels ready */ QemuSemaphore channels_ready; + /* multifd ops */ + MultifdMethods *ops; } *multifd_send_state; =20 /* @@ -1093,6 +1129,8 @@ static void *multifd_send_thread(void *opaque) /* initial packet */ p->num_packets =3D 1; =20 + multifd_send_state->ops =3D &multifd_none_ops; + while (true) { qemu_sem_wait(&p->sem); qemu_mutex_lock(&p->mutex); @@ -1102,7 +1140,12 @@ static void *multifd_send_thread(void *opaque) uint64_t packet_num =3D p->packet_num; uint32_t flags =3D p->flags; =20 - p->next_packet_size =3D used * qemu_target_page_size(); + if (used) { + ret =3D multifd_send_state->ops->send_prepare(p, used); + if (ret !=3D 0) { + break; + } + } multifd_send_fill_packet(p); p->flags =3D 0; p->num_packets++; @@ -1120,8 +1163,7 @@ static void *multifd_send_thread(void *opaque) } =20 if (used) { - ret =3D qio_channel_writev_all(p->c, p->pages->iov, - used, &local_err); + ret =3D multifd_send_state->ops->send_write(p, used, &loca= l_err); if (ret !=3D 0) { break; } @@ -1223,6 +1265,8 @@ struct { QemuSemaphore sem_sync; /* global number of generated multifd packets */ uint64_t packet_num; + /* multifd ops */ + MultifdMethods *ops; } *multifd_recv_state; =20 static void multifd_recv_terminate_threads(Error *err) @@ -1324,6 +1368,7 @@ static void *multifd_recv_thread(void *opaque) trace_multifd_recv_thread_start(p->id); rcu_register_thread(); =20 + multifd_recv_state->ops =3D &multifd_none_ops; while (true) { uint32_t used; uint32_t flags; @@ -1353,8 +1398,7 @@ static void *multifd_recv_thread(void *opaque) qemu_mutex_unlock(&p->mutex); =20 if (used) { - ret =3D qio_channel_readv_all(p->c, p->pages->iov, - used, &local_err); + ret =3D multifd_recv_state->ops->recv_pages(p, used, &local_er= r); if (ret !=3D 0) { break; } --=20 2.21.0