ia64/xen-unstable

changeset 13949:4613ee57e9b3

[POWERPC][XEN] Fix mismerge.
author Hollis Blanchard <hollisb@us.ibm.com>
date Wed Feb 07 18:53:33 2007 -0600 (2007-02-07)
parents 3da9a56421c5
children 272291dacad4
files tools/libxc/xenguest.h
line diff
     1.1 --- a/tools/libxc/xenguest.h	Sun Jan 21 09:12:57 2007 -0500
     1.2 +++ b/tools/libxc/xenguest.h	Wed Feb 07 18:53:33 2007 -0600
     1.3 @@ -142,4 +142,18 @@ int xc_set_hvm_param(
     1.4  int xc_get_hvm_param(
     1.5      int handle, domid_t dom, int param, unsigned long *value);
     1.6  
     1.7 +/* PowerPC specific. */
     1.8 +int xc_prose_build(int xc_handle,
     1.9 +                   uint32_t domid,
    1.10 +                   unsigned int mem_mb,
    1.11 +                   const char *image_name,
    1.12 +                   const char *ramdisk_name,
    1.13 +                   const char *cmdline,
    1.14 +                   const char *features,
    1.15 +                   unsigned long flags,
    1.16 +                   unsigned int store_evtchn,
    1.17 +                   unsigned long *store_mfn,
    1.18 +                   unsigned int console_evtchn,
    1.19 +                   unsigned long *console_mfn);
    1.20 +
    1.21  #endif /* XENGUEST_H */