WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-ia64-devel

[Xen-devel] [PATCH] fix compilation error caused by 19046:ecf603780f56

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH] fix compilation error caused by 19046:ecf603780f56
From: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
Date: Fri, 16 Jan 2009 14:38:36 +0900
Cc: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
Delivery-date: Thu, 15 Jan 2009 21:39:23 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.6i
[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@xxxxxxxxxxxxx>

diff --git a/tools/libxc/xc_core_ia64.c b/tools/libxc/xc_core_ia64.c
--- a/tools/libxc/xc_core_ia64.c
+++ b/tools/libxc/xc_core_ia64.c
@@ -68,7 +68,7 @@ xc_core_arch_auto_translated_physmap(con
 /* 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 @@ int
 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_handl
     }
 
     /* 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)
 {
     /*


-- 
yamahata

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] [PATCH] fix compilation error caused by 19046:ecf603780f56, Isaku Yamahata <=