[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] Merge
# HG changeset patch # User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx> # Date 1171464425 0 # Node ID 6fd71faaaa3b00250d65879750e4350b79bf0060 # Parent a00b8d3800a82a993344c9546ddc1f00a9c514be # Parent 36bbb7edfd0b5d7e84a4e4e5589684f95787bbbb Merge --- xen/arch/x86/domctl.c | 2 ++ xen/common/libelf/libelf-dominfo.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff -r a00b8d3800a8 -r 6fd71faaaa3b xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c Wed Feb 14 14:46:18 2007 +0000 +++ b/xen/arch/x86/domctl.c Wed Feb 14 14:47:05 2007 +0000 @@ -398,6 +398,7 @@ long arch_do_domctl( put_domain(d); } + break; case XEN_DOMCTL_get_address_size: { @@ -412,6 +413,7 @@ long arch_do_domctl( ret = 0; put_domain(d); } + break; default: ret = -ENOSYS; diff -r a00b8d3800a8 -r 6fd71faaaa3b xen/common/libelf/libelf-dominfo.c --- a/xen/common/libelf/libelf-dominfo.c Wed Feb 14 14:46:18 2007 +0000 +++ b/xen/common/libelf/libelf-dominfo.c Wed Feb 14 14:47:05 2007 +0000 @@ -107,9 +107,9 @@ int elf_xen_parse_note(struct elf_binary if ((type >= sizeof(note_desc) / sizeof(note_desc[0])) || (NULL == note_desc[type].name)) { - elf_err(elf, "%s: unknown xen elf note (0x%x)\n", + elf_msg(elf, "%s: unknown xen elf note (0x%x)\n", __FUNCTION__, type); - return -1; + return 0; } if (note_desc[type].str) _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |