From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0sf8-0006bu-1r for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:31:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0sf4-0007ni-5a for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:31:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0sf4-0007nb-0p for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:31:54 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id ADA9C293317 for ; Fri, 5 Jun 2015 14:31:53 +0000 (UTC) From: Paolo Bonzini Date: Fri, 5 Jun 2015 16:31:28 +0200 Message-Id: <1433514693-19414-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1433514693-19414-1-git-send-email-pbonzini@redhat.com> References: <1433514693-19414-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 07/12] kvm-all: add support for multiple address spaces List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lersek@redhat.com, kraxel@redhat.com, mst@redhat.com Make kvm_memory_listener_register public, and assign a kernel address space id to each KVMMemoryListener. Signed-off-by: Paolo Bonzini --- include/sysemu/kvm_int.h | 4 ++++ kvm-all.c | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h index d15f8bb..888557a 100644 --- a/include/sysemu/kvm_int.h +++ b/include/sysemu/kvm_int.h @@ -25,6 +25,7 @@ typedef struct KVMSlot typedef struct KVMMemoryListener { MemoryListener listener; KVMSlot *slots; + int as_id; } KVMMemoryListener; #define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm") @@ -32,4 +33,7 @@ typedef struct KVMMemoryListener { #define KVM_STATE(obj) \ OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL) +void kvm_memory_listener_register(KVMState *s, KVMMemoryListener *kml, + AddressSpace *as, int as_id); + #endif diff --git a/kvm-all.c b/kvm-all.c index ddb1848..9d88b97 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -218,7 +218,7 @@ static int kvm_set_user_memory_region(KVMMemoryListener *kml, KVMSlot *slot) KVMState *s = kvm_state; struct kvm_userspace_memory_region mem; - mem.slot = slot->slot; + mem.slot = slot->slot | (kml->as_id << 16); mem.guest_phys_addr = slot->start_addr; mem.userspace_addr = (unsigned long)slot->ram; mem.flags = slot->flags; @@ -420,8 +420,7 @@ static int kvm_physical_sync_dirty_bitmap(KVMMemoryListener *kml, allocated_size = size; memset(d.dirty_bitmap, 0, allocated_size); - d.slot = mem->slot; - + d.slot = mem->slot | (kml->as_id << 16); if (kvm_vm_ioctl(s, KVM_GET_DIRTY_LOG, &d) == -1) { DPRINTF("ioctl failed %d\n", errno); ret = -1; @@ -884,13 +883,13 @@ static void kvm_io_ioeventfd_del(MemoryListener *listener, } } -static void kvm_memory_listener_register(KVMState *s, - KVMMemoryListener *kml, - AddressSpace *as) +void kvm_memory_listener_register(KVMState *s, KVMMemoryListener *kml, + AddressSpace *as, int as_id) { int i; kml->slots = g_malloc0(s->nr_slots * sizeof(KVMSlot)); + kml->as_id = as_id; for (i = 0; i < s->nr_slots; i++) { kml->slots[i].slot = i; @@ -1605,7 +1604,7 @@ static int kvm_init(MachineState *ms) s->memory_listener.listener.coalesced_mmio_del = kvm_uncoalesce_mmio_region; kvm_memory_listener_register(s, &s->memory_listener, - &address_space_memory); + &address_space_memory, 0); memory_listener_register(&kvm_io_listener, &address_space_io); -- 2.4.1