[Xen-changelog] [xen-unstable] [POWERPC][XEN] Fix mismerge.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Date 1170896013 21600
# Node ID 4613ee57e9b35ac5e2b2f7efcc9b3963c1216075
# Parent  3da9a56421c5255a4a4590b2e018cd7b8a926df0
[POWERPC][XEN] Fix mismerge.
---
 tools/libxc/xenguest.h |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

diff -r 3da9a56421c5 -r 4613ee57e9b3 tools/libxc/xenguest.h
--- a/tools/libxc/xenguest.h    Sun Jan 21 09:12:57 2007 -0500
+++ b/tools/libxc/xenguest.h    Wed Feb 07 18:53:33 2007 -0600
@@ -142,4 +142,18 @@ int xc_get_hvm_param(
 int xc_get_hvm_param(
     int handle, domid_t dom, int param, unsigned long *value);
 
+/* PowerPC specific. */
+int xc_prose_build(int xc_handle,
+                   uint32_t domid,
+                   unsigned int mem_mb,
+                   const char *image_name,
+                   const char *ramdisk_name,
+                   const char *cmdline,
+                   const char *features,
+                   unsigned long flags,
+                   unsigned int store_evtchn,
+                   unsigned long *store_mfn,
+                   unsigned int console_evtchn,
+                   unsigned long *console_mfn);
+
 #endif /* XENGUEST_H */

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