ia64/xen-unstable
changeset 13916:6fd71faaaa3b
Merge
author | Tim Deegan <Tim.Deegan@xensource.com> |
---|---|
date | Wed Feb 14 14:47:05 2007 +0000 (2007-02-14) |
parents | a00b8d3800a8 36bbb7edfd0b |
children | d44eb9e7f97b |
files |
line diff
1.1 --- a/xen/arch/x86/domctl.c Wed Feb 14 14:46:18 2007 +0000 1.2 +++ b/xen/arch/x86/domctl.c Wed Feb 14 14:47:05 2007 +0000 1.3 @@ -398,6 +398,7 @@ long arch_do_domctl( 1.4 1.5 put_domain(d); 1.6 } 1.7 + break; 1.8 1.9 case XEN_DOMCTL_get_address_size: 1.10 { 1.11 @@ -412,6 +413,7 @@ long arch_do_domctl( 1.12 ret = 0; 1.13 put_domain(d); 1.14 } 1.15 + break; 1.16 1.17 default: 1.18 ret = -ENOSYS;
2.1 --- a/xen/common/libelf/libelf-dominfo.c Wed Feb 14 14:46:18 2007 +0000 2.2 +++ b/xen/common/libelf/libelf-dominfo.c Wed Feb 14 14:47:05 2007 +0000 2.3 @@ -107,9 +107,9 @@ int elf_xen_parse_note(struct elf_binary 2.4 if ((type >= sizeof(note_desc) / sizeof(note_desc[0])) || 2.5 (NULL == note_desc[type].name)) 2.6 { 2.7 - elf_err(elf, "%s: unknown xen elf note (0x%x)\n", 2.8 + elf_msg(elf, "%s: unknown xen elf note (0x%x)\n", 2.9 __FUNCTION__, type); 2.10 - return -1; 2.11 + return 0; 2.12 } 2.13 2.14 if (note_desc[type].str)