mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen: Fix after recent change in dirty bitmap tracking.

Browse Source 
A recent patch set from Avi break the dirty bitmap support of Xen. But
this is because xen_sync_dirty_bitmap will return an error for an
unhandled memory range (a0000 - bffff). However this is not a fatal
error, so we should just continue instead of aborting.

There is now an error printed when the Xen call failed.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
This commit is contained in:
Anthony PERARD 2012-01-05 12:47:08 +00:00 committed by Stefano Stabellini
parent c47f322365
commit b18620cf76
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xen-all.c
View File

@ -404,7 +404,7 @@ static void xen_region_del(MemoryListener *listener,
xen_set_memory(listener, section, false);
}
static int xen_sync_dirty_bitmap(XenIOState *state,
static void xen_sync_dirty_bitmap(XenIOState *state,
target_phys_addr_t start_addr,
ram_addr_t size)
{
@ -417,20 +417,26 @@ static int xen_sync_dirty_bitmap(XenIOState *state,
physmap = get_physmapping(state, start_addr, size);
if (physmap == NULL) {
/* not handled */
return -1;
return;
}
if (state->log_for_dirtybit == NULL) {
state->log_for_dirtybit = physmap;
} else if (state->log_for_dirtybit != physmap) {
return -1;
/* Only one range for dirty bitmap can be tracked. */
return;
}
rc = xc_hvm_track_dirty_vram(xen_xc, xen_domid,
start_addr >> TARGET_PAGE_BITS, npages,
bitmap);
if (rc) {
return rc;
if (rc < 0) {
if (rc != -ENODATA) {
fprintf(stderr, "xen: track_dirty_vram failed (0x" TARGET_FMT_plx
", 0x" TARGET_FMT_plx "): %s\n",
start_addr, start_addr + size, strerror(-rc));
}
return;
}
for (i = 0; i < ARRAY_SIZE(bitmap); i++) {
@ -442,40 +448,32 @@ static int xen_sync_dirty_bitmap(XenIOState *state,
(i * width + j) * TARGET_PAGE_SIZE);
};
}
return 0;
}
static void xen_log_start(MemoryListener *listener,
MemoryRegionSection *section)
{
XenIOState *state = container_of(listener, XenIOState, memory_listener);
int r;
r = xen_sync_dirty_bitmap(state, section->offset_within_address_space,
xen_sync_dirty_bitmap(state, section->offset_within_address_space,
section->size);
assert(r >= 0);
}
static void xen_log_stop(MemoryListener *listener, MemoryRegionSection *section)
{
XenIOState *state = container_of(listener, XenIOState, memory_listener);
int r;
state->log_for_dirtybit = NULL;
/* Disable dirty bit tracking */
r = xc_hvm_track_dirty_vram(xen_xc, xen_domid, 0, 0, NULL);
assert(r >= 0);
xc_hvm_track_dirty_vram(xen_xc, xen_domid, 0, 0, NULL);
}
static void xen_log_sync(MemoryListener *listener, MemoryRegionSection *section)
{
XenIOState *state = container_of(listener, XenIOState, memory_listener);
int r;
r = xen_sync_dirty_bitmap(state, section->offset_within_address_space,
xen_sync_dirty_bitmap(state, section->offset_within_address_space,
section->size);
assert(r >= 0);
}
static void xen_log_global_start(MemoryListener *listener)