WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 12 of 24] libxl: rename libxl__device_model_starting

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH 12 of 24] libxl: rename libxl__device_model_starting
From: Olaf Hering <olaf@xxxxxxxxx>
Date: Mon, 03 Oct 2011 17:54:49 +0200
Delivery-date: Mon, 03 Oct 2011 09:23:37 -0700
Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; t=1317657300; l=5734; s=domk; d=aepfle.de; h=To:From:Date:References:In-Reply-To:Subject: Content-Transfer-Encoding:MIME-Version:Content-Type:X-RZG-CLASS-ID: X-RZG-AUTH; bh=BkWc5FdhdzkSQocAM0pQ02zD0og=; b=sbIAgo+gUFGemugT6YghXfkZi4GZCBvDRWGczIDO/vk4jUBdgAUmbEkn5MbS3hiYXmI +YJWbhB67n1vdVWEb/OfLf2kcei10URXhl0cZN0vXQWKbuCpp4Fnwl//HuuhI5UmWZIYW jyaKVBQpsS7atfJ+K4XMuKsOemFhfbmYRfg=
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <patchbomb.1317657277@xxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <patchbomb.1317657277@xxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.7.5
# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1317653609 -7200
# Node ID ea8738e045595a235fc05384d3f4d7c74537cd0a
# Parent  3924c1ef71ee975b4556ca7766b730dfa3e12295
libxl: rename libxl__device_model_starting

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>

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,

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>