[Xen-changelog] [xen-unstable] [IA64] Don't try to save nvram on PV domains

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

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1181856742 21600
# Node ID 1623f5f5094f4bc41be0d67f906b155e3704109c
# Parent  a371cfbd62e8278e2bc9e6980eaa289c099f0ad8
[IA64] Don't try to save nvram on PV domains

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 tools/libxc/ia64/xc_ia64_hvm_build.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletion(-)

diff -r a371cfbd62e8 -r 1623f5f5094f tools/libxc/ia64/xc_ia64_hvm_build.c
--- a/tools/libxc/ia64/xc_ia64_hvm_build.c      Thu Jun 14 15:29:52 2007 -0600
+++ b/tools/libxc/ia64/xc_ia64_hvm_build.c      Thu Jun 14 15:32:22 2007 -0600
@@ -709,11 +709,22 @@ copy_from_GFW_to_nvram(int xc_handle, ui
 
 int xc_ia64_save_to_nvram(int xc_handle, uint32_t dom) 
 {
+    xc_dominfo_t info;
     uint64_t nvram_fd = 0;
+
+    if ( xc_domain_getinfo(xc_handle, dom, 1, &info) != 1 )
+    {
+        PERROR("Could not get info for domain");
+        return -1;
+    }
+
+    if ( !info.hvm )
+        return 0;
+
     xc_get_hvm_param(xc_handle, dom, HVM_PARAM_NVRAM_FD, &nvram_fd);
 
     if ( !IS_VALID_NVRAM_FD(nvram_fd) )
-        PERROR("Nvram not be initialized. Nvram save fail!\n");
+        PERROR("Nvram not initialized. Nvram save failed!\n");
     else
         copy_from_GFW_to_nvram(xc_handle, dom, (int)nvram_fd); 
        

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