[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] libxl: make libxl_create run bootloader via callback
# HG changeset patch # User Ian Jackson <ian.jackson@xxxxxxxxxxxxx> # Date 1336759144 -3600 # Node ID a87bde27be269a657d348c0d215a6d9e3d32d8a4 # Parent 86f8a5708fbfe0f8c2859041398c03f3c635d5ca libxl: make libxl_create run bootloader via callback Change initiate_domain_create to properly use libxl__bootloader_run rather than improperly calling libxl_run_bootloader with NULL ao_how. Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx> Changes since v7: * constify convenience aliases. Changes since v6: * Bugfixes from testing. Committed-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> --- diff -r 86f8a5708fbf -r a87bde27be26 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Fri May 11 18:59:03 2012 +0100 +++ b/tools/libxl/libxl_create.c Fri May 11 18:59:04 2012 +0100 @@ -569,6 +569,9 @@ static int store_libxl_entry(libxl__gc * static void domcreate_devmodel_started(libxl__egc *egc, libxl__dm_spawn_state *dmss, int rc); +static void domcreate_bootloader_done(libxl__egc *egc, + libxl__bootloader_state *bl, + int rc); /* Our own function to clean up and call the user's callback. * The final call in the sequence. */ @@ -589,6 +592,7 @@ static void initiate_domain_create(libxl const int restore_fd = dcs->restore_fd; const libxl_console_ready cb = dcs->console_cb; void *const priv = dcs->console_cb_priv; + memset(&dcs->build_state, 0, sizeof(dcs->build_state)); domid = 0; @@ -619,21 +623,43 @@ static void initiate_domain_create(libxl if (ret) goto error_out; } + dcs->bl.ao = ao; libxl_device_disk *bootdisk = d_config->num_disks > 0 ? &d_config->disks[0] : NULL; if (restore_fd < 0 && bootdisk) { - ret = libxl_run_bootloader(ctx, &d_config->b_info, bootdisk, domid, - 0 /* fixme-ao */); - if (ret) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "failed to run bootloader: %d", ret); - goto error_out; - } + dcs->bl.callback = domcreate_bootloader_done; + dcs->bl.info = &d_config->b_info, + dcs->bl.disk = bootdisk; + dcs->bl.domid = dcs->guest_domid; + + libxl__bootloader_run(egc, &dcs->bl); + } else { + domcreate_bootloader_done(egc, &dcs->bl, 0); } + return; - memset(&dcs->build_state, 0, sizeof(dcs->build_state)); - libxl__domain_build_state *state = &dcs->build_state; +error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_bootloader_done(libxl__egc *egc, + libxl__bootloader_state *bl, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(bl, *dcs, bl); + STATE_AO_GC(bl->ao); + int i; + + /* convenience aliases */ + const uint32_t domid = dcs->guest_domid; + libxl_domain_config *const d_config = dcs->guest_config; + const int restore_fd = dcs->restore_fd; + libxl__domain_build_state *const state = &dcs->build_state; + libxl_ctx *const ctx = CTX; + + if (ret) goto error_out; /* We might be going to call libxl__spawn_local_dm, or _spawn_stub_dm. * Fill in any field required by either, including both relevant @@ -784,12 +810,13 @@ static void domcreate_devmodel_started(l if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && libxl_defbool_val(d_config->b_info.u.pv.e820_host)) { - int rc; - rc = libxl__e820_alloc(gc, domid, d_config); - if (rc) + ret = libxl__e820_alloc(gc, domid, d_config); + if (ret) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Failed while collecting E820 with: %d (errno:%d)\n", - rc, errno); + ret, errno); + goto error_out; + } } if ( cb && (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM || (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && diff -r 86f8a5708fbf -r a87bde27be26 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri May 11 18:59:03 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri May 11 18:59:04 2012 +0100 @@ -1689,6 +1689,7 @@ struct libxl__domain_create_state { /* private to domain_create */ int guest_domid; libxl__domain_build_state build_state; + libxl__bootloader_state bl; libxl__stub_dm_spawn_state dmss; /* If we're not doing stubdom, we use only dmss.dm, * for the non-stubdom device model. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |