From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: [patch 2/6] make cpu_physical_memory_set_dirty_tracking equal to upstream Date: Tue, 23 Mar 2010 13:53:35 -0300 Message-ID: <20100323165346.933160141@amt.cnet> References: <20100323165333.062022913@amt.cnet> Cc: Marcelo Tosatti To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:22518 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752570Ab0CWQzI (ORCPT ); Tue, 23 Mar 2010 12:55:08 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2NGt8VP022290 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 23 Mar 2010 12:55:08 -0400 Content-Disposition: inline; filename=remove-in-migration-removal Sender: kvm-owner@vger.kernel.org List-ID: Probably introduced by mismerge. Signed-off-by: Marcelo Tosatti Index: qemu-kvm-cleanups/exec.c =================================================================== --- qemu-kvm-cleanups.orig/exec.c +++ qemu-kvm-cleanups/exec.c @@ -2003,7 +2003,7 @@ void cpu_physical_memory_reset_dirty(ram int cpu_physical_memory_set_dirty_tracking(int enable) { int ret = 0; - + in_migration = enable; ret = cpu_notify_migration_log(!!enable); return ret; }