From nobody Mon Aug 24 19:52:12 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780580772; cv=none; d=zohomail.com; s=zohoarc; b=YAvWGuxWDObTJBOwUAnf6XyS0eU0sivQPf7LlXDCRh6Qy7BcuIp+apyuSn165dtEqbiyYkiNMI1OzuYB2qjaCFPXgLSZv2piYAOo/GmNZcoofafJhkivDn1e92a5RRW+lLVD82XbaB0MLqONtC1anlriRBJvQk9nX9nNm3NqYa8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780580772; h=Content-Type: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=AsFFSlmcPgz7P59Jq1uN1IgQFXLbNpyWVcPlkHq1ipM=; b=TNjcbsSteUrJeT5mc3Ixk7T2f0+ggjEEmi9lrNRyfylPfF8NFXL4wbySH+YtdxP+N5kVRCV2fL8ZWowB9oYqWCi54E32uwhCpw9Uay0lNgNbJBXI1P989d+VEeSWLSIgRY6qZ7xjsHHjYkS0Sn5y42cH1RqINhc5yeIzWVnnQtk= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780580772602374.8317976984889; Thu, 4 Jun 2026 06:46:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wV8OX-0002Dy-Vq; Thu, 04 Jun 2026 09:46:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wV8Nh-0001Qv-81 for qemu-devel@nongnu.org; Thu, 04 Jun 2026 09:45:13 -0400 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 1wV8Ne-00009z-4W for qemu-devel@nongnu.org; Thu, 04 Jun 2026 09:45:08 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-110-qfCjTpTzMWKKvnSxi9D55Q-1; Thu, 04 Jun 2026 09:45:00 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4BC6A1800347; Thu, 4 Jun 2026 13:44:58 +0000 (UTC) Received: from localhost (unknown [10.44.24.6]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4D5C51955BC0; Thu, 4 Jun 2026 13:44:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780580705; 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=AsFFSlmcPgz7P59Jq1uN1IgQFXLbNpyWVcPlkHq1ipM=; b=ctpDd6V/DLuWWsl+IkSr4rWg2XNZJlXbMvMAxlzySRAIsrFDAZ48dRjkFzAY4BfAZ2LTc0 00zF8VF2DNSCFQnMiGGXjI6BFDjvpn4ixEJEShUHEMNXy9ngS6pLe28hyh2IGo5WMqwNRN 79yEsAhw5ZFFl49i0Li2dtqOO7wEOqA= X-MC-Unique: qfCjTpTzMWKKvnSxi9D55Q-1 X-Mimecast-MFC-AGG-ID: qfCjTpTzMWKKvnSxi9D55Q_1780580698 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Thu, 04 Jun 2026 17:43:51 +0400 Subject: [PATCH v5 05/12] virtio-mem: remove replay_populated/replay_discarded implementation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260604-rdm5-v5-5-5768e6a0943d@redhat.com> References: <20260604-rdm5-v5-0-5768e6a0943d@redhat.com> In-Reply-To: <20260604-rdm5-v5-0-5768e6a0943d@redhat.com> To: qemu-devel@nongnu.org Cc: Zhenzhong Duan , "Michael S. Tsirkin" , David Hildenbrand , Paolo Bonzini , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-rust@nongnu.org, Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , "Maciej S. Szmigiero" , Fabiano Rosas , Mark Kanda , Ben Chaney , Marcelo Tosatti , kvm@vger.kernel.org, "Dr. David Alan Gilbert" , Zhao Liu , Eric Blake , Markus Armbruster , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=5923; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=OJfVRBp7kCu62VvYNEMbvrRpWVFwhQJwSIkKTdgTM0k=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqIYExU3XsLYMtzB6g9a2modKeMvbuSi/RhKIEJ xPm44PSgLuJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaiGBMQAKCRDa6OEJdZac 5QyDEAC1IKVU66N5vpwBNfqfKEeFtZnWip/EZlk8WqJ/wNXONiL0142IWp0g0BdMvjvSaigqrx1 MbcSao7FUjT055+E3UraMDXM8sm5KYWxByptwmw1nNbXjxwamOLFOefoKfpKRA+c9FSxLpDapUJ cd9W7FSxtNZU/S+5hNg4jGM14pCfiqvusB6cPNbYGIvS1Dmz0TsdwPmeDDUwobjnU188jldAEWP 9mIQkxutRAtoktRXGU1YC4MILVaMyYAvyTKX1MIQkRf5jKpMu80tkeh3hizGv7RcfpL+NhmC8MN EZLznrnEmlCIG6/f1ZuzWQ5WHZWLXTT/ruswsS3hun9WBPxE307BODeAqhE8PNKhNMolyZR0uM5 ONARGWMNe/qcEAJ+UO3rFK/kzGlwQVgYESnGX8WCJpCKf2tC4txFKSmILPfYChC3oD5e2hAFeIP w1b0knitK+Lr/snJMVVPU2Mo2osjItNbsvr3o4Fb0Ei0n+PPAy2dkhos4p3l6XsJodNJNQUdnjQ 4Zj2Gmb+ZtzukUhmb29NejpefK86U7VbwbaBBzrlC1ReRqbIdZFiJmZGVDgl7EVQx64lUMiGxRC L4zaM3CV2jLpCira/9mk15V3HwLHW5vNi6bUsso3UiG+R17O9d+4zhhiPeXhGKDHdu4y9bUxN/p yb8Qp7FxxawblhQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development 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: 1780580774886158500 The replay iteration logic has been moved into the RamDiscardManager, which now iterates at source granularity using is_populated(). The source-level replay_populated/replay_discarded methods and their helpers are no longer called. Remove the now-dead replay methods, the VirtIOMEMReplayData struct, the virtio_mem_for_each_plugged/unplugged_section() helpers (only used by the replay methods), and the virtio_mem_section_cb typedef. Reviewed-by: Peter Xu Acked-by: David Hildenbrand Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/virtio/virtio-mem.c | 112 ---------------------------------------------= ---- 1 file changed, 112 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index ec165503205..2b67b2882d2 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -259,72 +259,6 @@ static int virtio_mem_for_each_plugged_range(VirtIOMEM= *vmem, void *arg, return ret; } =20 -typedef int (*virtio_mem_section_cb)(MemoryRegionSection *s, void *arg); - -static int virtio_mem_for_each_plugged_section(const VirtIOMEM *vmem, - const MemoryRegionSection *= s, - void *arg, - virtio_mem_section_cb cb) -{ - unsigned long first_bit, last_bit; - uint64_t offset, size; - int ret =3D 0; - - first_bit =3D s->offset_within_region / vmem->block_size; - first_bit =3D find_next_bit(vmem->bitmap, vmem->bitmap_size, first_bit= ); - while (first_bit < vmem->bitmap_size) { - MemoryRegionSection tmp =3D *s; - - offset =3D first_bit * vmem->block_size; - last_bit =3D find_next_zero_bit(vmem->bitmap, vmem->bitmap_size, - first_bit + 1) - 1; - size =3D (last_bit - first_bit + 1) * vmem->block_size; - - if (!memory_region_section_intersect_range(&tmp, offset, size)) { - break; - } - ret =3D cb(&tmp, arg); - if (ret) { - break; - } - first_bit =3D find_next_bit(vmem->bitmap, vmem->bitmap_size, - last_bit + 2); - } - return ret; -} - -static int virtio_mem_for_each_unplugged_section(const VirtIOMEM *vmem, - const MemoryRegionSection= *s, - void *arg, - virtio_mem_section_cb cb) -{ - unsigned long first_bit, last_bit; - uint64_t offset, size; - int ret =3D 0; - - first_bit =3D s->offset_within_region / vmem->block_size; - first_bit =3D find_next_zero_bit(vmem->bitmap, vmem->bitmap_size, firs= t_bit); - while (first_bit < vmem->bitmap_size) { - MemoryRegionSection tmp =3D *s; - - offset =3D first_bit * vmem->block_size; - last_bit =3D find_next_bit(vmem->bitmap, vmem->bitmap_size, - first_bit + 1) - 1; - size =3D (last_bit - first_bit + 1) * vmem->block_size; - - if (!memory_region_section_intersect_range(&tmp, offset, size)) { - break; - } - ret =3D cb(&tmp, arg); - if (ret) { - break; - } - first_bit =3D find_next_zero_bit(vmem->bitmap, vmem->bitmap_size, - last_bit + 2); - } - return ret; -} - static void virtio_mem_notify_unplug(VirtIOMEM *vmem, uint64_t offset, uint64_t size) { @@ -1667,50 +1601,6 @@ static bool virtio_mem_rds_is_populated(const RamDis= cardSource *rds, return virtio_mem_is_range_plugged(vmem, start_gpa, end_gpa - start_gp= a); } =20 -struct VirtIOMEMReplayData { - ReplayRamDiscardState fn; - void *opaque; -}; - -static int virtio_mem_rds_replay_cb(MemoryRegionSection *s, void *arg) -{ - struct VirtIOMEMReplayData *data =3D arg; - - return data->fn(s, data->opaque); -} - -static int virtio_mem_rds_replay_populated(const RamDiscardSource *rds, - const MemoryRegionSection *s, - ReplayRamDiscardState replay_fn, - void *opaque) -{ - const VirtIOMEM *vmem =3D VIRTIO_MEM(rds); - struct VirtIOMEMReplayData data =3D { - .fn =3D replay_fn, - .opaque =3D opaque, - }; - - g_assert(s->mr =3D=3D &vmem->memdev->mr); - return virtio_mem_for_each_plugged_section(vmem, s, &data, - virtio_mem_rds_replay_cb); -} - -static int virtio_mem_rds_replay_discarded(const RamDiscardSource *rds, - const MemoryRegionSection *s, - ReplayRamDiscardState replay_fn, - void *opaque) -{ - const VirtIOMEM *vmem =3D VIRTIO_MEM(rds); - struct VirtIOMEMReplayData data =3D { - .fn =3D replay_fn, - .opaque =3D opaque, - }; - - g_assert(s->mr =3D=3D &vmem->memdev->mr); - return virtio_mem_for_each_unplugged_section(vmem, s, &data, - virtio_mem_rds_replay_cb); -} - static void virtio_mem_unplug_request_check(VirtIOMEM *vmem, Error **errp) { if (vmem->unplugged_inaccessible =3D=3D ON_OFF_AUTO_OFF) { @@ -1766,8 +1656,6 @@ static void virtio_mem_class_init(ObjectClass *klass,= const void *data) =20 rdsc->get_min_granularity =3D virtio_mem_rds_get_min_granularity; rdsc->is_populated =3D virtio_mem_rds_is_populated; - rdsc->replay_populated =3D virtio_mem_rds_replay_populated; - rdsc->replay_discarded =3D virtio_mem_rds_replay_discarded; } =20 static const TypeInfo virtio_mem_info =3D { --=20 2.54.0