From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Wei Liu <wei.liu2@citrix.com>, Ian Jackson <Ian.Jackson@eu.citrix.com>
Subject: [PATCH 5/6] libxl: rename a field in libxl__domain_create_state
Date: Mon, 6 Jun 2016 11:52:11 +0100 [thread overview]
Message-ID: <1465210332-25440-6-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1465210332-25440-1-git-send-email-wei.liu2@citrix.com>
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@citrix.com>
---
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;
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-06 10:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 10:52 [PATCH 0/6] xl/libxl: some cleanup / debugging aid patches Wei Liu
2016-06-06 10:52 ` [PATCH 1/6] xl: remus/colo: only initialise ha variable when necessary Wei Liu
2016-06-14 10:18 ` Ian Jackson
2016-06-14 10:23 ` Wei Liu
2016-06-14 14:15 ` Ian Jackson
2016-06-14 14:18 ` Wei Liu
2016-06-06 10:52 ` [PATCH 2/6] libxl: add emacs block to libxl_linux.c Wei Liu
2016-06-14 10:19 ` Ian Jackson
2016-06-06 10:52 ` [PATCH 3/6] libxl: linux hotplug: clean up get_hotplug_env Wei Liu
2016-06-14 10:20 ` Ian Jackson
2016-06-06 10:52 ` [PATCH 4/6] libxl: debug output for args and env when invoking hotplug script Wei Liu
2016-06-14 10:26 ` Ian Jackson
2016-06-14 12:46 ` Wei Liu
2016-07-02 10:21 ` Wei Liu
2016-07-04 17:06 ` Ian Jackson
2016-07-06 17:23 ` Wei Liu
2016-06-06 10:52 ` Wei Liu [this message]
2016-06-14 10:27 ` [PATCH 5/6] libxl: rename a field in libxl__domain_create_state Ian Jackson
2016-06-06 10:52 ` [PATCH 6/6] libxl: log file name in failure in libxl__create_qemu_logfile Wei Liu
2016-06-14 10:28 ` Ian Jackson
2016-06-14 13:10 ` [PATCH 0/6] xl/libxl: some cleanup / debugging aid patches Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465210332-25440-6-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).