[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v3 10/17] tools/libxl: Plumb a restore boolean into libxl__domain_build_state
To fix CPUID handling, libxl__build_pre() is going to have to distinguish between a brand new VM vs one which is being migrated-in/resumed. Transcribe dcs->restore_fd into dbs->restore in initiate_domain_create() only (specifically avoiding the stubdom state in libxl__spawn_stub_dm()). While tweaking initiate_domain_create(), make a new dbs alias and simplify later code, and drop the local restore_fd alias as the new dbs->restore is more intuitive in context. No functional change. Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- CC: Ian Jackson <Ian.Jackson@xxxxxxxxxx> CC: Wei Liu <wl@xxxxxxx> CC: Anthony PERARD <anthony.perard@xxxxxxxxxx> v2: * New. This is c/s aacc1430064 "tools/libxl: Plumb domain_create_state down into libxl__build_pre()" take-2, without any collateral damage to stubdoms. v3: * Extend libxl__domain_build_state instead of adding a new parameter to libxl__build_pre(). --- tools/libxl/libxl_create.c | 14 +++++++------- tools/libxl/libxl_internal.h | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index e7cb2dbc2b..5a043df15f 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1181,18 +1181,18 @@ static void initiate_domain_create(libxl__egc *egc, /* convenience aliases */ libxl_domain_config *const d_config = dcs->guest_config; - const int restore_fd = dcs->restore_fd; + libxl__domain_build_state *dbs = &dcs->build_state; libxl__xswait_init(&dcs->console_xswait); domid = dcs->domid; - libxl__domain_build_state_init(&dcs->build_state); + libxl__domain_build_state_init(dbs); + dbs->restore = dcs->restore_fd >= 0; ret = libxl__domain_config_setdefault(gc,d_config,domid); if (ret) goto error_out; - ret = libxl__domain_make(gc, d_config, &dcs->build_state, &domid, - dcs->soft_reset); + ret = libxl__domain_make(gc, d_config, dbs, &domid, dcs->soft_reset); if (ret) { LOGD(ERROR, domid, "cannot make domain: %d", ret); dcs->guest_domid = domid; @@ -1236,7 +1236,7 @@ static void initiate_domain_create(libxl__egc *egc, if (ret) goto error_out; - if (restore_fd >= 0 || dcs->soft_reset) { + if (dbs->restore || dcs->soft_reset) { LOGD(DEBUG, domid, "restoring, not running bootloader"); domcreate_bootloader_done(egc, &dcs->bl, 0); } else { @@ -1247,8 +1247,8 @@ static void initiate_domain_create(libxl__egc *egc, dcs->bl.disk = bootdisk; dcs->bl.domid = dcs->guest_domid; - dcs->bl.kernel = &dcs->build_state.pv_kernel; - dcs->bl.ramdisk = &dcs->build_state.pv_ramdisk; + dcs->bl.kernel = &dbs->pv_kernel; + dcs->bl.ramdisk = &dbs->pv_ramdisk; libxl__bootloader_run(egc, &dcs->bl); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5f39e44cb9..e5effd2ad1 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1397,6 +1397,10 @@ typedef struct { /* ARM only to deal with broken firmware */ uint32_t clock_frequency; + + /* Whether this domain is being migrated/restored, or booting fresh. Only + * applicable to the primary domain, not support domains (e.g. stub QEMU). */ + bool restore; } libxl__domain_build_state; _hidden void libxl__domain_build_state_init(libxl__domain_build_state *s); -- 2.11.0
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |