From patchwork Thu Feb 4 12:42:15 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: 44479 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C13F5B6F08 for ; Fri, 5 Feb 2010 00:11:33 +1100 (EST) Received: from localhost ([127.0.0.1]:41310 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nd1Bc-0004JC-07 for incoming@patchwork.ozlabs.org; Thu, 04 Feb 2010 07:51:56 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nd15O-0002j2-OJ for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:45:30 -0500 Received: from [199.232.76.173] (port=34372 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nd15O-0002ik-B3 for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:45:30 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nd15M-0007NZ-Iw for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:45:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24512) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nd15M-0007NN-3k for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:45:28 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o14CjQaD004827 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Feb 2010 07:45:26 -0500 Received: from redhat.com (vpn2-9-138.ams2.redhat.com [10.36.9.138]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o14CjOrN024920; Thu, 4 Feb 2010 07:45:25 -0500 Date: Thu, 4 Feb 2010 14:42:15 +0200 From: "Michael S. Tsirkin" To: Anthony Liguori , qemu-devel@nongnu.org Message-ID: <20100204124215.GD22559@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.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 03/15] kvm: move kvm to use memory notifiers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org remove direct kvm calls from exec.c, make kvm use memory notifiers framework instead. Signed-off-by: Michael S. Tsirkin Acked-by: Avi Kivity --- exec.c | 17 +---------------- kvm-all.c | 40 ++++++++++++++++++++++++++++++++++------ kvm.h | 8 -------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/exec.c b/exec.c index d713b72..2e7434e 100644 --- a/exec.c +++ b/exec.c @@ -1979,12 +1979,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; } @@ -1997,14 +1991,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; } @@ -2417,9 +2405,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 4efb653..a312654 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -257,7 +257,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; @@ -292,8 +292,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; @@ -394,9 +394,9 @@ int kvm_check_extension(KVMState *s, unsigned int extension) return ret; } -void kvm_set_phys_mem(target_phys_addr_t start_addr, - ram_addr_t size, - ram_addr_t phys_offset) +static void kvm_set_phys_mem(target_phys_addr_t start_addr, + ram_addr_t size, + ram_addr_t phys_offset) { KVMState *s = kvm_state; ram_addr_t flags = phys_offset & ~TARGET_PAGE_MASK; @@ -532,6 +532,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[] = @@ -628,6 +655,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 1c93ac5..672d511 100644 --- a/kvm.h +++ b/kvm.h @@ -35,16 +35,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); int kvm_has_vcpu_events(void);