diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:39:42 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:39:42 -0500 |
| commit | 33cf629a3754b58a1e2dbbe01d91d97e712b7c06 (patch) | |
| tree | fcf874262294eba07fb2f9eca11d594096847679 /xen-mapcache.h | |
| parent | b85a4ec8a7ce348f3f385a53df4e418f2f54c182 (diff) | |
| parent | c234572ded381423abca9801ebf5a32abd2495ef (diff) | |
| download | focaccia-qemu-33cf629a3754b58a1e2dbbe01d91d97e712b7c06.tar.gz focaccia-qemu-33cf629a3754b58a1e2dbbe01d91d97e712b7c06.zip | |
Merge remote-tracking branch 'sstabellini/saverestore-8' into staging
* sstabellini/saverestore-8: xen: do not allocate RAM during INMIGRATE runstate xen mapcache: check if memory region has moved. xen: record physmap changes to xenstore Set runstate to INMIGRATE earlier Introduce "xen-save-devices-state" cirrus_vga: do not reset videoram Conflicts: qapi-schema.json Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'xen-mapcache.h')
| -rw-r--r-- | xen-mapcache.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xen-mapcache.h b/xen-mapcache.h index da874ca23d..70301a57e4 100644 --- a/xen-mapcache.h +++ b/xen-mapcache.h @@ -11,9 +11,13 @@ #include <stdlib.h> +typedef target_phys_addr_t (*phys_offset_to_gaddr_t)(target_phys_addr_t start_addr, + ram_addr_t size, + void *opaque); #ifdef CONFIG_XEN -void xen_map_cache_init(void); +void xen_map_cache_init(phys_offset_to_gaddr_t f, + void *opaque); uint8_t *xen_map_cache(target_phys_addr_t phys_addr, target_phys_addr_t size, uint8_t lock); ram_addr_t xen_ram_addr_from_mapcache(void *ptr); @@ -22,7 +26,8 @@ void xen_invalidate_map_cache(void); #else -static inline void xen_map_cache_init(void) +static inline void xen_map_cache_init(phys_offset_to_gaddr_t f, + void *opaque) { } |