Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
xen-mapcache.c
diff --git
a/qemu/xen-mapcache.c
b/qemu/xen-mapcache.c
index
8cefd0c
..
49f394a
100644
(file)
--- a/
qemu/xen-mapcache.c
+++ b/
qemu/xen-mapcache.c
@@
-8,7
+8,7
@@
* GNU GPL, version 2 or (at your option) any later version.
*/
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "
config
.h"
+#include "
qemu/osdep
.h"
#include <sys/resource.h>
#include <sys/resource.h>
@@
-169,19
+169,17
@@
static void xen_remap_bucket(MapCacheEntry *entry,
exit(-1);
}
}
exit(-1);
}
}
- if (entry->valid_mapping != NULL) {
- g_free(entry->valid_mapping);
- entry->valid_mapping = NULL;
- }
+ g_free(entry->valid_mapping);
+ entry->valid_mapping = NULL;
for (i = 0; i < nb_pfn; i++) {
pfns[i] = (address_index << (MCACHE_BUCKET_SHIFT-XC_PAGE_SHIFT)) + i;
}
for (i = 0; i < nb_pfn; i++) {
pfns[i] = (address_index << (MCACHE_BUCKET_SHIFT-XC_PAGE_SHIFT)) + i;
}
- vaddr_base = x
c_map_foreign_bulk(xen_xc
, xen_domid, PROT_READ|PROT_WRITE,
-
pfns, err, nb_pfn
);
+ vaddr_base = x
enforeignmemory_map(xen_fmem
, xen_domid, PROT_READ|PROT_WRITE,
+
nb_pfn, pfns, err
);
if (vaddr_base == NULL) {
if (vaddr_base == NULL) {
- perror("x
c_map_foreign_bulk
");
+ perror("x
enforeignmemory_map
");
exit(-1);
}
exit(-1);
}