 Home |
Products |
Support |
Community |
News |
xen-changelog
[Xen-changelog] [xen-unstable] xl: do not run bootloader on restore.
| To: | xen-changelog@xxxxxxxxxxxxxxxxxxx |
|---|---|
| Subject: | [Xen-changelog] [xen-unstable] xl: do not run bootloader on restore. |
| From: | Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx> |
| Date: | Fri, 10 Sep 2010 14:40:17 -0700 |
| Delivery-date: | Fri, 10 Sep 2010 14:41:16 -0700 |
| Envelope-to: | www-data@xxxxxxxxxxxxxxxxxxx |
| List-help: | <mailto:xen-changelog-request@lists.xensource.com?subject=help> |
| List-id: | BK change log <xen-changelog.lists.xensource.com> |
| List-post: | <mailto:xen-changelog@lists.xensource.com> |
| List-subscribe: | <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe> |
| List-unsubscribe: | <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe> |
| Reply-to: | xen-devel@xxxxxxxxxxxxxxxxxxx |
| Sender: | xen-changelog-bounces@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
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [Xen-changelog] [xen-unstable] libxc: use a switch statement in xc_domain_restore.c::pagebuf_get_one., Xen patchbot-unstable |
|---|---|
| Next by Date: | [Xen-changelog] [xen-unstable] libxl+xend: use correct paths for PV console when running bootloader, Xen patchbot-unstable |
| Previous by Thread: | [Xen-changelog] [xen-unstable] libxc: use a switch statement in xc_domain_restore.c::pagebuf_get_one., Xen patchbot-unstable |
| Next by Thread: | [Xen-changelog] [xen-unstable] libxl+xend: use correct paths for PV console when running bootloader, Xen patchbot-unstable |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
