[Xen-changelog] [xen-unstable] [IA64] Improve error message when HVM domain creation failed

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

# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1174577285 21600
# Node ID 93e11f6d6791de15cfdcc5f0ddbf9a0660f325ed
# Parent  2216a45bf0582b36f7e0efb0dde0abbacdd8b895
[IA64] Improve error message when HVM domain creation failed

Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
 xen/arch/ia64/vmx/vmmu.c     |   13 +++++++------
 xen/arch/ia64/vmx/vmx_init.c |    6 ++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff -r 2216a45bf058 -r 93e11f6d6791 xen/arch/ia64/vmx/vmmu.c
--- a/xen/arch/ia64/vmx/vmmu.c  Tue Mar 20 15:19:38 2007 -0600
+++ b/xen/arch/ia64/vmx/vmmu.c  Thu Mar 22 09:28:05 2007 -0600
@@ -136,8 +136,7 @@ static int init_domain_vhpt(struct vcpu 
     page = alloc_domheap_pages (NULL, VCPU_VHPT_ORDER, 0);
     if ( page == NULL ) {
         printk("No enough contiguous memory for init_domain_vhpt\n");
-
-        return -1;
+        return -ENOMEM;
     }
     vbase = page_to_virt(page);
     memset(vbase, 0, VCPU_VHPT_SIZE);
@@ -171,15 +170,17 @@ int init_domain_tlb(struct vcpu *v)
 {
     struct page_info *page;
     void * vbase;
-
-    if (init_domain_vhpt(v) != 0)
-        return -1;
+    int rc;
+
+    rc = init_domain_vhpt(v);
+    if (rc)
+        return rc;
 
     page = alloc_domheap_pages (NULL, VCPU_VTLB_ORDER, 0);
     if ( page == NULL ) {
         printk("No enough contiguous memory for init_domain_tlb\n");
         free_domain_vhpt(v);
-        return -1;
+        return -ENOMEM;
     }
     vbase = page_to_virt(page);
     memset(vbase, 0, VCPU_VTLB_SIZE);
diff -r 2216a45bf058 -r 93e11f6d6791 xen/arch/ia64/vmx/vmx_init.c
--- a/xen/arch/ia64/vmx/vmx_init.c      Tue Mar 20 15:19:38 2007 -0600
+++ b/xen/arch/ia64/vmx/vmx_init.c      Thu Mar 22 09:28:05 2007 -0600
@@ -295,6 +295,7 @@ vmx_final_setup_guest(struct vcpu *v)
 vmx_final_setup_guest(struct vcpu *v)
 {
        vpd_t *vpd;
+       int rc;
 
        vpd = alloc_vpd();
        ASSERT(vpd);
@@ -306,8 +307,9 @@ vmx_final_setup_guest(struct vcpu *v)
         * to this solution. Maybe it can be deferred until we know created
         * one as vmx domain */
 #ifndef HASH_VHPT
-       if (init_domain_tlb(v) != 0)
-               return -1;
+       rc = init_domain_tlb(v);
+       if (rc)
+               return rc;
 #endif
        vmx_create_event_channels(v);
 

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