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 04FA9C636CC for ; Wed, 15 Feb 2023 20:07:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSO2n-0003Vv-0m; Wed, 15 Feb 2023 15:06:21 -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 1pSO2l-0003Uc-EJ for qemu-devel@nongnu.org; Wed, 15 Feb 2023 15:06:19 -0500 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 1pSO2i-0006c2-SD for qemu-devel@nongnu.org; Wed, 15 Feb 2023 15:06:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676491575; 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=8HBDlS8YGQFwLRNtPts38vTJnZT72kt65ZZY6qT/Zzg=; b=NlRmSjDp4YR5YylxvIA1Ax1BUBFKONwTa97N7dsUqYiKkaqrUIECZ/LTWwNkF1lBBTmS/h 6wMeVkZWSPg+8kYKXHP0NIMg0B58ffdtFNJQ/GMOgCo7LC4KdEb70Bvh/Z74BY44syZcSJ LmQhv3kksftu0IFlX/tXEfmjhMAJ3qk= 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-497-vcrt3zF5PJO163X5hMae1g-1; Wed, 15 Feb 2023 15:06:09 -0500 X-MC-Unique: vcrt3zF5PJO163X5hMae1g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 179D13815F7E; Wed, 15 Feb 2023 20:06:09 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41A19C15BA0; Wed, 15 Feb 2023 20:06:06 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: Eric Blake , qemu-s390x@nongnu.org, Juan Quintela , Thomas Huth , Halil Pasic , "Dr. David Alan Gilbert" , Vladimir Sementsov-Ogievskiy , Alex Williamson , Ilya Leoshkevich , qemu-block@nongnu.org, Stefan Hajnoczi , Fam Zheng , David Hildenbrand , John Snow , Christian Borntraeger , Richard Henderson , Eric Farman Subject: [PULL 3/5] migration: In case of postcopy, the memory ends in res_postcopy_only Date: Wed, 15 Feb 2023 21:05:52 +0100 Message-Id: <20230215200554.1365-4-quintela@redhat.com> In-Reply-To: <20230215200554.1365-1-quintela@redhat.com> References: <20230215200554.1365-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 So remove last assignation of res_compatible. Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Juan Quintela --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 521912385d..ecf697a58d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3528,7 +3528,7 @@ static void ram_state_pending_exact(void *opaque, if (migrate_postcopy_ram()) { /* We can do postcopy, and all the data is postcopiable */ - *res_compatible += remaining_size; + *res_postcopy_only += remaining_size; } else { *res_precopy_only += remaining_size; } -- 2.39.1