ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cpu: add set_memory flag to request dirty logging 

Pass the flag to all cpu notifiers, doing
nothing at this point. Will be used by
follow-up patches.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2011-04-06 22:25:38 +03:00
parent afe3ef1d01
commit 0fd542fb7d
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cpu-common.h
View File

@ -34,10 +34,21 @@ typedef unsigned long ram_addr_t;
typedef void CPUWriteMemoryFunc(void *opaque, target_phys_addr_t addr, uint32_t value); typedef void CPUWriteMemoryFunc(void *opaque, target_phys_addr_t addr, uint32_t value);
typedef uint32_t CPUReadMemoryFunc(void *opaque, target_phys_addr_t addr); typedef uint32_t CPUReadMemoryFunc(void *opaque, target_phys_addr_t addr);
void cpu_register_physical_memory_offset(target_phys_addr_t start_addr, void cpu_register_physical_memory_log(target_phys_addr_t start_addr,
ram_addr_t size, ram_addr_t size,
ram_addr_t phys_offset, ram_addr_t phys_offset,
ram_addr_t region_offset); ram_addr_t region_offset,
bool log_dirty);
static inline void cpu_register_physical_memory_offset(target_phys_addr_t start_addr,
ram_addr_t size,
ram_addr_t phys_offset,
ram_addr_t region_offset)
{
cpu_register_physical_memory_log(start_addr, size, phys_offset,
region_offset, false);
}
static inline void cpu_register_physical_memory(target_phys_addr_t start_addr, static inline void cpu_register_physical_memory(target_phys_addr_t start_addr,
ram_addr_t size, ram_addr_t size,
ram_addr_t phys_offset) ram_addr_t phys_offset)
@ -91,7 +102,8 @@ struct CPUPhysMemoryClient {
void (*set_memory)(struct CPUPhysMemoryClient *client, void (*set_memory)(struct CPUPhysMemoryClient *client,
target_phys_addr_t start_addr, target_phys_addr_t start_addr,
ram_addr_t size, ram_addr_t size,
ram_addr_t phys_offset); ram_addr_t phys_offset,
bool log_dirty);
int (*sync_dirty_bitmap)(struct CPUPhysMemoryClient *client, int (*sync_dirty_bitmap)(struct CPUPhysMemoryClient *client,
target_phys_addr_t start_addr, target_phys_addr_t start_addr,
target_phys_addr_t end_addr); target_phys_addr_t end_addr);

14
exec.c
View File

@ -1711,11 +1711,12 @@ static QLIST_HEAD(memory_client_list, CPUPhysMemoryClient) memory_client_list
static void cpu_notify_set_memory(target_phys_addr_t start_addr, static void cpu_notify_set_memory(target_phys_addr_t start_addr,
ram_addr_t size, ram_addr_t size,
ram_addr_t phys_offset) ram_addr_t phys_offset,
bool log_dirty)
{ {
CPUPhysMemoryClient *client; CPUPhysMemoryClient *client;
QLIST_FOREACH(client, &memory_client_list, list) { QLIST_FOREACH(client, &memory_client_list, list) {
client->set_memory(client, start_addr, size, phys_offset); client->set_memory(client, start_addr, size, phys_offset, log_dirty);
} }
} }
@ -1755,7 +1756,7 @@ static void phys_page_for_each_1(CPUPhysMemoryClient *client,
for (i = 0; i < L2_SIZE; ++i) { for (i = 0; i < L2_SIZE; ++i) {
if (pd[i].phys_offset != IO_MEM_UNASSIGNED) { if (pd[i].phys_offset != IO_MEM_UNASSIGNED) {
client->set_memory(client, pd[i].region_offset, client->set_memory(client, pd[i].region_offset,
TARGET_PAGE_SIZE, pd[i].phys_offset); TARGET_PAGE_SIZE, pd[i].phys_offset, false);
} }
} }
} else { } else {
@ -2600,10 +2601,11 @@ static subpage_t *subpage_init (target_phys_addr_t base, ram_addr_t *phys,
start_addr and region_offset are rounded down to a page boundary start_addr and region_offset are rounded down to a page boundary
before calculating this offset. This should not be a problem unless before calculating this offset. This should not be a problem unless
the low bits of start_addr and region_offset differ. */ the low bits of start_addr and region_offset differ. */
void cpu_register_physical_memory_offset(target_phys_addr_t start_addr, void cpu_register_physical_memory_log(target_phys_addr_t start_addr,
ram_addr_t size, ram_addr_t size,
ram_addr_t phys_offset, ram_addr_t phys_offset,
ram_addr_t region_offset) ram_addr_t region_offset,
bool log_dirty)
{ {
target_phys_addr_t addr, end_addr; target_phys_addr_t addr, end_addr;
PhysPageDesc *p; PhysPageDesc *p;
@ -2611,7 +2613,7 @@ void cpu_register_physical_memory_offset(target_phys_addr_t start_addr,
ram_addr_t orig_size = size; ram_addr_t orig_size = size;
subpage_t *subpage; subpage_t *subpage;
cpu_notify_set_memory(start_addr, size, phys_offset); cpu_notify_set_memory(start_addr, size, phys_offset, log_dirty);
if (phys_offset == IO_MEM_UNASSIGNED) { if (phys_offset == IO_MEM_UNASSIGNED) {
region_offset = start_addr; region_offset = start_addr;

3
hw/vhost.c
View File

@ -300,7 +300,8 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev,
static void vhost_client_set_memory(CPUPhysMemoryClient *client, static void vhost_client_set_memory(CPUPhysMemoryClient *client,
target_phys_addr_t start_addr, target_phys_addr_t start_addr,
ram_addr_t size, ram_addr_t size,
ram_addr_t phys_offset) ram_addr_t phys_offset,
bool log_dirty)
{ {
struct vhost_dev *dev = container_of(client, struct vhost_dev, client); struct vhost_dev *dev = container_of(client, struct vhost_dev, client);
ram_addr_t flags = phys_offset & ~TARGET_PAGE_MASK; ram_addr_t flags = phys_offset & ~TARGET_PAGE_MASK;

3
kvm-all.c
View File

@ -625,7 +625,8 @@ static void kvm_set_phys_mem(target_phys_addr_t start_addr, ram_addr_t size,
static void kvm_client_set_memory(struct CPUPhysMemoryClient *client, static void kvm_client_set_memory(struct CPUPhysMemoryClient *client,
target_phys_addr_t start_addr, target_phys_addr_t start_addr,
ram_addr_t size, ram_addr_t phys_offset) ram_addr_t size, ram_addr_t phys_offset,
bool log_dirty)
{ {
kvm_set_phys_mem(start_addr, size, phys_offset); kvm_set_phys_mem(start_addr, size, phys_offset);
} }