From nobody Tue Nov 26 20:28:33 2024 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=1705375355; cv=none; d=zohomail.com; s=zohoarc; b=aUvVSuiPmlVTw6LgokFKUMzoQcmCgQhWPzDUtjPqvzcIx7EIs8wrhHolngPOTOHJjF4U9QYttSKxLIs32KalTkPZB6xKAcaQk9zb7+KTeyuYjjvI81wBqWaxR42wNDXeWZVpp+HNLpyl2UaIMXndP2IH4+rRD2+IP0RWXyYaVIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705375355; 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=AAZOWz1VDAEpIhk2J3/myKMXglpqBFV6L3QJoHCSdrk=; b=FrKf+4Of3WtxNEQOFDkiyKU9svPByew++lgic8zNiiLX4XDNo0YVBoPTiH7AZZyoSD4eBq8JFi1xAPedMGZHWv0jZhmhAPK0+kyOpoYq2obA5VMPPbsw1S4o/L3YUK11uA0NJReojEcXXLTraG88HKP25rPz46z2/y7txImSlDE= 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 1705375355026213.7732036367737; Mon, 15 Jan 2024 19:22:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPZzj-0005fb-9V; Mon, 15 Jan 2024 22:20:07 -0500 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 1rPZzg-0005fA-Uk for qemu-devel@nongnu.org; Mon, 15 Jan 2024 22:20:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPZzf-0002lS-7A for qemu-devel@nongnu.org; Mon, 15 Jan 2024 22:20:04 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-572-fC1v7L7oMyyedHkMLoWj3w-1; Mon, 15 Jan 2024 22:19:59 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 31370102587D; Tue, 16 Jan 2024 03:19:59 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC6213C25; Tue, 16 Jan 2024 03:19:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705375202; 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=AAZOWz1VDAEpIhk2J3/myKMXglpqBFV6L3QJoHCSdrk=; b=Kv9O1YPFzn7AkZ17YvgntJBxjvQ6kqYW52Lq8jkpwIFunjULQCLRLEB3jCVlxI/+G+sttt 2+aW4BGpXgT/1Vsc4BslrbHdppYiqDubmDfrzTd4IXt2ZXy06fuCa2vjCSfPQ9P4ASVklD +74D/wYEEIGlNz0I7sreoFm+b2otoI4= X-MC-Unique: fC1v7L7oMyyedHkMLoWj3w-1 From: peterx@redhat.com To: qemu-devel@nongnu.org, Peter Maydell Cc: peterx@redhat.com, Fabiano Rosas Subject: [PULL 02/20] migration/multifd: Remove MultiFDPages_t::packet_num Date: Tue, 16 Jan 2024 11:19:29 +0800 Message-ID: <20240116031947.69017-3-peterx@redhat.com> In-Reply-To: <20240116031947.69017-1-peterx@redhat.com> References: <20240116031947.69017-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 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.133.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.531, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: 1705375355910100007 Content-Type: text/plain; charset="utf-8" From: Fabiano Rosas This was introduced by commit 34c55a94b1 ("migration: Create multipage support") and never used. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu Link: https://lore.kernel.org/r/20240104142144.9680-2-farosas@suse.de Signed-off-by: Peter Xu --- migration/multifd.h | 2 -- migration/multifd.c | 1 - 2 files changed, 3 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index a835643b48..b0ff610c37 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -58,8 +58,6 @@ typedef struct { uint32_t num; /* number of allocated pages */ uint32_t allocated; - /* global number of generated multifd packets */ - uint64_t packet_num; /* offset of each page */ ram_addr_t *offset; RAMBlock *block; diff --git a/migration/multifd.c b/migration/multifd.c index 9f353aecfa..3e650f5da0 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -250,7 +250,6 @@ static void multifd_pages_clear(MultiFDPages_t *pages) { pages->num =3D 0; pages->allocated =3D 0; - pages->packet_num =3D 0; pages->block =3D NULL; g_free(pages->offset); pages->offset =3D NULL; --=20 2.43.0