From patchwork Thu Feb 4 15:27:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 77032 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o14FUrt1015920 for ; Thu, 4 Feb 2010 15:30:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932756Ab0BDPan (ORCPT ); Thu, 4 Feb 2010 10:30:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62261 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932221Ab0BDPam (ORCPT ); Thu, 4 Feb 2010 10:30:42 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o14FUgf3024239 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 4 Feb 2010 10:30:42 -0500 Received: from redhat.com (vpn2-9-138.ams2.redhat.com [10.36.9.138]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o14FUef6016164 for ; Thu, 4 Feb 2010 10:30:41 -0500 Date: Thu, 4 Feb 2010 17:27:31 +0200 From: "Michael S. Tsirkin" To: kvm@vger.kernel.org Subject: [PATCH 03/20] kvm: move kvm to use memory notifiers Message-ID: <20100204152731.GD8461@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 04 Feb 2010 15:30:54 +0000 (UTC) diff --git a/exec.c b/exec.c index fb3ce3f..8c310d5 100644 --- a/exec.c +++ b/exec.c @@ -1998,12 +1998,6 @@ int cpu_physical_memory_set_dirty_tracking(int enable) { int ret = 0; in_migration = enable; - if (kvm_enabled()) { - ret = kvm_set_migration_log(enable); - } - if (ret < 0) { - return ret; - } ret = cpu_notify_migration_log(!!enable); return ret; } @@ -2016,14 +2010,8 @@ int cpu_physical_memory_get_dirty_tracking(void) int cpu_physical_sync_dirty_bitmap(target_phys_addr_t start_addr, target_phys_addr_t end_addr) { - int ret = 0; + int ret; - if (kvm_enabled()) { - ret = kvm_physical_sync_dirty_bitmap(start_addr, end_addr); - } - if (ret < 0) { - return ret; - } ret = cpu_notify_sync_dirty_bitmap(start_addr, end_addr); return ret; } @@ -2436,9 +2424,6 @@ void cpu_register_physical_memory_offset(target_phys_addr_t start_addr, ram_addr_t orig_size = size; void *subpage; - if (kvm_enabled()) - kvm_set_phys_mem(start_addr, size, phys_offset); - cpu_notify_set_memory(start_addr, size, phys_offset); if (phys_offset == IO_MEM_UNASSIGNED) { diff --git a/kvm-all.c b/kvm-all.c index 0fc6019..f31585e 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -259,7 +259,7 @@ int kvm_log_stop(target_phys_addr_t phys_addr, ram_addr_t size) KVM_MEM_LOG_DIRTY_PAGES); } -int kvm_set_migration_log(int enable) +static int kvm_set_migration_log(int enable) { KVMState *s = kvm_state; KVMSlot *mem; @@ -294,8 +294,8 @@ static int test_le_bit(unsigned long nr, unsigned char *addr) * @start_add: start of logged region. * @end_addr: end of logged region. */ -int kvm_physical_sync_dirty_bitmap(target_phys_addr_t start_addr, - target_phys_addr_t end_addr) +static int kvm_physical_sync_dirty_bitmap(target_phys_addr_t start_addr, + target_phys_addr_t end_addr) { KVMState *s = kvm_state; unsigned long size, allocated_size = 0; @@ -536,6 +536,33 @@ void kvm_set_phys_mem(target_phys_addr_t start_addr, } } +static void kvm_client_set_memory(struct CPUPhysMemoryClient *client, + target_phys_addr_t start_addr, + ram_addr_t size, + ram_addr_t phys_offset) +{ + kvm_set_phys_mem(start_addr, size, phys_offset); +} + +static int kvm_client_sync_dirty_bitmap(struct CPUPhysMemoryClient *client, + target_phys_addr_t start_addr, + target_phys_addr_t end_addr) +{ + return kvm_physical_sync_dirty_bitmap(start_addr, end_addr); +} + +static int kvm_client_migration_log(struct CPUPhysMemoryClient *client, + int enable) +{ + return kvm_set_migration_log(enable); +} + +static CPUPhysMemoryClient kvm_cpu_phys_memory_client = { + .set_memory = kvm_client_set_memory, + .sync_dirty_bitmap = kvm_client_sync_dirty_bitmap, + .migration_log = kvm_client_migration_log, +}; + int kvm_init(int smp_cpus) { static const char upgrade_note[] = @@ -632,6 +659,7 @@ int kvm_init(int smp_cpus) goto err; kvm_state = s; + cpu_register_phys_memory_client(&kvm_cpu_phys_memory_client); return 0; diff --git a/kvm.h b/kvm.h index 9fa4e25..7b33177 100644 --- a/kvm.h +++ b/kvm.h @@ -38,16 +38,8 @@ int kvm_init_vcpu(CPUState *env); int kvm_cpu_exec(CPUState *env); -void kvm_set_phys_mem(target_phys_addr_t start_addr, - ram_addr_t size, - ram_addr_t phys_offset); - -int kvm_physical_sync_dirty_bitmap(target_phys_addr_t start_addr, - target_phys_addr_t end_addr); - int kvm_log_start(target_phys_addr_t phys_addr, ram_addr_t size); int kvm_log_stop(target_phys_addr_t phys_addr, ram_addr_t size); -int kvm_set_migration_log(int enable); int kvm_has_sync_mmu(void); #endif /* KVM_UPSTREAM */