Mailing List Archive

# HG changeset patch
# User Roger Pau Monne <roger.pau@entel.upc.edu>
# Date 1323864490 -3600
# Node ID 08a9f86b79dfe5db150392c916a72bafc3f05137
# Parent 873942d7eb6462984202e82d428e28fe9522924f
libxl: wait for devices to initialize upon addition to the domain.

Block waiting for devices to initialize (switch to state 2). This is
necessary because we need to call the hotplug scripts when state is
2, otherwise the execution fails. Make use of the newly introduced
function libxl__wait_for_device_state.

Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>

diff -r 873942d7eb64 -r 08a9f86b79df tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Wed Dec 14 13:08:10 2011 +0100
+++ b/tools/libxl/libxl.c Wed Dec 14 13:08:10 2011 +0100
@@ -976,6 +976,8 @@ int libxl_device_disk_add(libxl_ctx *ctx
flexarray_t *front;
flexarray_t *back;
char *dev;
+ char *be_path, *state_path, *state;
+ struct timeval tv;
libxl__device device;
int major, minor, rc;

@@ -1080,6 +1082,23 @@ int libxl_device_disk_add(libxl_ctx *ctx
libxl__xs_kvs_of_flexarray(gc, back, back->count),
libxl__xs_kvs_of_flexarray(gc, front, front->count));

+ be_path = libxl__device_backend_path(gc, &device);
+ state_path = libxl__sprintf(gc, "%s/state", be_path);
+ state = libxl__xs_read(gc, XBT_NULL, state_path);
+
+ if (atoi(state) != XenbusStateInitWait) {
+ xs_watch(ctx->xsh, state_path, be_path);
+ tv.tv_sec = LIBXL_DESTROY_TIMEOUT;
+ tv.tv_usec = 0;
+ rc = libxl__wait_for_device_state(gc, &tv, XenbusStateInitWait, NULL);
+ xs_unwatch(ctx->xsh, state_path, be_path);
+ if (rc < 0) {
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
+ "unable to initialize disk device: %s\n",
+ disk->pdev_path);
+ goto out_free;
+ }
+ }
rc = 0;

out_free:
@@ -1455,6 +1474,8 @@ int libxl_device_nic_add(libxl_ctx *ctx,
flexarray_t *back;
libxl__device device;
char *dompath, **l;
+ char *be_path, *state_path, *state;
+ struct timeval tv;
unsigned int nb, rc;

front = flexarray_make(16, 1);
@@ -1523,8 +1544,25 @@ int libxl_device_nic_add(libxl_ctx *ctx,
libxl__xs_kvs_of_flexarray(gc, back, back->count),
libxl__xs_kvs_of_flexarray(gc, front, front->count));

- /* FIXME: wait for plug */
+ be_path = libxl__device_backend_path(gc, &device);
+ state_path = libxl__sprintf(gc, "%s/state", be_path);
+ state = libxl__xs_read(gc, XBT_NULL, state_path);
+
+ if (atoi(state) != XenbusStateInitWait) {
+ xs_watch(ctx->xsh, state_path, be_path);
+ tv.tv_sec = LIBXL_DESTROY_TIMEOUT;
+ tv.tv_usec = 0;
+ rc = libxl__wait_for_device_state(gc, &tv, XenbusStateInitWait, NULL);
+ xs_unwatch(ctx->xsh, state_path, be_path);
+ if (rc < 0) {
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
+ "unable to initialize nic device: %s\n",
+ nic->ifname);
+ goto out_free;
+ }
+ }
rc = 0;
+
out_free:
flexarray_free(back);
flexarray_free(front);

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