[Xen-changelog] [xen-unstable] xl: do not run bootloader on restore.

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

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1283535889 -3600
# Node ID 5f53805b349ecf1ec4fb588e43e8536b5d18b8f5
# Parent  fc29ec1876047240a41a6775ac5d3532b2cf49d4
xl: do not run bootloader on restore.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/libxl/xl_cmdimpl.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff -r fc29ec187604 -r 5f53805b349e tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c  Fri Sep 03 18:43:00 2010 +0100
+++ b/tools/libxl/xl_cmdimpl.c  Fri Sep 03 18:44:49 2010 +0100
@@ -1402,10 +1402,12 @@ start:
             goto error_out;
     }
 
-    ret = libxl_run_bootloader(&ctx, &d_config.b_info, d_config.num_disks > 0 
? &d_config.disks[0] : NULL, domid);
-    if (ret) {
-        fprintf(stderr, "failed to run bootloader: %d\n", ret);
-        goto error_out;
+    if (!restore_file) {
+        ret = libxl_run_bootloader(&ctx, &d_config.b_info, d_config.num_disks 
> 0 ? &d_config.disks[0] : NULL, domid);
+        if (ret) {
+            fprintf(stderr, "failed to run bootloader: %d\n", ret);
+            goto error_out;
+        }
     }
 
     if (!restore_file || !need_daemon) {

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