From: Olaf Hering <olaf@aepfle.de>
To: xen-devel@lists.xensource.com
Subject: [PATCH 12 of 24] libxl: rename libxl__device_model_starting
Date: Mon, 03 Oct 2011 17:54:49 +0200 [thread overview]
Message-ID: <ea8738e045595a235fc0.1317657289@probook.site> (raw)
In-Reply-To: <patchbomb.1317657277@probook.site>
# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1317653609 -7200
# Node ID ea8738e045595a235fc05384d3f4d7c74537cd0a
# Parent 3924c1ef71ee975b4556ca7766b730dfa3e12295
libxl: rename libxl__device_model_starting
Signed-off-by: Olaf Hering <olaf@aepfle.de>
diff -r 3924c1ef71ee -r ea8738e04559 tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -434,7 +434,7 @@ static int do_domain_create(libxl__gc *g
uint32_t *domid_out, int restore_fd)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
- libxl__device_model_starting *dm_starting = 0;
+ libxl__spawner_starting *dm_starting = 0;
libxl_device_model_info *dm_info = &d_config->dm_info;
libxl__domain_build_state state;
uint32_t domid;
diff -r 3924c1ef71ee -r ea8738e04559 tools/libxl/libxl_dm.c
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -518,7 +518,7 @@ static char ** libxl__build_device_model
static void dm_xenstore_record_pid(void *for_spawn, pid_t innerchild)
{
- libxl__device_model_starting *starting = for_spawn;
+ libxl__spawner_starting *starting = for_spawn;
struct xs_handle *xsh;
char *path = NULL, *pid = NULL;
int len;
@@ -619,7 +619,7 @@ static int libxl__create_stubdom(libxl__
libxl_device_nic *vifs, int num_vifs,
libxl_device_vfb *vfb,
libxl_device_vkb *vkb,
- libxl__device_model_starting **starting_r)
+ libxl__spawner_starting **starting_r)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
int i, num_console = STUBDOM_SPECIAL_CONSOLES, ret;
@@ -631,7 +631,7 @@ static int libxl__create_stubdom(libxl__
char **args;
struct xs_permissions perm[2];
xs_transaction_t t;
- libxl__device_model_starting *dm_starting = 0;
+ libxl__spawner_starting *dm_starting = 0;
libxl_device_model_info xenpv_dm_info;
if (info->device_model_version != LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) {
@@ -784,7 +784,7 @@ retry_transaction:
libxl_domain_unpause(ctx, domid);
if (starting_r) {
- *starting_r = calloc(1, sizeof(libxl__device_model_starting));
+ *starting_r = calloc(1, sizeof(libxl__spawner_starting));
(*starting_r)->domid = info->domid;
(*starting_r)->dom_path = libxl__xs_get_dompath(gc, info->domid);
(*starting_r)->for_spawn = NULL;
@@ -802,14 +802,14 @@ int libxl__create_device_model(libxl__gc
libxl_device_model_info *info,
libxl_device_disk *disks, int num_disks,
libxl_device_nic *vifs, int num_vifs,
- libxl__device_model_starting **starting_r)
+ libxl__spawner_starting **starting_r)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
char *path, *logfile;
int logfile_w, null;
int rc;
char **args;
- libxl__device_model_starting buf_starting, *p;
+ libxl__spawner_starting buf_starting, *p;
xs_transaction_t t;
char *vm_path;
char **pass_stuff;
@@ -861,7 +861,7 @@ int libxl__create_device_model(libxl__gc
if (starting_r) {
rc = ERROR_NOMEM;
- *starting_r = calloc(1, sizeof(libxl__device_model_starting));
+ *starting_r = calloc(1, sizeof(libxl__spawner_starting));
if (!*starting_r)
goto out_close;
p = *starting_r;
@@ -915,7 +915,7 @@ out:
}
static int detach_device_model(libxl__gc *gc,
- libxl__device_model_starting *starting)
+ libxl__spawner_starting *starting)
{
int rc;
rc = libxl__spawn_detach(gc, starting->for_spawn);
@@ -926,7 +926,7 @@ static int detach_device_model(libxl__gc
}
int libxl__confirm_device_model_startup(libxl__gc *gc,
- libxl__device_model_starting *starting)
+ libxl__spawner_starting *starting)
{
int detach;
int problem = libxl__wait_for_device_model(gc, starting->domid, "running",
@@ -1041,7 +1041,7 @@ out:
int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid,
libxl_device_model_info *info,
libxl_device_vfb *vfb,
- libxl__device_model_starting **starting_r)
+ libxl__spawner_starting **starting_r)
{
libxl__build_xenpv_qemu_args(gc, domid, vfb, info);
libxl__create_device_model(gc, info, NULL, 0, NULL, 0, starting_r);
diff -r 3924c1ef71ee -r ea8738e04559 tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -252,7 +252,7 @@ typedef struct {
char *dom_path; /* from libxl_malloc, only for dm_xenstore_record_pid */
int domid;
libxl__spawn_starting *for_spawn;
-} libxl__device_model_starting;
+} libxl__spawner_starting;
/* from xl_create */
_hidden int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, uint32_t *domid);
@@ -269,11 +269,11 @@ _hidden int libxl__create_device_model(l
libxl_device_model_info *info,
libxl_device_disk *disk, int num_disks,
libxl_device_nic *vifs, int num_vifs,
- libxl__device_model_starting **starting_r);
+ libxl__spawner_starting **starting_r);
_hidden int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid,
libxl_device_model_info *dm_info,
libxl_device_vfb *vfb,
- libxl__device_model_starting **starting_r);
+ libxl__spawner_starting **starting_r);
_hidden int libxl__need_xenpv_qemu(libxl__gc *gc,
int nr_consoles, libxl_device_console *consoles,
int nr_vfbs, libxl_device_vfb *vfbs,
@@ -282,8 +282,8 @@ _hidden int libxl__need_xenpv_qemu(libxl
* return pass *starting_r (which will be non-0) to
* libxl_confirm_device_model or libxl_detach_device_model. */
_hidden int libxl__confirm_device_model_startup(libxl__gc *gc,
- libxl__device_model_starting *starting);
-_hidden int libxl__detach_device_model(libxl__gc *gc, libxl__device_model_starting *starting);
+ libxl__spawner_starting *starting);
+_hidden int libxl__detach_device_model(libxl__gc *gc, libxl__spawner_starting *starting);
_hidden int libxl__wait_for_device_model(libxl__gc *gc,
uint32_t domid, char *state,
libxl__spawn_starting *spawning,
next prev parent reply other threads:[~2011-10-03 15:54 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-03 15:54 [PATCH 00 of 24] xenpaging fixes for xen-unstable Olaf Hering
2011-10-03 15:54 ` [PATCH 01 of 24] xenpaging: remove filename from comment Olaf Hering
2011-10-03 15:54 ` [PATCH 02 of 24] xenpaging: remove obsolete comment in resume path Olaf Hering
2011-10-03 15:54 ` [PATCH 03 of 24] xenpaging: use PERROR to print errno Olaf Hering
2011-10-04 16:19 ` George Dunlap
2011-10-04 17:19 ` Olaf Hering
2011-10-03 15:54 ` [PATCH 04 of 24] xenpaging: update xenpaging_init Olaf Hering
2011-10-03 15:54 ` [PATCH 05 of 24] xenpaging: remove xc_dominfo_t from paging_t Olaf Hering
2011-10-03 15:54 ` [PATCH 06 of 24] xenpaging: track the number of paged-out pages Olaf Hering
2011-10-03 15:54 ` [PATCH 07 of 24] xenpaging: move page add/resume loops into its own function Olaf Hering
2011-10-03 15:54 ` [PATCH 08 of 24] xenpaging: compare both token and path when checking for @releaseDomain event Olaf Hering
2011-10-03 15:54 ` [PATCH 09 of 24] xenpaging: improve mainloop exit handling Olaf Hering
2011-10-03 15:54 ` [PATCH 10 of 24] libxc: add bitmap_clear function Olaf Hering
2011-10-03 15:54 ` [PATCH 11 of 24] xenpaging: retry unpageable gfns Olaf Hering
2011-10-03 15:54 ` Olaf Hering [this message]
2011-10-03 15:54 ` [PATCH 13 of 24] libxl: rename dm_xenstore_record_pid to libxl_spawner_record_pid Olaf Hering
2011-10-03 15:54 ` [PATCH 14 of 24] libxl: add pid path to libxl__spawner_starting Olaf Hering
2011-10-04 8:23 ` Ian Campbell
2011-10-04 9:09 ` Olaf Hering
2011-10-03 15:54 ` [PATCH 15 of 24] libxl: add libxl__wait_for_offspring function Olaf Hering
2011-10-03 15:54 ` [PATCH 16 of 24] libxl: use libxl__wait_for_offspring for device model Olaf Hering
2011-10-03 15:54 ` [PATCH 17 of 24] libxl: add libxl__spawn_confirm_offspring_startup Olaf Hering
2011-10-25 15:31 ` Ian Jackson
2011-10-25 17:21 ` Olaf Hering
2011-10-25 17:53 ` Ian Jackson
2011-10-26 16:30 ` Olaf Hering
2011-10-27 10:34 ` Ian Jackson
2011-10-03 15:54 ` [PATCH 18 of 24] libxl: use libxl__spawn_confirm_offspring_startup for device model Olaf Hering
2011-10-03 15:54 ` [PATCH 19 of 24] xenpaging: install into LIBEXEC dir Olaf Hering
2011-10-03 15:54 ` [PATCH 20 of 24] xenpaging: add XEN_PAGING_DIR / libxl_xenpaging_dir_path() Olaf Hering
2011-10-03 15:54 ` [PATCH 21 of 24] xenpaging: use guests tot_pages as working target Olaf Hering
2011-10-03 15:54 ` [PATCH 22 of 24] xenpaging: watch the guests memory/target-tot_pages xenstore value Olaf Hering
2011-10-03 15:55 ` [PATCH 23 of 24] xenpaging: add cmdline interface for pager Olaf Hering
2011-10-03 15:55 ` [PATCH 24 of 24] xenpaging: libxl support Olaf Hering
2011-10-04 9:51 ` [PATCH 00 of 24] xenpaging fixes for xen-unstable Ian Campbell
2011-10-04 15:05 ` Olaf Hering
2011-10-04 15:08 ` Olaf Hering
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=ea8738e045595a235fc0.1317657289@probook.site \
--to=olaf@aepfle.de \
--cc=xen-devel@lists.xensource.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.