From nobody Sat May 18 21:45:15 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=1683797022; cv=none; d=zohomail.com; s=zohoarc; b=SdoqlqQCPu3m7uk/dunVOwvcjEzGSO58Z/N+NFwRUBbQnillrDJ7vVCKhw3Q+60jrSvdf6kQd8fN2+2eoqzoENoUeniTW0W6azyDD67RwdLJiWKKrVMjIuVF4gWuO81qjBzB3JX2Ejf6kwSENocF9cuNPQZTVs/rbqyl1w5DCtQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683797022; 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; bh=E2vhftrlV08Q6dycDXdiQ/8heo5Xz30wx7HacOmM3yA=; b=BioyepgkX03oKMkHEohKOXxdJvd4zi1S8SMVNKGexhyoBrviTEKPbvG9WMyLdZsZl1cMQ07VMLNjKT3b2XX23jLZzq5gYICmN8KnUR5M9YDjCCqNYefkY3bofFbBZHrhP+DMiPds5Vg6vn+wxUTbBO9tcGktSSWJcv7sklhS7CQ= 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 1683797022168430.1925807673076; Thu, 11 May 2023 02:23:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px2Ve-0004oT-L2; Thu, 11 May 2023 05:22: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 1px2Vd-0004na-L0 for qemu-devel@nongnu.org; Thu, 11 May 2023 05:22:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1px2Vb-0008Ml-Tl for qemu-devel@nongnu.org; Thu, 11 May 2023 05:22:49 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-61-gBvgBCnpPpyfy_wVZC2N7Q-1; Thu, 11 May 2023 05:22:45 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 369053850550; Thu, 11 May 2023 09:22:44 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9995400E89; Thu, 11 May 2023 09:22:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683796966; 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=E2vhftrlV08Q6dycDXdiQ/8heo5Xz30wx7HacOmM3yA=; b=K89Xsrqqx7GMg4ZGFEjL+1igLxJKKruSUrzX/SXdd/ybZYZUcgC5awGmAKnUwmhagly09b 3smcMfHFQ88PnHYWpKCujXtBgvTFxfQovbYnlgV2G5blKs/uF1eSoyVHttgHf4eSJ7IdC0 2Vt22/Te6/uWieS3l8MyD2vnMK3mXfU= X-MC-Unique: gBvgBCnpPpyfy_wVZC2N7Q-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Andrei Gudkov , Leonardo Bras , Chuan Zheng , Juan Quintela , Peter Xu , Zhenzhong Duan Subject: [PATCH 1/3] migration: Teach dirtyrate about qemu_target_page_size() Date: Thu, 11 May 2023 11:22:37 +0200 Message-Id: <20230511092239.14607-2-quintela@redhat.com> In-Reply-To: <20230511092239.14607-1-quintela@redhat.com> References: <20230511092239.14607-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.129.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, 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: 1683797022378100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela --- migration/dirtyrate.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 180ba38c7a..9aa092738c 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -17,6 +17,7 @@ #include "cpu.h" #include "exec/ramblock.h" #include "exec/ram_addr.h" +#include "exec/target_page.h" #include "qemu/rcu_queue.h" #include "qemu/main-loop.h" #include "qapi/qapi-commands-migration.h" @@ -78,7 +79,7 @@ static int64_t do_calculate_dirtyrate(DirtyPageRecord dir= ty_pages, uint64_t increased_dirty_pages =3D dirty_pages.end_pages - dirty_pages.start_pages; =20 - memory_size_MB =3D (increased_dirty_pages * TARGET_PAGE_SIZE) >> 20; + memory_size_MB =3D (increased_dirty_pages * qemu_target_page_size()) >= > 20; =20 return memory_size_MB * 1000 / calc_time_ms; } @@ -291,8 +292,8 @@ static void update_dirtyrate_stat(struct RamblockDirtyI= nfo *info) DirtyStat.page_sampling.total_dirty_samples +=3D info->sample_dirty_co= unt; DirtyStat.page_sampling.total_sample_count +=3D info->sample_pages_cou= nt; /* size of total pages in MB */ - DirtyStat.page_sampling.total_block_mem_MB +=3D (info->ramblock_pages * - TARGET_PAGE_SIZE) >> 20; + DirtyStat.page_sampling.total_block_mem_MB +=3D + (info->ramblock_pages * qemu_target_page_size()) >> 20; } =20 static void update_dirtyrate(uint64_t msec) @@ -315,10 +316,10 @@ static void update_dirtyrate(uint64_t msec) static uint32_t get_ramblock_vfn_hash(struct RamblockDirtyInfo *info, uint64_t vfn) { + int page_size =3D qemu_target_page_size(); uint32_t crc; =20 - crc =3D crc32(0, (info->ramblock_addr + - vfn * TARGET_PAGE_SIZE), TARGET_PAGE_SIZE); + crc =3D crc32(0, info->ramblock_addr + vfn * page_size, page_size); =20 trace_get_ramblock_vfn_hash(info->idstr, vfn, crc); return crc; --=20 2.40.1 From nobody Sat May 18 21:45:15 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=1683797022; cv=none; d=zohomail.com; s=zohoarc; b=koB8R/B/fZifqHmagf7CC5lC5JaAd2UG/OWgnp4+B+icJ+h/DNuOad7mbwW/s+2HYFBgXccqnFYVmGfLrIGzheqwm4mO1bHASDs+zNIp6rtZ+f7jgifwUCmD5HtbNolqMJG/MWgrVEpzexnJCFVyYj2wzeYdNrWILh3wA6tnBnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683797022; 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; bh=lIQzWRK3c35eHzV92PtfkI5OakCDeM/9T6Vl7SUWqc8=; b=TUaFYJcMQt8UDRIiRL/Wmn6S7lHFOFPTj02zlGfiN46+6Akhz0sZKAO7/mEA4GK/tqnKOr16459QRjAhURDcUwLDIB8TC7WtcaDH4zcrNP6k2cPGTCWKtSJenAixl8uBqr7GoZwqbhofmGMcI2lKVYUbsEwvuhQqi8jwKVWFpFY= 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 1683797022097698.9844485503148; Thu, 11 May 2023 02:23:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px2Vn-0004tT-Qj; Thu, 11 May 2023 05:22:59 -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 1px2Vl-0004sw-Da for qemu-devel@nongnu.org; Thu, 11 May 2023 05:22:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1px2Vk-0008NY-2T for qemu-devel@nongnu.org; Thu, 11 May 2023 05:22:57 -0400 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-175-M0VfiIIhPIaVukifgPZLRg-1; Thu, 11 May 2023 05:22:46 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DE7CF84AF33; Thu, 11 May 2023 09:22:45 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C8AF401061; Thu, 11 May 2023 09:22:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683796975; 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=lIQzWRK3c35eHzV92PtfkI5OakCDeM/9T6Vl7SUWqc8=; b=dqnQ7p8AUhePnmAZreNhtn1cL838/oqoMyBrBe5XuZXioMelVOj5zhmH12ls0f/6NyAQfu BoPCbxOZWGy7MgxyUm1HIuivUOhhPDRorJ6aAXdF7e3Y+6o3824wZ8TdwxDNpk4mPmlDFr j8i6bKDCf0T3JOP8OH3uh2p1vNBm784= X-MC-Unique: M0VfiIIhPIaVukifgPZLRg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Andrei Gudkov , Leonardo Bras , Chuan Zheng , Juan Quintela , Peter Xu , Zhenzhong Duan Subject: [PATCH 2/3] migration: Teach dirtyrate about qemu_target_page_bits() Date: Thu, 11 May 2023 11:22:38 +0200 Message-Id: <20230511092239.14607-3-quintela@redhat.com> In-Reply-To: <20230511092239.14607-1-quintela@redhat.com> References: <20230511092239.14607-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.129.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, 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: 1683797022376100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- migration/dirtyrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 9aa092738c..76c8b96ab4 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -374,7 +374,7 @@ static void get_ramblock_dirty_info(RAMBlock *block, sample_pages_per_gigabytes) >> 30; /* Right shift TARGET_PAGE_BITS to calc page count */ info->ramblock_pages =3D qemu_ram_get_used_length(block) >> - TARGET_PAGE_BITS; + qemu_target_page_bits(); info->ramblock_addr =3D qemu_ram_get_host_addr(block); strcpy(info->idstr, qemu_ram_get_idstr(block)); } @@ -485,7 +485,7 @@ find_block_matched(RAMBlock *block, int count, =20 if (infos[i].ramblock_addr !=3D qemu_ram_get_host_addr(block) || infos[i].ramblock_pages !=3D - (qemu_ram_get_used_length(block) >> TARGET_PAGE_BITS)) { + (qemu_ram_get_used_length(block) >> qemu_target_page_bits())) { trace_find_page_matched(block->idstr); return NULL; } --=20 2.40.1 From nobody Sat May 18 21:45:15 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=1683797034; cv=none; d=zohomail.com; s=zohoarc; b=ByoD44Z/dSWqCLCNDiIgoi0NrtSnJFbif6ea1NVhMc7iycrX7AoHKGtu17oSJQ6z3CFA6OwtOes1ozLmsyMAo4lZxfvP3U+EUdJEyzC2ybN6ehc+OSFehGkLiNXuHqujTexzZQ4AFqfl33NPBSiVVDD1oHV86KKA/5hYMq4+STw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683797034; 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; bh=T6GPsrIhs+hKzKaHzptXYsq/NFKQGH8ji3Q2xjKZvx4=; b=YTSqLNaWq2RHT3AKiqxZT7vtGk6TBPw2KoChDp5TIf6L4Ol90nv1Nrj0D/XhnkpwkVk7seIHf5sQlw+hXLxBFesv6QML+oVOWLPlMiO11Ofx4/8S9Qrz7VwXX02Uf2Jg8BBeu3ObHutQGHUwczMhSDHDVBFTNclZ1CuHzV0cHm4= 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 1683797034588310.8835273007754; Thu, 11 May 2023 02:23:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px2Vj-0004sh-7l; Thu, 11 May 2023 05:22:55 -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 1px2Vh-0004ru-K0 for qemu-devel@nongnu.org; Thu, 11 May 2023 05:22:53 -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 1px2Vg-0008NH-6s for qemu-devel@nongnu.org; Thu, 11 May 2023 05:22:53 -0400 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-250-XptaJIY0PjShoPemWqv5cw-1; Thu, 11 May 2023 05:22:48 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9641A101A551; Thu, 11 May 2023 09:22:47 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31FA8400E89; Thu, 11 May 2023 09:22:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683796971; 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=T6GPsrIhs+hKzKaHzptXYsq/NFKQGH8ji3Q2xjKZvx4=; b=BcyKPXeePoyUZiZdJ3gIji0QtKhPfpwnKMWseZV/8TZGM1YLdTvY62sjwiY8x+v6y2Aq3G FsmZKlwkj0T7l3c7xI98CAtw1XEaOVGRoWG8c8H+jTMItmX3MFX+s8RJI1VbK8V91Zd2xz ZknfQmRIZq0sNxl2twulMSWNUcfmatA= X-MC-Unique: XptaJIY0PjShoPemWqv5cw-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Andrei Gudkov , Leonardo Bras , Chuan Zheng , Juan Quintela , Peter Xu , Zhenzhong Duan Subject: [PATCH 3/3] migration: Make dirtyrate.c target independent Date: Thu, 11 May 2023 11:22:39 +0200 Message-Id: <20230511092239.14607-4-quintela@redhat.com> In-Reply-To: <20230511092239.14607-1-quintela@redhat.com> References: <20230511092239.14607-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683797035090100001 Content-Type: text/plain; charset="utf-8" After the previous two patches, there is nothing else that is target specific. Signed-off-by: Juan Quintela Reviewed-by: Richard Henderson --- migration/dirtyrate.c | 2 -- migration/meson.build | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 76c8b96ab4..f814745bf7 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -14,9 +14,7 @@ #include "qemu/error-report.h" #include #include "qapi/error.h" -#include "cpu.h" #include "exec/ramblock.h" -#include "exec/ram_addr.h" #include "exec/target_page.h" #include "qemu/rcu_queue.h" #include "qemu/main-loop.h" diff --git a/migration/meson.build b/migration/meson.build index eb41b77db9..da437b4a27 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -40,8 +40,7 @@ if get_option('live_block_migration').allowed() softmmu_ss.add(files('block.c')) endif softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c')) - +softmmu_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('dirtyrate.c')) specific_ss.add(when: 'CONFIG_SOFTMMU', - if_true: files('dirtyrate.c', - 'ram.c', + if_true: files('ram.c', 'target.c')) --=20 2.40.1