Merge with xenppc-unstable.hg

diff --cc tools/libxc/xenguest.h
Simple merge

diff --cc tools/libxc/xg_private.c
Simple merge

diff --cc xen/common/libelf/libelf-loader.c
index 9c4491ebe48c0052fb810687bd5ca724217c706b,e106a6f568d3aecc4bb8c52ee2f7fbd6287c8081..e0f8dba91347da88e6f7452b660915dbd46b724d
--- 1/xen/common/libelf/libelf-loader.c
--- 2/xen/common/libelf/libelf-loader.c
+++ b/xen/common/libelf/libelf-loader.c
@@@ -118,20 -118,18 +118,20 @@@ void elf_load_binary(struct elf_binary 
      char *dest;
  
      count = elf_uval(elf, elf->ehdr, e_phnum);
-     for (i = 0; i < count; i++)
+     for ( i = 0; i < count; i++ )
      {
-       phdr = elf_phdr_by_index(elf, i);
-       if (!elf_phdr_is_loadable(elf, phdr))
-           continue;
-       paddr = elf_uval(elf, phdr, p_paddr);
-       offset = elf_uval(elf, phdr, p_offset);
-       filesz = elf_uval(elf, phdr, p_filesz);
-       memsz = elf_uval(elf, phdr, p_memsz);
-       dest = elf_get_ptr(elf, paddr);
-       elf_msg(elf, "%s: phdr %" PRIu64 " at 0x%p -> 0x%p\n",
-               __func__, i, dest, dest + filesz);
-       memcpy(dest, elf->image + offset, filesz);
-       memset(dest + filesz, 0, memsz - filesz);
+         phdr = elf_phdr_by_index(elf, i);
+         if ( !elf_phdr_is_loadable(elf, phdr) )
+             continue;
+         paddr = elf_uval(elf, phdr, p_paddr);
+         offset = elf_uval(elf, phdr, p_offset);
+         filesz = elf_uval(elf, phdr, p_filesz);
+         memsz = elf_uval(elf, phdr, p_memsz);
+         dest = elf_get_ptr(elf, paddr);
++        elf_msg(elf, "%s: phdr %" PRIu64 " at 0x%p -> 0x%p\n",
++                __func__, i, dest, dest + filesz);
+         memcpy(dest, elf->image + offset, filesz);
+         memset(dest + filesz, 0, memsz - filesz);
      }
  }
  

diff --cc xen/include/public/arch-ia64.h
Simple merge