diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-01-16 11:47:21 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-01-16 11:47:21 +0000 |
| commit | ff4f536ebfcf66841eccd7991dfeaa44cb569df1 (patch) | |
| tree | 4141fddf0dd12c6e70f637587aa703d9f58360ef /tools | |
| parent | fb9dda3e061cca44a6d87ee51bcddc006cd158a9 (diff) | |
| download | xen-ff4f536ebfcf66841eccd7991dfeaa44cb569df1.tar.gz xen-ff4f536ebfcf66841eccd7991dfeaa44cb569df1.tar.bz2 xen-ff4f536ebfcf66841eccd7991dfeaa44cb569df1.zip | |
[IA64] fix compilation error caused by 19046:ecf603780f56
This patch fixes the following compilation error adjusting
function prototypes.
> xc_core_ia64.c:176: error: conflicting types for
'xc_core_arch_memory_map_get'
> xc_core.h:141: error: previous declaration of
'xc_core_arch_memory_map_get' was here
> xc_core_ia64.c:241: error: conflicting types for
'xc_core_arch_map_p2m'
> xc_core.h:144: error: previous declaration of 'xc_core_arch_map_p2m'
was here
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libxc/xc_core_ia64.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/libxc/xc_core_ia64.c b/tools/libxc/xc_core_ia64.c index 76827e2487..b385d65f7d 100644 --- a/tools/libxc/xc_core_ia64.c +++ b/tools/libxc/xc_core_ia64.c @@ -68,7 +68,7 @@ xc_core_arch_auto_translated_physmap(const xc_dominfo_t *info) /* see setup_guest() @ xc_linux_build.c */ static int memory_map_get_old_domu(int xc_handle, xc_dominfo_t *info, - shared_info_t *live_shinfo, + shared_info_any_t *live_shinfo, xc_core_memory_map_t **mapp, unsigned int *nr_entries) { xc_core_memory_map_t *map = NULL; @@ -96,7 +96,7 @@ out: /* see setup_guest() @ xc_ia64_hvm_build.c */ static int memory_map_get_old_hvm(int xc_handle, xc_dominfo_t *info, - shared_info_t *live_shinfo, + shared_info_any_t *live_shinfo, xc_core_memory_map_t **mapp, unsigned int *nr_entries) { const xc_core_memory_map_t gfw_map[] = { @@ -155,7 +155,7 @@ out: static int memory_map_get_old(int xc_handle, xc_dominfo_t *info, - shared_info_t *live_shinfo, + shared_info_any_t *live_shinfo, xc_core_memory_map_t **mapp, unsigned int *nr_entries) { if ( info->hvm ) @@ -170,7 +170,8 @@ memory_map_get_old(int xc_handle, xc_dominfo_t *info, int xc_core_arch_memory_map_get(int xc_handle, struct xc_core_arch_context *arch_ctxt, - xc_dominfo_t *info, shared_info_t *live_shinfo, + xc_dominfo_t *info, + shared_info_any_t *live_shinfo, xc_core_memory_map_t **mapp, unsigned int *nr_entries) { @@ -190,8 +191,8 @@ xc_core_arch_memory_map_get(int xc_handle, } /* copy before use in case someone updating them */ - if (xc_ia64_copy_memmap(xc_handle, info->domid, live_shinfo, &memmap_info, - NULL)) { + if (xc_ia64_copy_memmap(xc_handle, info->domid, &live_shinfo->s, + &memmap_info, NULL)) { goto old; } @@ -236,7 +237,7 @@ old: int xc_core_arch_map_p2m(int xc_handle, unsigned int guest_width, xc_dominfo_t *info, - shared_info_t *live_shinfo, xen_pfn_t **live_p2m, + shared_info_any_t *live_shinfo, xen_pfn_t **live_p2m, unsigned long *pfnp) { /* |