[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] libxl: rename a field in libxl__domain_create_state
commit 3148bebbf0abf52b4fd8c07fc716007f1c26a285 Author: Wei Liu <wei.liu2@xxxxxxxxxx> AuthorDate: Mon Jun 6 11:52:11 2016 +0100 Commit: Wei Liu <wei.liu2@xxxxxxxxxx> CommitDate: Tue Jun 14 14:31:27 2016 +0100 libxl: rename a field in libxl__domain_create_state The libxl__stub_dm_spawn_state field in libxl__domain_create_state was named dmss. That was inconsistent with how things were named (usually acronym) and there was already libxl__dm_spawn_state named dmss in other places. Change dmss to sdss and fix up all sites that reference this field. No functional change. Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx> Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> --- tools/libxl/libxl_create.c | 32 ++++++++++++++++---------------- tools/libxl/libxl_internal.h | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index ca5b167..1b99472 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -903,7 +903,7 @@ static void initiate_domain_create(libxl__egc *egc, } dcs->guest_domid = domid; - dcs->dmss.dm.guest_domid = 0; /* means we haven't spawned */ + dcs->sdss.dm.guest_domid = 0; /* means we haven't spawned */ ret = libxl__domain_build_info_setdefault(gc, &d_config->b_info); if (ret) { @@ -1050,11 +1050,11 @@ static void domcreate_bootloader_done(libxl__egc *egc, /* We might be going to call libxl__spawn_local_dm, or _spawn_stub_dm. * Fill in any field required by either, including both relevant * callbacks (_spawn_stub_dm will overwrite our trespass if needed). */ - dcs->dmss.dm.spawn.ao = ao; - dcs->dmss.dm.guest_config = dcs->guest_config; - dcs->dmss.dm.build_state = &dcs->build_state; - dcs->dmss.dm.callback = domcreate_devmodel_started; - dcs->dmss.callback = domcreate_devmodel_started; + dcs->sdss.dm.spawn.ao = ao; + dcs->sdss.dm.guest_config = dcs->guest_config; + dcs->sdss.dm.build_state = &dcs->build_state; + dcs->sdss.dm.callback = domcreate_devmodel_started; + dcs->sdss.callback = domcreate_devmodel_started; if (restore_fd < 0 && dcs->domid_soft_reset == INVALID_DOMID) { rc = libxl__domain_build(gc, d_config, domid, state); @@ -1344,7 +1344,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, if (d_config->b_info.device_model_version == LIBXL_DEVICE_MODEL_VERSION_NONE) { - domcreate_devmodel_started(egc, &dcs->dmss.dm, 0); + domcreate_devmodel_started(egc, &dcs->sdss.dm, 0); return; } @@ -1352,11 +1352,11 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, libxl__device_vkb_add(gc, domid, &vkb); libxl_device_vkb_dispose(&vkb); - dcs->dmss.dm.guest_domid = domid; + dcs->sdss.dm.guest_domid = domid; if (libxl_defbool_val(d_config->b_info.device_model_stubdomain)) - libxl__spawn_stub_dm(egc, &dcs->dmss); + libxl__spawn_stub_dm(egc, &dcs->sdss); else - libxl__spawn_local_dm(egc, &dcs->dmss.dm); + libxl__spawn_local_dm(egc, &dcs->sdss.dm); /* * Handle the domain's (and the related stubdomain's) access to @@ -1387,12 +1387,12 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, if (ret < 0) goto error_out; if (ret) { - dcs->dmss.dm.guest_domid = domid; - libxl__spawn_local_dm(egc, &dcs->dmss.dm); + dcs->sdss.dm.guest_domid = domid; + libxl__spawn_local_dm(egc, &dcs->sdss.dm); return; } else { - assert(!dcs->dmss.dm.guest_domid); - domcreate_devmodel_started(egc, &dcs->dmss.dm, 0); + assert(!dcs->sdss.dm.guest_domid); + domcreate_devmodel_started(egc, &dcs->sdss.dm, 0); return; } } @@ -1411,7 +1411,7 @@ static void domcreate_devmodel_started(libxl__egc *egc, libxl__dm_spawn_state *dmss, int ret) { - libxl__domain_create_state *dcs = CONTAINER_OF(dmss, *dcs, dmss.dm); + libxl__domain_create_state *dcs = CONTAINER_OF(dmss, *dcs, sdss.dm); STATE_AO_GC(dmss->spawn.ao); int domid = dcs->guest_domid; @@ -1423,7 +1423,7 @@ static void domcreate_devmodel_started(libxl__egc *egc, goto error_out; } - if (dcs->dmss.dm.guest_domid) { + if (dcs->sdss.dm.guest_domid) { if (d_config->b_info.device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { libxl__qmp_initializations(gc, domid, d_config); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index ae16c25..6fd7366 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3570,7 +3570,7 @@ struct libxl__domain_create_state { libxl__colo_restore_state crs; libxl__checkpoint_devices_state cds; libxl__bootloader_state bl; - libxl__stub_dm_spawn_state dmss; + libxl__stub_dm_spawn_state sdss; /* If we're not doing stubdom, we use only dmss.dm, * for the non-stubdom device model. */ libxl__stream_read_state srs; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |