ia64/xen-unstable

changeset 19053:0ab57e6e440a

[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>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Jan 16 11:47:21 2009 +0000 (2009-01-16)
parents 71e0b8adeb1f
children ba7ed03a3f79
files tools/libxc/xc_core_ia64.c
line diff
     1.1 --- a/tools/libxc/xc_core_ia64.c	Fri Jan 16 11:46:51 2009 +0000
     1.2 +++ b/tools/libxc/xc_core_ia64.c	Fri Jan 16 11:47:21 2009 +0000
     1.3 @@ -68,7 +68,7 @@ xc_core_arch_auto_translated_physmap(con
     1.4  /* see setup_guest() @ xc_linux_build.c */
     1.5  static int
     1.6  memory_map_get_old_domu(int xc_handle, xc_dominfo_t *info,
     1.7 -                        shared_info_t *live_shinfo,
     1.8 +                        shared_info_any_t *live_shinfo,
     1.9                          xc_core_memory_map_t **mapp, unsigned int *nr_entries)
    1.10  {
    1.11      xc_core_memory_map_t *map = NULL;
    1.12 @@ -96,7 +96,7 @@ out:
    1.13  /* see setup_guest() @ xc_ia64_hvm_build.c */
    1.14  static int
    1.15  memory_map_get_old_hvm(int xc_handle, xc_dominfo_t *info, 
    1.16 -                       shared_info_t *live_shinfo,
    1.17 +                       shared_info_any_t *live_shinfo,
    1.18                         xc_core_memory_map_t **mapp, unsigned int *nr_entries)
    1.19  {
    1.20      const xc_core_memory_map_t gfw_map[] = {
    1.21 @@ -155,7 +155,7 @@ out:
    1.22  
    1.23  static int
    1.24  memory_map_get_old(int xc_handle, xc_dominfo_t *info, 
    1.25 -                   shared_info_t *live_shinfo,
    1.26 +                   shared_info_any_t *live_shinfo,
    1.27                     xc_core_memory_map_t **mapp, unsigned int *nr_entries)
    1.28  {
    1.29      if ( info->hvm )
    1.30 @@ -170,7 +170,8 @@ memory_map_get_old(int xc_handle, xc_dom
    1.31  int
    1.32  xc_core_arch_memory_map_get(int xc_handle,
    1.33                              struct xc_core_arch_context *arch_ctxt,
    1.34 -                            xc_dominfo_t *info, shared_info_t *live_shinfo,
    1.35 +                            xc_dominfo_t *info,
    1.36 +                            shared_info_any_t *live_shinfo,
    1.37                              xc_core_memory_map_t **mapp,
    1.38                              unsigned int *nr_entries)
    1.39  {
    1.40 @@ -190,8 +191,8 @@ xc_core_arch_memory_map_get(int xc_handl
    1.41      }
    1.42  
    1.43      /* copy before use in case someone updating them */
    1.44 -    if (xc_ia64_copy_memmap(xc_handle, info->domid, live_shinfo, &memmap_info,
    1.45 -                            NULL)) {
    1.46 +    if (xc_ia64_copy_memmap(xc_handle, info->domid, &live_shinfo->s,
    1.47 +                            &memmap_info, NULL)) {
    1.48          goto old;
    1.49      }
    1.50  
    1.51 @@ -236,7 +237,7 @@ old:
    1.52  
    1.53  int
    1.54  xc_core_arch_map_p2m(int xc_handle, unsigned int guest_width, xc_dominfo_t *info,
    1.55 -                     shared_info_t *live_shinfo, xen_pfn_t **live_p2m,
    1.56 +                     shared_info_any_t *live_shinfo, xen_pfn_t **live_p2m,
    1.57                       unsigned long *pfnp)
    1.58  {
    1.59      /*