From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8872EC7EE22 for ; Thu, 11 May 2023 14:13:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px72I-0003Th-V2; Thu, 11 May 2023 10:12:50 -0400 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 1px72H-0003RN-HG for qemu-devel@nongnu.org; Thu, 11 May 2023 10:12:49 -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 1px72E-0004py-6W for qemu-devel@nongnu.org; Thu, 11 May 2023 10:12:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683814365; 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=2R5kpi8ozSZtgjDYzhPZfLi5z0tCW0T/HldABEpOb8Q=; b=IjdbgjiGUdTCLqoT8hQTbr6pHCtnjB2tsPY14/ybX2s076vVvXvz4EsqnXUoomjSb6Xppu N1uv/bSJZzXLDkuxGoILEjO/kvXWd7y61PXNuUN9DMed/OjlEnmDSjfhWPVCT/f16Ls3fz PYBd0I3RuzJYom9l5uiLkEvD3BnI/UU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-216-EXG9BSb3M2ePP4l-fBtNvw-1; Thu, 11 May 2023 10:12:37 -0400 X-MC-Unique: EXG9BSb3M2ePP4l-fBtNvw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3D80D88FBC5; Thu, 11 May 2023 14:12:26 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44A2B14171D5; Thu, 11 May 2023 14:12:24 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: David Hildenbrand , Leonardo Bras , Juan Quintela , Richard Henderson , Peter Xu , Andrei Gudkov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Zhenzhong Duan , Hyman Huang Subject: [PATCH v2 5/5] migration: Make dirtyrate.c target independent Date: Thu, 11 May 2023 16:12:08 +0200 Message-Id: <20230511141208.17779-6-quintela@redhat.com> In-Reply-To: <20230511141208.17779-1-quintela@redhat.com> References: <20230511141208.17779-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass client-ip=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org After the previous two patches, there is nothing else that is target specific. Signed-off-by: Juan Quintela Reviewed-by: Richard Henderson --- - Remove check for CONFIG_SOFTMMU for dirtyrate.c, not needed (thanks Richard) --- migration/dirtyrate.c | 2 -- migration/meson.build | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 2fd089e24a..f29c1c03ea 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -14,10 +14,8 @@ #include "qemu/error-report.h" #include #include "qapi/error.h" -#include "cpu.h" #include "exec/ramblock.h" #include "exec/target_page.h" -#include "exec/ram_addr.h" #include "qemu/rcu_queue.h" #include "qemu/main-loop.h" #include "qapi/qapi-commands-migration.h" diff --git a/migration/meson.build b/migration/meson.build index eb41b77db9..dc8b1daef5 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -13,6 +13,7 @@ softmmu_ss.add(files( 'block-dirty-bitmap.c', 'channel.c', 'channel-block.c', + 'dirtyrate.c', 'exec.c', 'fd.c', 'global_state.c', @@ -42,6 +43,5 @@ endif softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c')) specific_ss.add(when: 'CONFIG_SOFTMMU', - if_true: files('dirtyrate.c', - 'ram.c', + if_true: files('ram.c', 'target.c')) -- 2.40.1