From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vincent Hanquez Subject: [PATCH 3/3] stubdom_create returns stubdomain domid so that unpause is done by the user of libxenlight. Date: Wed, 7 Jul 2010 14:00:56 +0100 Message-ID: <1278507656-7745-4-git-send-email-vincent.hanquez@eu.citrix.com> References: <1278507656-7745-1-git-send-email-vincent.hanquez@eu.citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.7.1" Return-path: In-Reply-To: <1278507656-7745-1-git-send-email-vincent.hanquez@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xen Devel Cc: Vincent Hanquez List-Id: xen-devel@lists.xenproject.org --------------1.7.1 Content-Type: text/plain; charset="UTF-8"; format=fixed Content-Transfer-Encoding: quoted-printable Signed-off-by: Vincent Hanquez --- tools/libxl/libxl.c | 7 ++++--- tools/libxl/libxl.h | 2 +- tools/libxl/xl_cmdimpl.c | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) --------------1.7.1 Content-Type: text/x-patch; name="0003-stubdom_create-returns-stubdomain-domid-so-that-unpa.patch" Content-Disposition: attachment; filename="0003-stubdom_create-returns-stubdomain-domid-so-that-unpa.patch" Content-Transfer-Encoding: quoted-printable diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 811678f..29fb10f 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1060,7 +1060,7 @@ int libxl_stubdom_create(struct libxl_ctx *ctx, libxl_device_disk *disks, int num_disks, libxl_device_nic *vifs, int num_vifs, libxl_device_vfb *vfb, - libxl_device_vkb *vkb, + libxl_device_vkb *vkb, uint32_t *stubdomid, libxl_device_model_starting **starting_r) { int i, num_console =3D 1, ret; @@ -1141,6 +1141,9 @@ retry_transaction: ret =3D libxl_device_console_add(ctx, domid, &console[i]); if (ret) return ret; } + + *stubdomid =3D domid; + if (libxl_create_xenpv_qemu(ctx, vfb, num_console, console, &dm_star= ting) < 0) { free(args); return -1; @@ -1150,8 +1153,6 @@ retry_transaction: return -1; } =20 - libxl_domain_unpause(ctx, domid); - if (starting_r) { *starting_r =3D libxl_calloc(ctx, sizeof(libxl_device_model_star= ting), 1); (*starting_r)->domid =3D info->domid; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 76f9b5c..597d91b 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -381,7 +381,7 @@ int libxl_stubdom_create(struct libxl_ctx *ctx, libxl_device_nic *vifs, int num_vifs, libxl_device_vfb *vfb, libxl_device_vkb *vkb, - libxl_device_model_starting **starting_r); + uint32_t *stubdomid, libxl_device_model_startin= g **starting_r); =20 int libxl_vfb_and_vkb_from_device_model_info(struct libxl_ctx *ctx, libxl_device_model_info *in= fo, diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a20e77a..6ed8e26 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1154,9 +1154,11 @@ start: if (strstr(dm_info.device_model, "stubdom-dm")) { libxl_device_vfb vfb; libxl_device_vkb vkb; + uint32_t stubdomid; =20 libxl_vfb_and_vkb_from_device_model_info(&ctx, &dm_info, &vf= b, &vkb); - MUST( libxl_stubdom_create(&ctx, &dm_info, disks, num_disks,= vifs, num_vifs, &vfb, &vkb, &dm_starting) ); + MUST( libxl_stubdom_create(&ctx, &dm_info, disks, num_disks,= vifs, num_vifs, &vfb, &vkb, &stubdomid, &dm_starting) ); + libxl_domain_unpause(&ctx, stubdomid); } else { MUST( libxl_create_device_model(&ctx, &dm_info, disks, num_d= isks, vifs, num_vifs, &dm_starting= ) ); --------------1.7.1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------1.7.1--