[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/13] kvm-all: add support for multiple address spac
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 08/13] kvm-all: add support for multiple address spaces |
Date: |
Mon, 6 Jul 2015 16:22:16 +0200 |
Make kvm_memory_listener_register public, and assign a kernel
address space id to each KVMMemoryListener.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 7ca4937..5f75ac4 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);
--
1.8.3.1
- [Qemu-devel] [PULL 00/13] KVM patches (SMM implementation) for 2015-07-06, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 03/13] target-i386: add support for SMBASE MSR and SMIs, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 04/13] kvm-all: put kvm_mem_flags to more work, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 01/13] linux-headers: Update to 4.2-rc1, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 02/13] piix4/ich9: do not raise SMI on ACPI enable/disable commands, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 05/13] kvm-all: remove useless typedef, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 08/13] kvm-all: add support for multiple address spaces,
Paolo Bonzini <=
- [Qemu-devel] [PULL 06/13] kvm-all: move internal types to kvm_int.h, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 09/13] kvm-all: kvm_irqchip_create is not expected to fail, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 07/13] kvm-all: make KVM's memory listener more generic, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 11/13] pc_piix: rename kvm_enabled to smm_enabled, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 13/13] pc: add SMM property, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 12/13] ich9: add smm_enabled field and arguments, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 10/13] target-i386: register a separate KVM address space including SMRAM regions, Paolo Bonzini, 2015/07/06