Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 01/19] execute hotplug scripts from libxl v10
Changes are available in the git repository at:
git://xenbits.xen.org/people/royger/xen.git hotplug.v10
Roger Pau Monne (19):
*libxl: check backend state before setting it to "closing"
libxl: change ao_device_remove to ao_device
*libxl: move device model creation prototypes
*libxl: convert libxl_domain_destroy to an async op
*libxl: move bootloader data strucutres and prototypes
libxl: refactor disk addition to take a helper
libxl: convert libxl__device_disk_local_attach to an async op
*libxl: rename vifs to nics
*libxl: convert libxl_device_disk_add to an async op
*libxl: convert libxl_device_nic_add to an async operation
*libxl: add option to choose who executes hotplug scripts
*libxl: rename _IOEMU nic type to VIF_IOEMU
libxl: set correct nic type depending on the guest
*libxl: use libxl__xs_path_cleanup on device_destroy
*libxl: call hotplug scripts for disk devices from libxl
*libxl: call hotplug scripts for nic devices from libxl
libxl: convert libxl_device_vkb_add to an async operation
libxl: convert libxl_device_vfb_add to an async operation
xl: main_blockdetach don''t call destroy if remove succeeds
* Acked
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 01/19] libxl: check backend state before setting it to "closing"
Check backend state before unconditionally setting it to "closing"
(5), since it might already be in "closed" (6).
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl_device.c | 59 ++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index 3da60e1..d33ac68 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -451,33 +451,48 @@ int libxl__initiate_device_remove(libxl__egc *egc,
libxl__ao *ao,
libxl__device *dev)
{
AO_GC;
- libxl_ctx *ctx = libxl__gc_owner(gc);
- xs_transaction_t t;
+ xs_transaction_t t = 0;
char *be_path = libxl__device_backend_path(gc, dev);
char *state_path = libxl__sprintf(gc, "%s/state", be_path);
- char *state = libxl__xs_read(gc, XBT_NULL, state_path);
+ char *online_path = GCSPRINTF("%s/online", be_path);
+ const char *state;
+
int rc = 0;
libxl__ao_device_remove *aorm = 0;
- if (!state)
- goto out_ok;
- if (atoi(state) != 4) {
- libxl__device_destroy_tapdisk(gc, be_path);
- xs_rm(ctx->xsh, XBT_NULL, be_path);
- goto out_ok;
- }
+ for (;;) {
+ rc = libxl__xs_transaction_start(gc, &t);
+ if (rc) {
+ LOG(ERROR, "unable to start transaction");
+ goto out_fail;
+ }
-retry_transaction:
- t = xs_transaction_start(ctx->xsh);
- xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/online",
be_path), "0", strlen("0"));
- xs_write(ctx->xsh, t, state_path, "5", strlen("5"));
- if (!xs_transaction_end(ctx->xsh, t, 0)) {
- if (errno == EAGAIN)
- goto retry_transaction;
- else {
- rc = ERROR_FAIL;
+ rc = libxl__xs_read_checked(gc, t, state_path, &state);
+ if (rc) {
+ LOG(ERROR, "unable to read device state from path %s",
state_path);
goto out_fail;
}
+
+ /*
+ * Check if device is already in "closed" state, in which
case
+ * it should not be changed.
+ */
+ if (state && atoi(state) != XenbusStateClosed) {
+ rc = libxl__xs_write_checked(gc, t, online_path, "0");
+ if (rc) {
+ LOG(ERROR, "unable to write to xenstore path %s",
online_path);
+ goto out_fail;
+ }
+ rc = libxl__xs_write_checked(gc, t, state_path, "5");
+ if (rc) {
+ LOG(ERROR, "unable to write to xenstore path %s",
state_path);
+ goto out_fail;
+ }
+ }
+
+ rc = libxl__xs_transaction_commit(gc, &t);
+ if (!rc) break;
+ if (rc < 0) goto out_fail;
}
libxl__device_destroy_tapdisk(gc, be_path);
@@ -491,16 +506,14 @@ retry_transaction:
LIBXL_DESTROY_TIMEOUT * 1000);
if (rc) goto out_fail;
+ libxl__ao_complete(egc, ao, 0);
return 0;
out_fail:
assert(rc);
+ libxl__xs_transaction_abort(gc, &t);
device_remove_cleanup(gc, aorm);
return rc;
-
- out_ok:
- libxl__ao_complete(egc, ao, 0);
- return 0;
}
static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds,
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 02/19] libxl: change ao_device_remove to ao_device
Introduce a new structure to track state of device backends, that will
be used in following patches on this series.
This structure if used for both device creation and device
destruction and removes libxl__ao_device_remove.
Changes since v9:
* Fixed and documented behaviour with Qemu backed devices.
* Fix Ocaml bindings.
Changes since v8:
* Don''t wait for QDISK, VKBD or VFB to disconnect, since Qemu
doesn''t
honour the disconnection protocol.
Changes since v6:
* Use libxl__xs_transaction helpers.
Changes since v5:
* Added a common exit point for device addition/destruction that
removes backend and frontend entries (on destruction).
* Posponed the introduction of the base and active fields in the
ao_device struct.
* Don''t call libxl__ev_devstate_init, since _wait will do it.
* Removed "action being performed" comment.
Changes sinve v4:
* Added a more detailed comment in _prepare and _initiate header.
* Removed an unnecessary state check from
libxl_initiate_device_remove.
Changes since v2:
* Remove unnecessary comments in libxl__ao_device.
* Change libxl__device_cb to device_addrm_aocomplete.
* Rename aorm parameter in device_addrm_aocomplete to aodev.
* Use a macro to define {nic,disk,vkb,vfb}_{remove,destroy}
functions.
* Rename libxl__init_ao_device to libxl__prepare_ao_device and add a
comment explaining why we need to set active to 1.
* Replace al uses of aorm with aodev.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 229 +++++++++++++---------------------
tools/libxl/libxl.h | 15 ++-
tools/libxl/libxl_device.c | 193 +++++++++++++++++++++++------
tools/libxl/libxl_internal.h | 143 ++++++++++++++++++++-
tools/libxl/xl_cmdimpl.c | 2 +-
tools/ocaml/libs/xl/xenlight_stubs.c | 4 +-
6 files changed, 390 insertions(+), 196 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 4277745..ebc314b 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -1503,6 +1503,31 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid,
int autopass)
/******************************************************************************/
+/* generic callback for devices that only need to set ao_complete */
+static void device_addrm_aocomplete(libxl__egc *egc, libxl__ao_device *aodev)
+{
+ STATE_AO_GC(aodev->ao);
+
+ if (aodev->rc) {
+ if (aodev->dev) {
+ LOG(ERROR, "unable to %s %s with id %u",
+ aodev->action == DEVICE_CONNECT ? "add" :
"remove",
+ libxl__device_kind_to_string(aodev->dev->kind),
+ aodev->dev->devid);
+ } else {
+ LOG(ERROR, "unable to %s device",
+ aodev->action == DEVICE_CONNECT ? "add" :
"remove");
+ }
+ goto out;
+ }
+
+out:
+ libxl__ao_complete(egc, ao, aodev->rc);
+ return;
+}
+
+/******************************************************************************/
+
int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk)
{
int rc;
@@ -1680,42 +1705,6 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid,
libxl_device_disk *dis
return rc;
}
-int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid,
- libxl_device_disk *disk,
- const libxl_asyncop_how *ao_how)
-{
- AO_CREATE(ctx, domid, ao_how);
- libxl__device device;
- int rc;
-
- rc = libxl__device_from_disk(gc, domid, disk, &device);
- if (rc != 0) goto out;
-
- rc = libxl__initiate_device_remove(egc, ao, &device);
- if (rc) goto out;
-
- return AO_INPROGRESS;
-
-out:
- return AO_ABORT(rc);
-}
-
-int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid,
- libxl_device_disk *disk)
-{
- GC_INIT(ctx);
- libxl__device device;
- int rc;
-
- rc = libxl__device_from_disk(gc, domid, disk, &device);
- if (rc != 0) goto out;
-
- rc = libxl__device_destroy(gc, &device);
-out:
- GC_FREE;
- return rc;
-}
-
static void libxl__device_disk_from_xs_be(libxl__gc *gc,
const char *be_path,
libxl_device_disk *disk)
@@ -2080,8 +2069,9 @@ int libxl__device_disk_local_detach(libxl__gc *gc,
libxl_device_disk *disk)
if (disk->vdev != NULL) {
libxl_device_disk_remove(gc->owner, LIBXL_TOOLSTACK_DOMID,
disk, 0);
+ /* fixme-ao */
rc = libxl_device_disk_destroy(gc->owner,
- LIBXL_TOOLSTACK_DOMID, disk);
+ LIBXL_TOOLSTACK_DOMID, disk, 0);
}
break;
default:
@@ -2249,42 +2239,6 @@ out:
return rc;
}
-int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid,
- libxl_device_nic *nic,
- const libxl_asyncop_how *ao_how)
-{
- AO_CREATE(ctx, domid, ao_how);
- libxl__device device;
- int rc;
-
- rc = libxl__device_from_nic(gc, domid, nic, &device);
- if (rc != 0) goto out;
-
- rc = libxl__initiate_device_remove(egc, ao, &device);
- if (rc) goto out;
-
- return AO_INPROGRESS;
-
-out:
- return AO_ABORT(rc);
-}
-
-int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid,
- libxl_device_nic *nic)
-{
- GC_INIT(ctx);
- libxl__device device;
- int rc;
-
- rc = libxl__device_from_nic(gc, domid, nic, &device);
- if (rc != 0) goto out;
-
- rc = libxl__device_destroy(gc, &device);
-out:
- GC_FREE;
- return rc;
-}
-
static void libxl__device_nic_from_xs_be(libxl__gc *gc,
const char *be_path,
libxl_device_nic *nic)
@@ -2611,42 +2565,6 @@ out:
return rc;
}
-int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vkb *vkb,
- const libxl_asyncop_how *ao_how)
-{
- AO_CREATE(ctx, domid, ao_how);
- libxl__device device;
- int rc;
-
- rc = libxl__device_from_vkb(gc, domid, vkb, &device);
- if (rc != 0) goto out;
-
- rc = libxl__initiate_device_remove(egc, ao, &device);
- if (rc) goto out;
-
- return AO_INPROGRESS;
-
-out:
- return AO_ABORT(rc);
-}
-
-int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vkb *vkb)
-{
- GC_INIT(ctx);
- libxl__device device;
- int rc;
-
- rc = libxl__device_from_vkb(gc, domid, vkb, &device);
- if (rc != 0) goto out;
-
- rc = libxl__device_destroy(gc, &device);
-out:
- GC_FREE;
- return rc;
-}
-
/******************************************************************************/
int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb)
@@ -2744,41 +2662,66 @@ out:
return rc;
}
-int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vfb *vfb,
- const libxl_asyncop_how *ao_how)
-{
- AO_CREATE(ctx, domid, ao_how);
- libxl__device device;
- int rc;
-
- rc = libxl__device_from_vfb(gc, domid, vfb, &device);
- if (rc != 0) goto out;
-
- rc = libxl__initiate_device_remove(egc, ao, &device);
- if (rc) goto out;
-
- return AO_INPROGRESS;
-
-out:
- return AO_ABORT(rc);
-}
-
-int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid,
- libxl_device_vfb *vfb)
-{
- GC_INIT(ctx);
- libxl__device device;
- int rc;
-
- rc = libxl__device_from_vfb(gc, domid, vfb, &device);
- if (rc != 0) goto out;
+/******************************************************************************/
- rc = libxl__device_destroy(gc, &device);
-out:
- GC_FREE;
- return rc;
-}
+/* Macro for defining device remove/destroy functions in a compact way */
+/* The following functions are defined:
+ * libxl_device_disk_remove
+ * libxl_device_disk_destroy
+ * libxl_device_nic_remove
+ * libxl_device_nic_destroy
+ * libxl_device_vkb_remove
+ * libxl_device_vkb_destroy
+ * libxl_device_vfb_remove
+ * libxl_device_vfb_destroy
+ */
+#define DEFINE_DEVICE_REMOVE(type, removedestroy, f) \
+ int libxl_device_##type##_##removedestroy(libxl_ctx *ctx, \
+ uint32_t domid, libxl_device_##type *type, \
+ const libxl_asyncop_how *ao_how) \
+ { \
+ AO_CREATE(ctx, domid, ao_how); \
+ libxl__device *device; \
+ libxl__ao_device *aodev; \
+ int rc; \
+ \
+ GCNEW(device); \
+ rc = libxl__device_from_##type(gc, domid, type, device); \
+ if (rc != 0) goto out; \
+ \
+ GCNEW(aodev); \
+ libxl__prepare_ao_device(ao, aodev); \
+ aodev->action = DEVICE_DISCONNECT; \
+ aodev->dev = device; \
+ aodev->callback = device_addrm_aocomplete; \
+ aodev->force = f; \
+ libxl__initiate_device_remove(egc, aodev); \
+ \
+ out: \
+ if (rc) return AO_ABORT(rc); \
+ return AO_INPROGRESS; \
+ }
+
+/* Define all remove/destroy functions and undef the macro */
+
+/* disk */
+DEFINE_DEVICE_REMOVE(disk, remove, 0)
+DEFINE_DEVICE_REMOVE(disk, destroy, 1)
+
+/* nic */
+DEFINE_DEVICE_REMOVE(nic, remove, 0)
+DEFINE_DEVICE_REMOVE(nic, destroy, 1)
+
+/* vkb */
+DEFINE_DEVICE_REMOVE(vkb, remove, 0)
+DEFINE_DEVICE_REMOVE(vkb, destroy, 1)
+
+/* vfb */
+
+DEFINE_DEVICE_REMOVE(vfb, remove, 0)
+DEFINE_DEVICE_REMOVE(vfb, destroy, 1)
+
+#undef DEFINE_DEVICE_REMOVE
/******************************************************************************/
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index f5a8f87..c2d5c06 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -679,7 +679,8 @@ int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid,
libxl_device_disk *disk,
const libxl_asyncop_how *ao_how);
int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid,
- libxl_device_disk *disk);
+ libxl_device_disk *disk,
+ const libxl_asyncop_how *ao_how);
libxl_device_disk *libxl_device_disk_list(libxl_ctx *ctx, uint32_t domid, int
*num);
int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid,
@@ -696,7 +697,9 @@ int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid,
libxl_device_nic *nic);
int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid,
libxl_device_nic *nic,
const libxl_asyncop_how *ao_how);
-int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_nic
*nic);
+int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid,
+ libxl_device_nic *nic,
+ const libxl_asyncop_how *ao_how);
libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int
*num);
int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid,
@@ -707,14 +710,18 @@ int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid,
libxl_device_vkb *vkb);
int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid,
libxl_device_vkb *vkb,
const libxl_asyncop_how *ao_how);
-int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb
*vkb);
+int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid,
+ libxl_device_vkb *vkb,
+ const libxl_asyncop_how *ao_how);
/* Framebuffer */
int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb
*vfb);
int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid,
libxl_device_vfb *vfb,
const libxl_asyncop_how *ao_how);
-int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb
*vfb);
+int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid,
+ libxl_device_vfb *vfb,
+ const libxl_asyncop_how *ao_how);
/* PCI Passthrough */
int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci
*pcidev);
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index d33ac68..5a07ffb 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -361,11 +361,16 @@ int libxl__device_disk_dev_number(const char *virtpath,
int *pdisk,
return -1;
}
+/* Device AO operations */
-typedef struct {
- libxl__ao *ao;
- libxl__ev_devstate ds;
-} libxl__ao_device_remove;
+void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev)
+{
+ aodev->ao = ao;
+ aodev->rc = 0;
+ aodev->dev = NULL;
+ /* Initialize timer for QEMU Bodge */
+ libxl__ev_time_init(&aodev->timeout);
+}
int libxl__device_destroy(libxl__gc *gc, libxl__device *dev)
{
@@ -441,36 +446,81 @@ out:
/* Callbacks for device related operations */
-static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds,
+/*
+ * device_backend_callback is the main callback entry point, for both device
+ * addition and removal. It gets called if we reach the desired state
+ * (XenbusStateClosed or XenbusStateInitWait). After that, all this
+ * functions get called in the order displayed below.
+ *
+ * If new device types are added, they should only need to modify the
+ * specific hotplug scripts call, which can be found in each OS specific
+ * file. If this new devices don''t need a hotplug script, no
modification
+ * should be needed.
+ */
+
+/* This callback is part of the Qemu devices Badge */
+static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev,
+ const struct timeval *requested_abs);
+
+static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds,
int rc);
-static void device_remove_cleanup(libxl__gc *gc,
- libxl__ao_device_remove *aorm);
+static void device_backend_cleanup(libxl__gc *gc,
+ libxl__ao_device *aodev);
-int libxl__initiate_device_remove(libxl__egc *egc, libxl__ao *ao,
- libxl__device *dev)
+static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev);
+
+void libxl__initiate_device_remove(libxl__egc *egc,
+ libxl__ao_device *aodev)
{
- AO_GC;
+ STATE_AO_GC(aodev->ao);
xs_transaction_t t = 0;
- char *be_path = libxl__device_backend_path(gc, dev);
+ char *be_path = libxl__device_backend_path(gc, aodev->dev);
char *state_path = libxl__sprintf(gc, "%s/state", be_path);
char *online_path = GCSPRINTF("%s/online", be_path);
const char *state;
-
+ libxl_dominfo info;
+ uint32_t domid = aodev->dev->domid;
int rc = 0;
- libxl__ao_device_remove *aorm = 0;
+
+ libxl_dominfo_init(&info);
+ rc = libxl_domain_info(CTX, &info, domid);
+ if (rc) {
+ LOG(ERROR, "unable to get info for domain %d", domid);
+ goto out;
+ }
+ if (QEMU_BACKEND(aodev->dev) &&
+ (info.paused || info.dying || info.shutdown)) {
+ /*
+ * TODO: 4.2 Bodge due to QEMU, see comment on top of
+ * libxl__initiate_device_remove in libxl_internal.h
+ */
+ rc = libxl__ev_time_register_rel(gc, &aodev->timeout,
+ device_qemu_timeout,
+ LIBXL_QEMU_BODGE_TIMEOUT * 1000);
+ if (rc) {
+ LOG(ERROR, "unable to register timeout for Qemu device
%s",
+ be_path);
+ goto out;
+ }
+ return;
+ }
for (;;) {
rc = libxl__xs_transaction_start(gc, &t);
if (rc) {
LOG(ERROR, "unable to start transaction");
- goto out_fail;
+ goto out;
}
+ if (aodev->force)
+ libxl__xs_path_cleanup(gc, t,
+ libxl__device_frontend_path(gc,
aodev->dev));
+
rc = libxl__xs_read_checked(gc, t, state_path, &state);
if (rc) {
LOG(ERROR, "unable to read device state from path %s",
state_path);
- goto out_fail;
+ goto out;
}
/*
@@ -481,53 +531,118 @@ int libxl__initiate_device_remove(libxl__egc *egc,
libxl__ao *ao,
rc = libxl__xs_write_checked(gc, t, online_path, "0");
if (rc) {
LOG(ERROR, "unable to write to xenstore path %s",
online_path);
- goto out_fail;
+ goto out;
}
rc = libxl__xs_write_checked(gc, t, state_path, "5");
if (rc) {
LOG(ERROR, "unable to write to xenstore path %s",
state_path);
- goto out_fail;
+ goto out;
}
}
rc = libxl__xs_transaction_commit(gc, &t);
if (!rc) break;
- if (rc < 0) goto out_fail;
+ if (rc < 0) goto out;
}
libxl__device_destroy_tapdisk(gc, be_path);
- aorm = libxl__zalloc(gc, sizeof(*aorm));
- aorm->ao = ao;
- libxl__ev_devstate_init(&aorm->ds);
-
- rc = libxl__ev_devstate_wait(gc, &aorm->ds, device_remove_callback,
+ rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds,
+ device_backend_callback,
state_path, XenbusStateClosed,
LIBXL_DESTROY_TIMEOUT * 1000);
- if (rc) goto out_fail;
+ if (rc) {
+ LOG(ERROR, "unable to remove device %s", be_path);
+ goto out;
+ }
- libxl__ao_complete(egc, ao, 0);
- return 0;
+ libxl_dominfo_dispose(&info);
+ return;
- out_fail:
- assert(rc);
+out:
+ aodev->rc = rc;
+ libxl_dominfo_dispose(&info);
libxl__xs_transaction_abort(gc, &t);
- device_remove_cleanup(gc, aorm);
- return rc;
+ device_hotplug_done(egc, aodev);
+ return;
+}
+
+static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev,
+ const struct timeval *requested_abs)
+{
+ libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout);
+ STATE_AO_GC(aodev->ao);
+ char *be_path = libxl__device_backend_path(gc, aodev->dev);
+ char *state_path = GCSPRINTF("%s/state", be_path);
+ int rc = 0;
+
+ libxl__ev_time_deregister(gc, &aodev->timeout);
+
+ rc = libxl__xs_write_checked(gc, XBT_NULL, state_path, "6");
+ if (rc) goto out;
+
+out:
+ aodev->rc = rc;
+ device_hotplug_done(egc, aodev);
}
-static void device_remove_callback(libxl__egc *egc, libxl__ev_devstate *ds,
+static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds,
int rc) {
- libxl__ao_device_remove *aorm = CONTAINER_OF(ds, *aorm, ds);
- libxl__gc *gc = &aorm->ao->gc;
- libxl__ao_complete(egc, aorm->ao, rc);
- device_remove_cleanup(gc, aorm);
+ libxl__ao_device *aodev = CONTAINER_OF(ds, *aodev, backend_ds);
+ STATE_AO_GC(aodev->ao);
+
+ device_backend_cleanup(gc, aodev);
+
+ if (rc == ERROR_TIMEDOUT && aodev->action == DEVICE_DISCONNECT
&&
+ !aodev->force) {
+ aodev->force = 1;
+ libxl__initiate_device_remove(egc, aodev);
+ return;
+ }
+
+ if (rc) {
+ LOG(ERROR, "unable to disconnect device with path %s",
+ libxl__device_backend_path(gc, aodev->dev));
+ goto out;
+ }
+
+out:
+ aodev->rc = rc;
+ device_hotplug_done(egc, aodev);
+ return;
}
-static void device_remove_cleanup(libxl__gc *gc,
- libxl__ao_device_remove *aorm) {
- if (!aorm) return;
- libxl__ev_devstate_cancel(gc, &aorm->ds);
+static void device_backend_cleanup(libxl__gc *gc, libxl__ao_device *aodev)
+{
+ if (!aodev) return;
+ libxl__ev_devstate_cancel(gc, &aodev->backend_ds);
+}
+
+static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev)
+{
+ STATE_AO_GC(aodev->ao);
+ char *be_path = libxl__device_backend_path(gc, aodev->dev);
+ char *fe_path = libxl__device_frontend_path(gc, aodev->dev);
+ xs_transaction_t t = 0;
+ int rc;
+
+ if (aodev->action == DEVICE_DISCONNECT) {
+ for (;;) {
+ rc = libxl__xs_transaction_start(gc, &t);
+ if (rc) goto out;
+
+ libxl__xs_path_cleanup(gc, t, fe_path);
+ libxl__xs_path_cleanup(gc, t, be_path);
+
+ rc = libxl__xs_transaction_commit(gc, &t);
+ if (!rc) break;
+ if (rc < 0) goto out;
+ }
+ }
+
+out:
+ aodev->callback(egc, aodev);
+ return;
}
int libxl__wait_for_device_model(libxl__gc *gc,
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 2781398..5d985ff 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -74,6 +74,7 @@
#define LIBXL_DESTROY_TIMEOUT 10
#define LIBXL_DEVICE_MODEL_START_TIMEOUT 10
+#define LIBXL_QEMU_BODGE_TIMEOUT 2
#define LIBXL_XENCONSOLE_LIMIT 1048576
#define LIBXL_XENCONSOLE_PROTOCOL "vt100"
#define LIBXL_MAXMEM_CONSTANT 1024
@@ -350,6 +351,12 @@ typedef struct {
libxl__device_kind kind;
} libxl__device;
+/* Used to know if backend of given device is QEMU */
+#define QEMU_BACKEND(dev) (\
+ (dev)->backend_kind == LIBXL__DEVICE_KIND_QDISK || \
+ (dev)->backend_kind == LIBXL__DEVICE_KIND_VFB || \
+ (dev)->backend_kind == LIBXL__DEVICE_KIND_VKBD)
+
#define XC_PCI_BDF "0x%x, 0x%x, 0x%x, 0x%x"
#define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func)
& 0x07))
#define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f)
@@ -899,13 +906,6 @@ _hidden const char *libxl__device_nic_devname(libxl__gc
*gc,
uint32_t devid,
libxl_nic_type type);
-/* Arranges that dev will be removed from its guest. When
- * this is done, the ao will be completed. An error
- * return from libxl__initiate_device_remove means that the ao
- * will _not_ be completed and the caller must do so. */
-_hidden int libxl__initiate_device_remove(libxl__egc*, libxl__ao*,
- libxl__device *dev);
-
/*
* libxl__ev_devstate - waits a given time for a device to
* reach a given state. Follows the libxl_ev_* conventions.
@@ -2007,6 +2007,135 @@ _hidden void
libxl__bootloader_init(libxl__bootloader_state *bl);
* If callback is passed rc==0, will have updated st->info appropriately */
_hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st);
+/*----- device addition/removal -----*/
+
+/* Action to perform (either connect or disconnect) */
+typedef enum {
+ DEVICE_CONNECT,
+ DEVICE_DISCONNECT
+} libxl__device_action;
+
+typedef struct libxl__ao_device libxl__ao_device;
+typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*);
+
+/* This functions sets the necessary libxl__ao_device struct values to use
+ * safely inside functions. It marks the operation as "active"
+ * since we need to be sure that all device status structs are set
+ * to active before start queueing events, or we might call
+ * ao_complete before all devices had finished
+ *
+ * libxl__initiate_device_{remove/addition} should not be called without
+ * calling libxl__prepare_ao_device first, since it initializes the private
+ * fields of the struct libxl__ao_device to what this functions expect.
+ *
+ * Once _prepare has been called on a libxl__ao_device, it is safe to just
+ * discard this struct, there''s no need to call any destroy function.
+ * _prepare can also be called multiple times with the same libxl__ao_device.
+ */
+_hidden void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev);
+
+struct libxl__ao_device {
+ /* filled in by user */
+ libxl__ao *ao;
+ libxl__device_action action;
+ libxl__device *dev;
+ int force;
+ libxl__device_callback *callback;
+ /* private for implementation */
+ int rc;
+ libxl__ev_devstate backend_ds;
+ /* Bodge for Qemu devices */
+ libxl__ev_time timeout;
+};
+
+/*
+ * Algorithm for handling device removal (including domain
+ * destruction). This is somewhat subtle because we may already have
+ * killed the domain and caused the death of qemu.
+ *
+ * In current versions of qemu there is no mechanism for ensuring that
+ * the resources used by its devices (both emulated and any PV devices
+ * provided by qemu) are freed (eg, fds closed) before it shuts down,
+ * and no confirmation from a terminating qemu back to the toolstack.
+ *
+ * This will need to be fixed in Xen 4.3. In the meantime (Xen 4.2)
+ * we implement a bodge.
+ *
+ * WE WANT TO UNPLUG WE WANT TO SHUT DOWN OR DESTROY
+ * | |
+ * | LIBXL SENDS SIGHUP TO QEMU
+ * | .....................|........................
+ * | : XEN 4.3+ PLANNED | :
+ * | : QEMU TEARS DOWN ALL DEVICES :
+ * | : FREES RESOURCES (closing fds) :
+ * | : SETS PV BACKENDS TO STATE 5, :
+ * | : waits for PV frontends to shut down :
+ * | : SETS PV BACKENDS TO STATE 6 :
+ * | : | :
+ * | : QEMU NOTIFIES TOOLSTACK (via :
+ * | : xenstore) that it is exiting :
+ * | : QEMU EXITS (parent may be init) :
+ * | : | :
+ * | : TOOLSTACK WAITS FOR QEMU :
+ * | : notices qemu has finished :
+ * | :....................|.......................:
+ * | .--------------------''
+ * V V
+ * for each device
+ * we want to unplug/remove
+ * ..................|...........................................
+ * : V XEN 4.2 RACY BODGE :
+ * : device is provided by qemu :
+ * : | `-----------. :
+ * : something| V :
+ * : else, eg| domain (that is domain for which :
+ * : blkback| this PV device is the backend, :
+ * : | which might be the stub dm) :
+ * : | is still alive? :
+ * : | | | :
+ * : | |alive |dead :
+ * : |<-----------------'' |
:
+ * : | hopefully qemu is | :
+ * : | still running | :
+ * :............|................. | :
+ * ,----->| : we may be racing :
+ * | backend state? : with qemu''s death
:
+ * ^ | | : | :
+ * xenstore| |other |6 : WAIT 2.0s :
+ * conflict| | | : TIMEOUT :
+ * | WRITE B.E. | : | :
+ * | STATE:=5 | : hopefully qemu has :
+ * `---'' | | : gone by now and
:
+ * |ok | : freed its resources :
+ * | | : | :
+ * WAIT FOR | : SET B.E. :
+ * STATE==6 | : STATE:=6 :
+ * / | | :..........|...................:
+ * timeout/ ok| | |
+ * / | | |
+ * | RUN HOTPLUG <-''<----------------''
+ * | SCRIPT
+ * | |
+ * `---> NUKE
+ * BACKEND
+ * |
+ * DONE.
+ */
+
+/* Arranges that dev will be removed to the guest, and the
+ * hotplug scripts will be executed (if necessary). When
+ * this is done (or an error happens), the callback in
+ * aodev->callback will be called.
+ *
+ * The libxl__ao_device passed to this function should be
+ * prepared using libxl__prepare_ao_device prior to calling
+ * this function.
+ *
+ * Once finished, aodev->callback will be executed.
+ */
+_hidden void libxl__initiate_device_remove(libxl__egc *egc,
+ libxl__ao_device *aodev);
+
/*----- Domain creation -----*/
typedef struct libxl__domain_create_state libxl__domain_create_state;
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index e2aa8592..29523e1 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -5416,7 +5416,7 @@ int main_blockdetach(int argc, char **argv)
if (libxl_device_disk_remove(ctx, domid, &disk, 0)) {
fprintf(stderr, "libxl_device_disk_remove failed.\n");
} else
- libxl_device_disk_destroy(ctx, domid, &disk);
+ libxl_device_disk_destroy(ctx, domid, &disk, 0);
return 0;
}
diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c
b/tools/ocaml/libs/xl/xenlight_stubs.c
index c712b2b..53751b1 100644
--- a/tools/ocaml/libs/xl/xenlight_stubs.c
+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
@@ -351,7 +351,7 @@ value stub_xl_device_vkb_destroy(value info, value domid)
device_vkb_val(&gc, &lg, &c_info, info);
INIT_CTX();
- ret = libxl_device_vkb_destroy(ctx, Int_val(domid), &c_info);
+ ret = libxl_device_vkb_destroy(ctx, Int_val(domid), &c_info, 0);
if (ret != 0)
failwith_xl("vkb_hard_shutdown", &lg);
FREE_CTX();
@@ -405,7 +405,7 @@ value stub_xl_device_vfb_destroy(value info, value domid)
device_vfb_val(&gc, &lg, &c_info, info);
INIT_CTX();
- ret = libxl_device_vfb_destroy(ctx, Int_val(domid), &c_info);
+ ret = libxl_device_vfb_destroy(ctx, Int_val(domid), &c_info, 0);
if (ret != 0)
failwith_xl("vfb_hard_shutdown", &lg);
FREE_CTX();
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 03/19] libxl: move device model creation prototypes
Move prototypes regarding device model creation, since they will
depend on domain destruction in future patches.
This patch is pure code motion.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl_internal.h | 75 ++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 5d985ff..101e7fb 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1150,44 +1150,6 @@ static inline int libxl__spawn_inuse(libxl__spawn_state
*ss)
_hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*,
pid_t innerchild);
-/*----- device model creation -----*/
-
-/* First layer; wraps libxl__spawn_spawn. */
-
-typedef struct libxl__dm_spawn_state libxl__dm_spawn_state;
-
-typedef void libxl__dm_spawn_cb(libxl__egc *egc, libxl__dm_spawn_state*,
- int rc /* if !0, error was logged */);
-
-struct libxl__dm_spawn_state {
- /* mixed - spawn.ao must be initialised by user; rest is private: */
- libxl__spawn_state spawn;
- /* filled in by user, must remain valid: */
- uint32_t guest_domid; /* domain being served */
- libxl_domain_config *guest_config;
- libxl__domain_build_state *build_state; /* relates to guest_domid */
- libxl__dm_spawn_cb *callback;
-};
-
-_hidden void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state*);
-
-/* Stubdom device models. */
-
-typedef struct {
- /* Mixed - user must fill in public parts EXCEPT callback,
- * which may be undefined on entry. (See above for details) */
- libxl__dm_spawn_state dm; /* the stub domain device model */
- /* filled in by user, must remain valid: */
- libxl__dm_spawn_cb *callback; /* called as callback(,&sdss->dm,) */
- /* private to libxl__spawn_stub_dm: */
- libxl_domain_config dm_config;
- libxl__domain_build_state dm_state;
- libxl__dm_spawn_state pvqemu;
-} libxl__stub_dm_spawn_state;
-
-_hidden void libxl__spawn_stub_dm(libxl__egc *egc,
libxl__stub_dm_spawn_state*);
-
-
/*
* libxl__wait_for_offspring - Wait for child state
* gc: allocation pool
@@ -2136,6 +2098,43 @@ struct libxl__ao_device {
_hidden void libxl__initiate_device_remove(libxl__egc *egc,
libxl__ao_device *aodev);
+/*----- device model creation -----*/
+
+/* First layer; wraps libxl__spawn_spawn. */
+
+typedef struct libxl__dm_spawn_state libxl__dm_spawn_state;
+
+typedef void libxl__dm_spawn_cb(libxl__egc *egc, libxl__dm_spawn_state*,
+ int rc /* if !0, error was logged */);
+
+struct libxl__dm_spawn_state {
+ /* mixed - spawn.ao must be initialised by user; rest is private: */
+ libxl__spawn_state spawn;
+ /* filled in by user, must remain valid: */
+ uint32_t guest_domid; /* domain being served */
+ libxl_domain_config *guest_config;
+ libxl__domain_build_state *build_state; /* relates to guest_domid */
+ libxl__dm_spawn_cb *callback;
+};
+
+_hidden void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state*);
+
+/* Stubdom device models. */
+
+typedef struct {
+ /* Mixed - user must fill in public parts EXCEPT callback,
+ * which may be undefined on entry. (See above for details) */
+ libxl__dm_spawn_state dm; /* the stub domain device model */
+ /* filled in by user, must remain valid: */
+ libxl__dm_spawn_cb *callback; /* called as callback(,&sdss->dm,) */
+ /* private to libxl__spawn_stub_dm: */
+ libxl_domain_config dm_config;
+ libxl__domain_build_state dm_state;
+ libxl__dm_spawn_state pvqemu;
+} libxl__stub_dm_spawn_state;
+
+_hidden void libxl__spawn_stub_dm(libxl__egc *egc,
libxl__stub_dm_spawn_state*);
+
/*----- Domain creation -----*/
typedef struct libxl__domain_create_state libxl__domain_create_state;
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 04/19] libxl: convert libxl_domain_destroy to an async op
This change introduces some new structures, and breaks the mutual
dependency that libxl_domain_destroy and libxl__destroy_device_model
had. This is done by checking if the domid passed to
libxl_domain_destroy has a stubdom, and then having the bulk of the
destroy machinery in a separate function (libxl__destroy_domid) that
doesn''t check for stubdom presence, since we check for it in the upper
level function. The reason behind this change is the need to use
structures for ao operations, and it was impossible to have two
different self-referencing structs.
All uses of libxl_domain_destroy have been changed, and either
replaced by the new libxl_domain_destroy ao function or by the
internal libxl__domain_destroy that can be used inside an already
running ao.
Changes since v6:
* Fixed typos.
Changes since v5:
* Introduced a new struct, called libxl__ao_devices that will be used
to simplify the addition/removal of multiple devices at the same
time.
* With this function we can use a generic callback for ao_device,
libxl__ao_devices_callback, that will check if the device is the
last one and call ao_devices->callback appropiately.
Changes since v4:
* Fixed spelling mistakes.
* Always use "force = 1" in device destruction in
libxl__destroy_domid function.
* Changed name of domain destroy callbacks to include "destroy".
* Changed the use of rc to catch syscall errors.
* Use libxl__remove_file instead of unlink.
* Changed variable name of number of devices returned by
libxl__xs_directory.
* Simplify libxl__ao_device_check_last return.
* Correctly propagate error returned from libxl__num_devices.
* Add a comment about the use of libxl__device_destroy to destroy the
console.
* Fixed some uses of LIBXL__LOG.
Changes since v3:
* Fixed python bindings.
Changes since v2:
* Remove printfs.
* Replace aorm with aodev.
* Define an auxiliary libxl__ao_device *aodev to avoid using the long
expression: drs->aorm[numdev]...
* Added a common callback for both domain and stubdomain destruction
that checks if both domains are finished and handles errors
correctly.
* Change libxl__ao_device_check_last logic a bit and add a comment
describing how does it work.
* Fixed spelling mistakes.
* Use a do-while for xs transaction in device_remove_callback.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 176 +++++++++++++++++++++++++++++++++++--
tools/libxl/libxl.h | 3 +-
tools/libxl/libxl_create.c | 29 +++++-
tools/libxl/libxl_device.c | 149 +++++++++++++++++++++++++++----
tools/libxl/libxl_dm.c | 85 +++++++++----------
tools/libxl/libxl_internal.h | 116 ++++++++++++++++++++++++-
tools/libxl/xl_cmdimpl.c | 12 ++--
tools/python/xen/lowlevel/xl/xl.c | 2 +-
8 files changed, 488 insertions(+), 84 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index ebc314b..0600ce4 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -1216,11 +1216,133 @@ void libxl_evdisable_disk_eject(libxl_ctx *ctx,
libxl_evgen_disk_eject *evg) {
GC_FREE;
}
-int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid)
+/* Callbacks for libxl_domain_destroy */
+
+static void domain_destroy_cb(libxl__egc *egc, libxl__domain_destroy_state
*dds,
+ int rc);
+
+int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid,
+ const libxl_asyncop_how *ao_how)
{
- GC_INIT(ctx);
+ AO_CREATE(ctx, domid, ao_how);
+ libxl__domain_destroy_state *dds;
+
+ GCNEW(dds);
+ dds->ao = ao;
+ dds->domid = domid;
+ dds->callback = domain_destroy_cb;
+ libxl__domain_destroy(egc, dds);
+
+ return AO_INPROGRESS;
+}
+
+static void domain_destroy_cb(libxl__egc *egc, libxl__domain_destroy_state
*dds,
+ int rc)
+{
+ STATE_AO_GC(dds->ao);
+
+ if (rc)
+ LOG(ERROR, "destruction of domain %u failed", dds->domid);
+
+ libxl__ao_complete(egc, ao, rc);
+}
+
+/* Callbacks for libxl__domain_destroy */
+
+static void stubdom_destroy_callback(libxl__egc *egc,
+ libxl__destroy_domid_state *dis,
+ int rc);
+
+static void domain_destroy_callback(libxl__egc *egc,
+ libxl__destroy_domid_state *dis,
+ int rc);
+
+static void destroy_finish_check(libxl__egc *egc,
+ libxl__domain_destroy_state *dds);
+
+void libxl__domain_destroy(libxl__egc *egc, libxl__domain_destroy_state *dds)
+{
+ STATE_AO_GC(dds->ao);
+ uint32_t stubdomid = libxl_get_stubdom_id(CTX, dds->domid);
+
+ if (stubdomid) {
+ dds->stubdom.ao = ao;
+ dds->stubdom.domid = stubdomid;
+ dds->stubdom.callback = stubdom_destroy_callback;
+ libxl__destroy_domid(egc, &dds->stubdom);
+ } else {
+ dds->stubdom_finished = 1;
+ }
+
+ dds->domain.ao = ao;
+ dds->domain.domid = dds->domid;
+ dds->domain.callback = domain_destroy_callback;
+ libxl__destroy_domid(egc, &dds->domain);
+}
+
+static void stubdom_destroy_callback(libxl__egc *egc,
+ libxl__destroy_domid_state *dis,
+ int rc)
+{
+ STATE_AO_GC(dis->ao);
+ libxl__domain_destroy_state *dds = CONTAINER_OF(dis, *dds, stubdom);
+ const char *savefile;
+
+ if (rc) {
+ LOG(ERROR, "unable to destroy stubdom with domid %u",
dis->domid);
+ dds->rc = rc;
+ }
+
+ dds->stubdom_finished = 1;
+ savefile = libxl__device_model_savefile(gc, dis->domid);
+ rc = libxl__remove_file(gc, savefile);
+ /*
+ * On suspend libxl__domain_save_device_model will have already
+ * unlinked the save file.
+ */
+ if (rc) {
+ LOG(ERROR, "failed to remove device-model savefile %s",
savefile);
+ }
+
+ destroy_finish_check(egc, dds);
+}
+
+static void domain_destroy_callback(libxl__egc *egc,
+ libxl__destroy_domid_state *dis,
+ int rc)
+{
+ STATE_AO_GC(dis->ao);
+ libxl__domain_destroy_state *dds = CONTAINER_OF(dis, *dds, domain);
+
+ if (rc) {
+ LOG(ERROR, "unable to destroy guest with domid %u",
dis->domid);
+ dds->rc = rc;
+ }
+
+ dds->domain_finished = 1;
+ destroy_finish_check(egc, dds);
+}
+
+static void destroy_finish_check(libxl__egc *egc,
+ libxl__domain_destroy_state *dds)
+{
+ if (!(dds->domain_finished && dds->stubdom_finished))
+ return;
+
+ dds->callback(egc, dds, dds->rc);
+}
+
+/* Callbacks for libxl__destroy_domid */
+static void devices_destroy_cb(libxl__egc *egc,
+ libxl__devices_remove_state *drs,
+ int rc);
+
+void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis)
+{
+ STATE_AO_GC(dis->ao);
+ libxl_ctx *ctx = CTX;
+ uint32_t domid = dis->domid;
char *dom_path;
- char *vm_path;
char *pid;
int rc, dm_present;
@@ -1231,12 +1353,15 @@ int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid)
case ERROR_INVAL:
LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "non-existant domain %d",
domid);
default:
- return rc;
+ goto out;
}
switch (libxl__domain_type(gc, domid)) {
case LIBXL_DOMAIN_TYPE_HVM:
- dm_present = 1;
+ if (!libxl_get_stubdom_id(CTX, domid))
+ dm_present = 1;
+ else
+ dm_present = 0;
break;
case LIBXL_DOMAIN_TYPE_PV:
pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc,
"/local/domain/%d/image/device-model-pid", domid));
@@ -1267,7 +1392,37 @@ int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid)
libxl__qmp_cleanup(gc, domid);
}
- if (libxl__devices_destroy(gc, domid) < 0)
+ dis->drs.ao = ao;
+ dis->drs.domid = domid;
+ dis->drs.callback = devices_destroy_cb;
+ dis->drs.force = 1;
+ libxl__devices_destroy(egc, &dis->drs);
+ return;
+
+out:
+ assert(rc);
+ dis->callback(egc, dis, rc);
+ return;
+}
+
+static void devices_destroy_cb(libxl__egc *egc,
+ libxl__devices_remove_state *drs,
+ int rc)
+{
+ STATE_AO_GC(drs->ao);
+ libxl__destroy_domid_state *dis = CONTAINER_OF(drs, *dis, drs);
+ libxl_ctx *ctx = CTX;
+ uint32_t domid = dis->domid;
+ char *dom_path;
+ char *vm_path;
+
+ dom_path = libxl__xs_get_dompath(gc, domid);
+ if (!dom_path) {
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ if (rc < 0)
LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
"libxl__devices_destroy failed for %d", domid);
@@ -1280,6 +1435,10 @@ int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid)
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xs_rm failed for
%s", dom_path);
xs_rm(ctx->xsh, XBT_NULL, libxl__xs_libxl_path(gc, domid));
+ xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc,
+ "/local/domain/0/device-model/%d",
domid));
+ xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc,
+ "/local/domain/%d/hvmloader",
domid));
libxl__userdata_destroyall(gc, domid);
@@ -1290,9 +1449,10 @@ int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid)
goto out;
}
rc = 0;
+
out:
- GC_FREE;
- return rc;
+ dis->callback(egc, dis, rc);
+ return;
}
int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num,
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index c2d5c06..5c819f1 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -527,7 +527,8 @@ int libxl_domain_remus_start(libxl_ctx *ctx,
libxl_domain_remus_info *info,
int libxl_domain_shutdown(libxl_ctx *ctx, uint32_t domid);
int libxl_domain_reboot(libxl_ctx *ctx, uint32_t domid);
-int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid);
+int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid,
+ const libxl_asyncop_how *ao_how);
int libxl_domain_preserve(libxl_ctx *ctx, uint32_t domid,
libxl_domain_create_info *info, const char *name_suffix, libxl_uuid new_uuid);
/* get max. number of cpus supported by hypervisor */
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 294a73f..16d32c2 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -571,6 +571,12 @@ static void domcreate_complete(libxl__egc *egc,
libxl__domain_create_state *dcs,
int rc);
+/* If creation is not successful, this callback will be executed
+ * when domain destruction is finished */
+static void domcreate_destruction_cb(libxl__egc *egc,
+ libxl__domain_destroy_state *dds,
+ int rc);
+
static void initiate_domain_create(libxl__egc *egc,
libxl__domain_create_state *dcs)
{
@@ -996,16 +1002,31 @@ static void domcreate_complete(libxl__egc *egc,
if (rc) {
if (dcs->guest_domid) {
- int rc2 = libxl_domain_destroy(CTX, dcs->guest_domid);
- if (rc2)
- LOG(ERROR, "unable to destroy domain %d following"
- " failed creation", dcs->guest_domid);
+ dcs->dds.ao = ao;
+ dcs->dds.domid = dcs->guest_domid;
+ dcs->dds.callback = domcreate_destruction_cb;
+ libxl__domain_destroy(egc, &dcs->dds);
+ return;
}
dcs->guest_domid = -1;
}
dcs->callback(egc, dcs, rc, dcs->guest_domid);
}
+static void domcreate_destruction_cb(libxl__egc *egc,
+ libxl__domain_destroy_state *dds,
+ int rc)
+{
+ STATE_AO_GC(dds->ao);
+ libxl__domain_create_state *dcs = CONTAINER_OF(dds, *dcs, dds);
+
+ if (rc)
+ LOG(ERROR, "unable to destroy domain %u following failed
creation",
+ dds->domid);
+
+ dcs->callback(egc, dcs, ERROR_FAIL, dcs->guest_domid);
+}
+
/*----- application-facing domain creation interface -----*/
typedef struct {
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index 5a07ffb..a94beab 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -58,6 +58,48 @@ int libxl__parse_backend_path(libxl__gc *gc,
return libxl__device_kind_from_string(strkind, &dev->backend_kind);
}
+static int libxl__num_devices(libxl__gc *gc, uint32_t domid)
+{
+ char *path;
+ unsigned int num_kinds, num_devs;
+ char **kinds = NULL, **devs = NULL;
+ int i, j, rc = 0;
+ libxl__device dev;
+ libxl__device_kind kind;
+ int numdevs = 0;
+
+ path = GCSPRINTF("/local/domain/%d/device", domid);
+ kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds);
+ if (!kinds) {
+ if (errno != ENOENT) {
+ LOGE(ERROR, "unable to get xenstore device listing %s",
path);
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ num_kinds = 0;
+ }
+ for (i = 0; i < num_kinds; i++) {
+ if (libxl__device_kind_from_string(kinds[i], &kind))
+ continue;
+
+ path = GCSPRINTF("/local/domain/%d/device/%s", domid,
kinds[i]);
+ devs = libxl__xs_directory(gc, XBT_NULL, path, &num_devs);
+ if (!devs)
+ continue;
+ for (j = 0; j < num_devs; j++) {
+ path = GCSPRINTF("/local/domain/%d/device/%s/%s/backend",
+ domid, kinds[i], devs[j]);
+ path = libxl__xs_read(gc, XBT_NULL, path);
+ if (path && libxl__parse_backend_path(gc, path, &dev)
== 0) {
+ numdevs++;
+ }
+ }
+ }
+out:
+ if (rc) return rc;
+ return numdevs;
+}
+
int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t,
libxl__device *device, char **bents, char **fents)
{
@@ -370,6 +412,37 @@ void libxl__prepare_ao_device(libxl__ao *ao,
libxl__ao_device *aodev)
aodev->dev = NULL;
/* Initialize timer for QEMU Bodge */
libxl__ev_time_init(&aodev->timeout);
+ aodev->active = 1;
+}
+
+void libxl__prepare_ao_devices(libxl__ao *ao, libxl__ao_devices *aodevs)
+{
+ AO_GC;
+
+ GCNEW_ARRAY(aodevs->array, aodevs->size);
+ for (int i = 0; i < aodevs->size; i++) {
+ aodevs->array[i].aodevs = aodevs;
+ libxl__prepare_ao_device(ao, &aodevs->array[i]);
+ }
+}
+
+void libxl__ao_devices_callback(libxl__egc *egc, libxl__ao_device *aodev)
+{
+ STATE_AO_GC(aodev->ao);
+ libxl__ao_devices *aodevs = aodev->aodevs;
+ int i, error = 0;
+
+ aodev->active = 0;
+ for (i = 0; i < aodevs->size; i++) {
+ if (aodevs->array[i].active)
+ return;
+
+ if (aodevs->array[i].rc)
+ error = aodevs->array[i].rc;
+ }
+
+ aodevs->callback(egc, aodevs, error);
+ return;
}
int libxl__device_destroy(libxl__gc *gc, libxl__device *dev)
@@ -386,16 +459,35 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device
*dev)
return 0;
}
-int libxl__devices_destroy(libxl__gc *gc, uint32_t domid)
+/* Callback for device destruction */
+
+static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs,
+ int rc);
+
+void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs)
{
+ STATE_AO_GC(drs->ao);
libxl_ctx *ctx = libxl__gc_owner(gc);
+ uint32_t domid = drs->domid;
char *path;
- unsigned int num_kinds, num_devs;
+ unsigned int num_kinds, num_dev_xsentries;
char **kinds = NULL, **devs = NULL;
- int i, j;
- libxl__device dev;
+ int i, j, numdev = 0, rc = 0;
+ libxl__device *dev;
+ libxl__ao_devices *aodevs = &drs->aodevs;
+ libxl__ao_device *aodev;
libxl__device_kind kind;
+ aodevs->size = libxl__num_devices(gc, drs->domid);
+ if (aodevs->size < 0) {
+ LOG(ERROR, "unable to get number of devices for domain %u",
drs->domid);
+ rc = aodevs->size;
+ goto out;
+ }
+
+ libxl__prepare_ao_devices(drs->ao, aodevs);
+ aodevs->callback = devices_remove_callback;
+
path = libxl__sprintf(gc, "/local/domain/%d/device", domid);
kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds);
if (!kinds) {
@@ -411,19 +503,25 @@ int libxl__devices_destroy(libxl__gc *gc, uint32_t domid)
continue;
path = libxl__sprintf(gc, "/local/domain/%d/device/%s",
domid, kinds[i]);
- devs = libxl__xs_directory(gc, XBT_NULL, path, &num_devs);
+ devs = libxl__xs_directory(gc, XBT_NULL, path, &num_dev_xsentries);
if (!devs)
continue;
- for (j = 0; j < num_devs; j++) {
+ for (j = 0; j < num_dev_xsentries; j++) {
path = libxl__sprintf(gc,
"/local/domain/%d/device/%s/%s/backend",
domid, kinds[i], devs[j]);
path = libxl__xs_read(gc, XBT_NULL, path);
- if (path && libxl__parse_backend_path(gc, path, &dev)
== 0) {
- dev.domid = domid;
- dev.kind = kind;
- dev.devid = atoi(devs[j]);
-
- libxl__device_destroy(gc, &dev);
+ GCNEW(dev);
+ if (path && libxl__parse_backend_path(gc, path, dev) == 0)
{
+ aodev = &aodevs->array[numdev];
+ dev->domid = domid;
+ dev->kind = kind;
+ dev->devid = atoi(devs[j]);
+ aodev->action = DEVICE_DISCONNECT;
+ aodev->dev = dev;
+ aodev->callback = libxl__ao_devices_callback;
+ aodev->force = drs->force;
+ libxl__initiate_device_remove(egc, aodev);
+ numdev++;
}
}
}
@@ -431,17 +529,22 @@ int libxl__devices_destroy(libxl__gc *gc, uint32_t domid)
/* console 0 frontend directory is not under
/local/domain/<domid>/device */
path = libxl__sprintf(gc, "/local/domain/%d/console/backend",
domid);
path = libxl__xs_read(gc, XBT_NULL, path);
+ GCNEW(dev);
if (path && strcmp(path, "") &&
- libxl__parse_backend_path(gc, path, &dev) == 0) {
- dev.domid = domid;
- dev.kind = LIBXL__DEVICE_KIND_CONSOLE;
- dev.devid = 0;
+ libxl__parse_backend_path(gc, path, dev) == 0) {
+ dev->domid = domid;
+ dev->kind = LIBXL__DEVICE_KIND_CONSOLE;
+ dev->devid = 0;
- libxl__device_destroy(gc, &dev);
+ /* Currently console devices can be destroyed synchronously by just
+ * removing xenstore entries, this is what libxl__device_destroy does.
+ */
+ libxl__device_destroy(gc, dev);
}
out:
- return 0;
+ if (!numdev) drs->callback(egc, drs, rc);
+ return;
}
/* Callbacks for device related operations */
@@ -645,6 +748,16 @@ out:
return;
}
+static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs,
+ int rc)
+{
+ libxl__devices_remove_state *drs = CONTAINER_OF(aodevs, *drs, aodevs);
+ STATE_AO_GC(drs->ao);
+
+ drs->callback(egc, drs, rc);
+ return;
+}
+
int libxl__wait_for_device_model(libxl__gc *gc,
uint32_t domid, char *state,
libxl__spawn_starting *spawning,
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index dadad76..6a041f9 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -694,6 +694,10 @@ static void spawn_stubdom_pvqemu_cb(libxl__egc *egc,
libxl__dm_spawn_state *stubdom_dmss,
int rc);
+static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc,
+ libxl__destroy_domid_state *dis,
+ int rc);
+
void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss)
{
STATE_AO_GC(sdss->dm.spawn.ao);
@@ -914,12 +918,31 @@ static void spawn_stubdom_pvqemu_cb(libxl__egc *egc,
out:
if (rc) {
- if (dm_domid)
- libxl_domain_destroy(CTX, dm_domid);
+ if (dm_domid) {
+ sdss->dis.ao = ao;
+ sdss->dis.domid = dm_domid;
+ sdss->dis.callback = spaw_stubdom_pvqemu_destroy_cb;
+ libxl__destroy_domid(egc, &sdss->dis);
+ return;
+ }
}
sdss->callback(egc, &sdss->dm, rc);
}
+static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc,
+ libxl__destroy_domid_state *dis,
+ int rc)
+{
+ libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(dis, *sdss, dis);
+ STATE_AO_GC(sdss->dis.ao);
+
+ if (rc)
+ LOG(ERROR, "destruction of domain %u after failed creation
failed",
+ sdss->pvqemu.guest_domid);
+
+ sdss->callback(egc, &sdss->dm, rc);
+}
+
/* callbacks passed to libxl__spawn_spawn */
static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn,
const char *xsdata);
@@ -1115,55 +1138,27 @@ static void device_model_spawn_outcome(libxl__egc *egc,
int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid)
{
- libxl_ctx *ctx = libxl__gc_owner(gc);
char *pid;
int ret;
pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc,
"/local/domain/%d/image/device-model-pid", domid));
- if (!pid) {
- int stubdomid = libxl_get_stubdom_id(ctx, domid);
- const char *savefile;
-
- if (!stubdomid) {
- LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn''t
find device model''s pid");
- ret = ERROR_INVAL;
- goto out;
- }
- LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Device model is a stubdom,
domid=%d", stubdomid);
- ret = libxl_domain_destroy(ctx, stubdomid);
- if (ret)
- goto out;
-
- savefile = libxl__device_model_savefile(gc, domid);
- ret = unlink(savefile);
- /*
- * On suspend libxl__domain_save_device_model will have already
- * unlinked the save file.
- */
- if (ret && errno == ENOENT) ret = 0;
- if (ret) {
- LIBXL__LOG_ERRNO(ctx, XTL_ERROR,
- "failed to remove device-model savefile
%s\n",
- savefile);
- goto out;
- }
+ if (!pid || !atoi(pid)) {
+ LOG(ERROR, "could not find device-model''s pid for dom
%u", domid);
+ ret = ERROR_FAIL;
+ goto out;
+ }
+ ret = kill(atoi(pid), SIGHUP);
+ if (ret < 0 && errno == ESRCH) {
+ LOG(ERROR, "Device Model already exited");
+ ret = 0;
+ } else if (ret == 0) {
+ LOG(DEBUG, "Device Model signaled");
+ ret = 0;
} else {
- ret = kill(atoi(pid), SIGHUP);
- if (ret < 0 && errno == ESRCH) {
- LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Device Model already
exited");
- ret = 0;
- } else if (ret == 0) {
- LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Device Model
signaled");
- ret = 0;
- } else {
- LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to kill Device
Model [%d]",
- atoi(pid));
- ret = ERROR_FAIL;
- goto out;
- }
+ LOGE(ERROR, "failed to kill Device Model [%d]", atoi(pid));
+ ret = ERROR_FAIL;
+ goto out;
}
- xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc,
"/local/domain/0/device-model/%d", domid));
- xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc,
"/local/domain/%d/hvmloader", domid));
out:
return ret;
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 101e7fb..562ca61 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -875,7 +875,6 @@ _hidden char *libxl__device_frontend_path(libxl__gc *gc,
libxl__device *device);
_hidden int libxl__parse_backend_path(libxl__gc *gc, const char *path,
libxl__device *dev);
_hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev);
-_hidden int libxl__devices_destroy(libxl__gc *gc, uint32_t domid);
_hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state);
/*
@@ -1978,6 +1977,7 @@ typedef enum {
} libxl__device_action;
typedef struct libxl__ao_device libxl__ao_device;
+typedef struct libxl__ao_devices libxl__ao_devices;
typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*);
/* This functions sets the necessary libxl__ao_device struct values to use
@@ -1996,6 +1996,20 @@ typedef void libxl__device_callback(libxl__egc*,
libxl__ao_device*);
*/
_hidden void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev);
+/* Prepare a bunch of devices for addition/removal. Every ao_device in
+ * ao_devices is set to ''active'', and the ao_device
''base'' field is set to
+ * the one pointed by aodevs.
+ */
+_hidden void libxl__prepare_ao_devices(libxl__ao *ao,
+ libxl__ao_devices *aodevs);
+
+/* Generic callback to use when adding/removing several devices, this will
+ * check if the given aodev is the last one, and call the callback in the
+ * parent libxl__ao_devices struct, passing the appropriate error if found.
+ */
+_hidden void libxl__ao_devices_callback(libxl__egc *egc,
+ libxl__ao_device *aodev);
+
struct libxl__ao_device {
/* filled in by user */
libxl__ao *ao;
@@ -2004,10 +2018,27 @@ struct libxl__ao_device {
int force;
libxl__device_callback *callback;
/* private for implementation */
+ int active;
int rc;
libxl__ev_devstate backend_ds;
/* Bodge for Qemu devices */
libxl__ev_time timeout;
+ /* Used internally to have a reference to the upper libxl__ao_devices
+ * struct when present */
+ libxl__ao_devices *aodevs;
+};
+
+/* Helper struct to simply the plug/unplug of multiple devices at the same
+ * time.
+ *
+ * This structure holds several devices, and the callback is only called
+ * when all the devices inside of the array have finished.
+ */
+typedef void libxl__devices_callback(libxl__egc*, libxl__ao_devices*, int rc);
+struct libxl__ao_devices {
+ libxl__ao_device *array;
+ int size;
+ libxl__devices_callback *callback;
};
/*
@@ -2098,6 +2129,86 @@ struct libxl__ao_device {
_hidden void libxl__initiate_device_remove(libxl__egc *egc,
libxl__ao_device *aodev);
+/*----- Domain destruction -----*/
+
+/* Domain destruction has been split into two functions:
+ *
+ * libxl__domain_destroy is the main destroy function, which detects
+ * stubdoms and calls libxl__destroy_domid on the domain and its
+ * stubdom if present, creating a different libxl__destroy_domid_state
+ * for each one of them.
+ *
+ * libxl__destroy_domid actually destroys the domain, but it
+ * doesn''t check for stubdomains, since that would involve
+ * recursion, which we want to avoid.
+ */
+
+typedef struct libxl__domain_destroy_state libxl__domain_destroy_state;
+typedef struct libxl__destroy_domid_state libxl__destroy_domid_state;
+typedef struct libxl__devices_remove_state libxl__devices_remove_state;
+
+typedef void libxl__domain_destroy_cb(libxl__egc *egc,
+ libxl__domain_destroy_state *dds,
+ int rc);
+
+typedef void libxl__domid_destroy_cb(libxl__egc *egc,
+ libxl__destroy_domid_state *dis,
+ int rc);
+
+typedef void libxl__devices_remove_callback(libxl__egc *egc,
+ libxl__devices_remove_state *drs,
+ int rc);
+
+struct libxl__devices_remove_state {
+ /* filled in by user */
+ libxl__ao *ao;
+ uint32_t domid;
+ libxl__devices_remove_callback *callback;
+ int force; /* libxl_device_TYPE_destroy rather than _remove */
+ /* private */
+ libxl__ao_devices aodevs;
+ int num_devices;
+};
+
+struct libxl__destroy_domid_state {
+ /* filled in by user */
+ libxl__ao *ao;
+ uint32_t domid;
+ libxl__domid_destroy_cb *callback;
+ /* private to implementation */
+ libxl__devices_remove_state drs;
+};
+
+struct libxl__domain_destroy_state {
+ /* filled by the user */
+ libxl__ao *ao;
+ uint32_t domid;
+ libxl__domain_destroy_cb *callback;
+ /* Private */
+ int rc;
+ uint32_t stubdomid;
+ libxl__destroy_domid_state stubdom;
+ int stubdom_finished;
+ libxl__destroy_domid_state domain;
+ int domain_finished;
+};
+
+/*
+ * Entry point for domain destruction
+ * This function checks for stubdom presence and then calls
+ * libxl__destroy_domid on the passed domain and its stubdom if found.
+ */
+_hidden void libxl__domain_destroy(libxl__egc *egc,
+ libxl__domain_destroy_state *dds);
+
+/* Used to destroy a domain with the passed id (it doesn''t check for
stubs) */
+_hidden void libxl__destroy_domid(libxl__egc *egc,
+ libxl__destroy_domid_state *dis);
+
+/* Entry point for devices destruction */
+_hidden void libxl__devices_destroy(libxl__egc *egc,
+ libxl__devices_remove_state *drs);
+
/*----- device model creation -----*/
/* First layer; wraps libxl__spawn_spawn. */
@@ -2131,6 +2242,7 @@ typedef struct {
libxl_domain_config dm_config;
libxl__domain_build_state dm_state;
libxl__dm_spawn_state pvqemu;
+ libxl__destroy_domid_state dis;
} libxl__stub_dm_spawn_state;
_hidden void libxl__spawn_stub_dm(libxl__egc *egc,
libxl__stub_dm_spawn_state*);
@@ -2158,6 +2270,8 @@ struct libxl__domain_create_state {
/* If we''re not doing stubdom, we use only dmss.dm,
* for the non-stubdom device model. */
libxl__save_helper_state shs;
+ /* necessary if the domain creation failed and we have to destroy it */
+ libxl__domain_destroy_state dds;
};
/*----- Domain suspend (save) functions -----*/
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 29523e1..61791e1 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -1401,7 +1401,7 @@ static int handle_domain_death(uint32_t *r_domid,
case LIBXL_ACTION_ON_SHUTDOWN_DESTROY:
LOG("Domain %d needs to be cleaned up: destroying the
domain",
*r_domid);
- libxl_domain_destroy(ctx, *r_domid);
+ libxl_domain_destroy(ctx, *r_domid, 0);
*r_domid = INVALID_DOMID;
break;
@@ -2016,7 +2016,7 @@ start:
error_out:
release_lock();
if (libxl_domid_valid_guest(domid)) {
- libxl_domain_destroy(ctx, domid);
+ libxl_domain_destroy(ctx, domid, 0);
domid = INVALID_DOMID;
}
@@ -2581,7 +2581,7 @@ static void destroy_domain(const char *p)
fprintf(stderr, "Cannot destroy privileged domain 0.\n\n");
exit(-1);
}
- rc = libxl_domain_destroy(ctx, domid);
+ rc = libxl_domain_destroy(ctx, domid, 0);
if (rc) { fprintf(stderr,"destroy failed (rc=%d)\n",rc);
exit(-1); }
}
@@ -2855,7 +2855,7 @@ static int save_domain(const char *p, const char
*filename, int checkpoint,
if (checkpoint)
libxl_domain_resume(ctx, domid, 1);
else
- libxl_domain_destroy(ctx, domid);
+ libxl_domain_destroy(ctx, domid, 0);
exit(0);
}
@@ -3112,7 +3112,7 @@ static void migrate_domain(const char *domain_spec, const
char *rune,
}
fprintf(stderr, "migration sender: Target reports successful
startup.\n");
- libxl_domain_destroy(ctx, domid); /* bang! */
+ libxl_domain_destroy(ctx, domid, 0); /* bang! */
fprintf(stderr, "Migration successful.\n");
exit(0);
@@ -3265,7 +3265,7 @@ static void migrate_receive(int debug, int daemonize, int
monitor,
if (rc) {
fprintf(stderr, "migration target: Failure, destroying our
copy.\n");
- rc2 = libxl_domain_destroy(ctx, domid);
+ rc2 = libxl_domain_destroy(ctx, domid, 0);
if (rc2) {
fprintf(stderr, "migration target: Failed to destroy our
copy"
" (code %d).\n", rc2);
diff --git a/tools/python/xen/lowlevel/xl/xl.c
b/tools/python/xen/lowlevel/xl/xl.c
index b68b55a..553fc58 100644
--- a/tools/python/xen/lowlevel/xl/xl.c
+++ b/tools/python/xen/lowlevel/xl/xl.c
@@ -437,7 +437,7 @@ static PyObject *pyxl_domain_destroy(XlObject *self,
PyObject *args)
int domid;
if ( !PyArg_ParseTuple(args, "i", &domid) )
return NULL;
- if ( libxl_domain_destroy(self->ctx, domid) ) {
+ if ( libxl_domain_destroy(self->ctx, domid, 0) ) {
PyErr_SetString(xl_error_obj, "cannot destroy domain");
return NULL;
}
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 05/19] libxl: move bootloader data strucutres and prototypes
Move bootloader and related data after all the device stuff, since
libxl__bootloader_state will depend on libxl__ao_device (to perform
the local attach of a device).
This is pure code motion.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl_internal.h | 322 +++++++++++++++++++++---------------------
1 files changed, 161 insertions(+), 161 deletions(-)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 562ca61..52d79a9 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1747,6 +1747,167 @@ _hidden const char *libxl__xen_script_dir_path(void);
_hidden const char *libxl__lock_dir_path(void);
_hidden const char *libxl__run_dir_path(void);
+/*----- device addition/removal -----*/
+
+/* Action to perform (either connect or disconnect) */
+typedef enum {
+ DEVICE_CONNECT,
+ DEVICE_DISCONNECT
+} libxl__device_action;
+
+typedef struct libxl__ao_device libxl__ao_device;
+typedef struct libxl__ao_devices libxl__ao_devices;
+typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*);
+
+/* This functions sets the necessary libxl__ao_device struct values to use
+ * safely inside functions. It marks the operation as "active"
+ * since we need to be sure that all device status structs are set
+ * to active before start queueing events, or we might call
+ * ao_complete before all devices had finished
+ *
+ * libxl__initiate_device_{remove/addition} should not be called without
+ * calling libxl__prepare_ao_device first, since it initializes the private
+ * fields of the struct libxl__ao_device to what this functions expect.
+ *
+ * Once _prepare has been called on a libxl__ao_device, it is safe to just
+ * discard this struct, there''s no need to call any destroy function.
+ * _prepare can also be called multiple times with the same libxl__ao_device.
+ */
+_hidden void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev);
+
+/* Prepare a bunch of devices for addition/removal. Every ao_device in
+ * ao_devices is set to ''active'', and the ao_device
''base'' field is set to
+ * the one pointed by aodevs.
+ */
+_hidden void libxl__prepare_ao_devices(libxl__ao *ao,
+ libxl__ao_devices *aodevs);
+
+/* Generic callback to use when adding/removing several devices, this will
+ * check if the given aodev is the last one, and call the callback in the
+ * parent libxl__ao_devices struct, passing the appropriate error if found.
+ */
+_hidden void libxl__ao_devices_callback(libxl__egc *egc,
+ libxl__ao_device *aodev);
+
+struct libxl__ao_device {
+ /* filled in by user */
+ libxl__ao *ao;
+ libxl__device_action action;
+ libxl__device *dev;
+ int force;
+ libxl__device_callback *callback;
+ /* private for implementation */
+ int active;
+ int rc;
+ libxl__ev_devstate backend_ds;
+ /* Bodge for Qemu devices */
+ libxl__ev_time timeout;
+ /* Used internally to have a reference to the upper libxl__ao_devices
+ * struct when present */
+ libxl__ao_devices *aodevs;
+};
+
+/* Helper struct to simply the plug/unplug of multiple devices at the same
+ * time.
+ *
+ * This structure holds several devices, and the callback is only called
+ * when all the devices inside of the array have finished.
+ */
+typedef void libxl__devices_callback(libxl__egc*, libxl__ao_devices*, int rc);
+struct libxl__ao_devices {
+ libxl__ao_device *array;
+ int size;
+ libxl__devices_callback *callback;
+};
+
+/*
+ * Algorithm for handling device removal (including domain
+ * destruction). This is somewhat subtle because we may already have
+ * killed the domain and caused the death of qemu.
+ *
+ * In current versions of qemu there is no mechanism for ensuring that
+ * the resources used by its devices (both emulated and any PV devices
+ * provided by qemu) are freed (eg, fds closed) before it shuts down,
+ * and no confirmation from a terminating qemu back to the toolstack.
+ *
+ * This will need to be fixed in Xen 4.3. In the meantime (Xen 4.2)
+ * we implement a bodge.
+ *
+ * WE WANT TO UNPLUG WE WANT TO SHUT DOWN OR DESTROY
+ * | |
+ * | LIBXL SENDS SIGHUP TO QEMU
+ * | .....................|........................
+ * | : XEN 4.3+ PLANNED | :
+ * | : QEMU TEARS DOWN ALL DEVICES :
+ * | : FREES RESOURCES (closing fds) :
+ * | : SETS PV BACKENDS TO STATE 5, :
+ * | : waits for PV frontends to shut down :
+ * | : SETS PV BACKENDS TO STATE 6 :
+ * | : | :
+ * | : QEMU NOTIFIES TOOLSTACK (via :
+ * | : xenstore) that it is exiting :
+ * | : QEMU EXITS (parent may be init) :
+ * | : | :
+ * | : TOOLSTACK WAITS FOR QEMU :
+ * | : notices qemu has finished :
+ * | :....................|.......................:
+ * | .--------------------''
+ * V V
+ * for each device
+ * we want to unplug/remove
+ * ..................|...........................................
+ * : V XEN 4.2 RACY BODGE :
+ * : device is provided by qemu :
+ * : | `-----------. :
+ * : something| V :
+ * : else, eg| domain (that is domain for which :
+ * : blkback| this PV device is the backend, :
+ * : | which might be the stub dm) :
+ * : | is still alive? :
+ * : | | | :
+ * : | |alive |dead :
+ * : |<-----------------'' |
:
+ * : | hopefully qemu is | :
+ * : | still running | :
+ * :............|................. | :
+ * ,----->| : we may be racing :
+ * | backend state? : with qemu''s death
:
+ * ^ | | : | :
+ * xenstore| |other |6 : WAIT 2.0s :
+ * conflict| | | : TIMEOUT :
+ * | WRITE B.E. | : | :
+ * | STATE:=5 | : hopefully qemu has :
+ * `---'' | | : gone by now and
:
+ * |ok | : freed its resources :
+ * | | : | :
+ * WAIT FOR | : SET B.E. :
+ * STATE==6 | : STATE:=6 :
+ * / | | :..........|...................:
+ * timeout/ ok| | |
+ * / | | |
+ * | RUN HOTPLUG <-''<----------------''
+ * | SCRIPT
+ * | |
+ * `---> NUKE
+ * BACKEND
+ * |
+ * DONE.
+ */
+
+/* Arranges that dev will be removed to the guest, and the
+ * hotplug scripts will be executed (if necessary). When
+ * this is done (or an error happens), the callback in
+ * aodev->callback will be called.
+ *
+ * The libxl__ao_device passed to this function should be
+ * prepared using libxl__prepare_ao_device prior to calling
+ * this function.
+ *
+ * Once finished, aodev->callback will be executed.
+ */
+_hidden void libxl__initiate_device_remove(libxl__egc *egc,
+ libxl__ao_device *aodev);
+
/*----- datacopier: copies data from one fd to another -----*/
typedef struct libxl__datacopier_state libxl__datacopier_state;
@@ -1968,167 +2129,6 @@ _hidden void
libxl__bootloader_init(libxl__bootloader_state *bl);
* If callback is passed rc==0, will have updated st->info appropriately */
_hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st);
-/*----- device addition/removal -----*/
-
-/* Action to perform (either connect or disconnect) */
-typedef enum {
- DEVICE_CONNECT,
- DEVICE_DISCONNECT
-} libxl__device_action;
-
-typedef struct libxl__ao_device libxl__ao_device;
-typedef struct libxl__ao_devices libxl__ao_devices;
-typedef void libxl__device_callback(libxl__egc*, libxl__ao_device*);
-
-/* This functions sets the necessary libxl__ao_device struct values to use
- * safely inside functions. It marks the operation as "active"
- * since we need to be sure that all device status structs are set
- * to active before start queueing events, or we might call
- * ao_complete before all devices had finished
- *
- * libxl__initiate_device_{remove/addition} should not be called without
- * calling libxl__prepare_ao_device first, since it initializes the private
- * fields of the struct libxl__ao_device to what this functions expect.
- *
- * Once _prepare has been called on a libxl__ao_device, it is safe to just
- * discard this struct, there''s no need to call any destroy function.
- * _prepare can also be called multiple times with the same libxl__ao_device.
- */
-_hidden void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev);
-
-/* Prepare a bunch of devices for addition/removal. Every ao_device in
- * ao_devices is set to ''active'', and the ao_device
''base'' field is set to
- * the one pointed by aodevs.
- */
-_hidden void libxl__prepare_ao_devices(libxl__ao *ao,
- libxl__ao_devices *aodevs);
-
-/* Generic callback to use when adding/removing several devices, this will
- * check if the given aodev is the last one, and call the callback in the
- * parent libxl__ao_devices struct, passing the appropriate error if found.
- */
-_hidden void libxl__ao_devices_callback(libxl__egc *egc,
- libxl__ao_device *aodev);
-
-struct libxl__ao_device {
- /* filled in by user */
- libxl__ao *ao;
- libxl__device_action action;
- libxl__device *dev;
- int force;
- libxl__device_callback *callback;
- /* private for implementation */
- int active;
- int rc;
- libxl__ev_devstate backend_ds;
- /* Bodge for Qemu devices */
- libxl__ev_time timeout;
- /* Used internally to have a reference to the upper libxl__ao_devices
- * struct when present */
- libxl__ao_devices *aodevs;
-};
-
-/* Helper struct to simply the plug/unplug of multiple devices at the same
- * time.
- *
- * This structure holds several devices, and the callback is only called
- * when all the devices inside of the array have finished.
- */
-typedef void libxl__devices_callback(libxl__egc*, libxl__ao_devices*, int rc);
-struct libxl__ao_devices {
- libxl__ao_device *array;
- int size;
- libxl__devices_callback *callback;
-};
-
-/*
- * Algorithm for handling device removal (including domain
- * destruction). This is somewhat subtle because we may already have
- * killed the domain and caused the death of qemu.
- *
- * In current versions of qemu there is no mechanism for ensuring that
- * the resources used by its devices (both emulated and any PV devices
- * provided by qemu) are freed (eg, fds closed) before it shuts down,
- * and no confirmation from a terminating qemu back to the toolstack.
- *
- * This will need to be fixed in Xen 4.3. In the meantime (Xen 4.2)
- * we implement a bodge.
- *
- * WE WANT TO UNPLUG WE WANT TO SHUT DOWN OR DESTROY
- * | |
- * | LIBXL SENDS SIGHUP TO QEMU
- * | .....................|........................
- * | : XEN 4.3+ PLANNED | :
- * | : QEMU TEARS DOWN ALL DEVICES :
- * | : FREES RESOURCES (closing fds) :
- * | : SETS PV BACKENDS TO STATE 5, :
- * | : waits for PV frontends to shut down :
- * | : SETS PV BACKENDS TO STATE 6 :
- * | : | :
- * | : QEMU NOTIFIES TOOLSTACK (via :
- * | : xenstore) that it is exiting :
- * | : QEMU EXITS (parent may be init) :
- * | : | :
- * | : TOOLSTACK WAITS FOR QEMU :
- * | : notices qemu has finished :
- * | :....................|.......................:
- * | .--------------------''
- * V V
- * for each device
- * we want to unplug/remove
- * ..................|...........................................
- * : V XEN 4.2 RACY BODGE :
- * : device is provided by qemu :
- * : | `-----------. :
- * : something| V :
- * : else, eg| domain (that is domain for which :
- * : blkback| this PV device is the backend, :
- * : | which might be the stub dm) :
- * : | is still alive? :
- * : | | | :
- * : | |alive |dead :
- * : |<-----------------'' |
:
- * : | hopefully qemu is | :
- * : | still running | :
- * :............|................. | :
- * ,----->| : we may be racing :
- * | backend state? : with qemu''s death
:
- * ^ | | : | :
- * xenstore| |other |6 : WAIT 2.0s :
- * conflict| | | : TIMEOUT :
- * | WRITE B.E. | : | :
- * | STATE:=5 | : hopefully qemu has :
- * `---'' | | : gone by now and
:
- * |ok | : freed its resources :
- * | | : | :
- * WAIT FOR | : SET B.E. :
- * STATE==6 | : STATE:=6 :
- * / | | :..........|...................:
- * timeout/ ok| | |
- * / | | |
- * | RUN HOTPLUG <-''<----------------''
- * | SCRIPT
- * | |
- * `---> NUKE
- * BACKEND
- * |
- * DONE.
- */
-
-/* Arranges that dev will be removed to the guest, and the
- * hotplug scripts will be executed (if necessary). When
- * this is done (or an error happens), the callback in
- * aodev->callback will be called.
- *
- * The libxl__ao_device passed to this function should be
- * prepared using libxl__prepare_ao_device prior to calling
- * this function.
- *
- * Once finished, aodev->callback will be executed.
- */
-_hidden void libxl__initiate_device_remove(libxl__egc *egc,
- libxl__ao_device *aodev);
-
/*----- Domain destruction -----*/
/* Domain destruction has been split into two functions:
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 06/19] libxl: refactor disk addition to take a helper
Change libxl__device_disk_add to no longer take a xs transaction and
instead pass a helper for the local attach case that''s used to get the
free vdev.
This function contains some non-functional changes due to an
indentation change.
Changes since v9:
* Added better comment for device_disk_add parameters.
* Changed char *fn to void *get_vdev_user
* Removed error log message.
Changes since v7:
* Fixed the use of the transaction inside device_disk_add (which in
v7 was fixed in the next patch).
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 266 +++++++++++++++++++++++-------------------
tools/libxl/libxl_internal.h | 2 +-
2 files changed, 145 insertions(+), 123 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 0600ce4..8df457e 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -1738,115 +1738,152 @@ int libxl__device_from_disk(libxl__gc *gc, uint32_t
domid,
return 0;
}
-int libxl__device_disk_add(libxl__gc *gc, uint32_t domid,
- xs_transaction_t t, libxl_device_disk *disk)
-{
- flexarray_t *front;
- flexarray_t *back;
+/* Specific function called directly only by local disk attach,
+ * all other users should instead use the regular
+ * libxl__device_disk_add wrapper
+ *
+ * The (optionally) passed function get_vdev_user will be used to
+ * set the vdev the disk should be attached to. When it is set the caller
+ * must also pass blkdev_start, which will be passed to get_vdev_user.
+ *
+ * The passed get_vdev_user function is also in charge of printing
+ * the corresponding error message when appropiate.
+ */
+static int device_disk_add(libxl__gc *gc, uint32_t domid,
+ libxl_device_disk *disk,
+ void *get_vdev_user(libxl__gc *, const char *,
+ xs_transaction_t),
+ const char *blkdev_start)
+{
+ flexarray_t *front = NULL;
+ flexarray_t *back = NULL;
char *dev;
libxl__device device;
int major, minor, rc;
libxl_ctx *ctx = gc->owner;
+ xs_transaction_t t = XBT_NULL;
- rc = libxl__device_disk_setdefault(gc, disk);
- if (rc) goto out;
+ for (;;) {
+ rc = libxl__xs_transaction_start(gc, &t);
+ if (rc) goto out;
- front = flexarray_make(16, 1);
- if (!front) {
- rc = ERROR_NOMEM;
- goto out;
- }
- back = flexarray_make(16, 1);
- if (!back) {
- rc = ERROR_NOMEM;
- goto out_free;
- }
+ if (get_vdev_user) {
+ assert(blkdev_start);
+ disk->vdev = (char *) get_vdev_user(gc, blkdev_start, t);
+ if (disk->vdev == NULL) {
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ }
- if (disk->script) {
- LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "External block scripts"
- " not yet supported, sorry");
- rc = ERROR_INVAL;
- goto out_free;
- }
+ rc = libxl__device_disk_setdefault(gc, disk);
+ if (rc) goto out;
- rc = libxl__device_from_disk(gc, domid, disk, &device);
- if (rc != 0) {
- LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or unsupported"
- " virtual disk identifier %s", disk->vdev);
- goto out_free;
- }
+ if (front)
+ flexarray_free(front);
+ front = flexarray_make(16, 1);
+ if (!front) {
+ rc = ERROR_NOMEM;
+ goto out;
+ }
+ if (back)
+ flexarray_free(back);
+ back = flexarray_make(16, 1);
+ if (!back) {
+ rc = ERROR_NOMEM;
+ goto out_free;
+ }
- switch (disk->backend) {
- case LIBXL_DISK_BACKEND_PHY:
- dev = disk->pdev_path;
- do_backend_phy:
- libxl__device_physdisk_major_minor(dev, &major, &minor);
- flexarray_append(back, "physical-device");
- flexarray_append(back, libxl__sprintf(gc, "%x:%x", major,
minor));
+ if (disk->script) {
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "External block
scripts"
+ " not yet supported, sorry");
+ rc = ERROR_INVAL;
+ goto out_free;
+ }
- flexarray_append(back, "params");
- flexarray_append(back, dev);
+ rc = libxl__device_from_disk(gc, domid, disk, &device);
+ if (rc != 0) {
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or
unsupported"
+ " virtual disk identifier %s", disk->vdev);
+ goto out_free;
+ }
- assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD);
- break;
- case LIBXL_DISK_BACKEND_TAP:
- dev = libxl__blktap_devpath(gc, disk->pdev_path,
disk->format);
- if (!dev) {
- LOG(ERROR, "failed to get blktap devpath for %p\n",
- disk->pdev_path);
- rc = ERROR_FAIL;
- goto out_free;
- }
- flexarray_append(back, "tapdisk-params");
- flexarray_append(back, libxl__sprintf(gc, "%s:%s",
- libxl__device_disk_string_of_format(disk->format),
- disk->pdev_path));
+ switch (disk->backend) {
+ case LIBXL_DISK_BACKEND_PHY:
+ dev = disk->pdev_path;
+ do_backend_phy:
+ libxl__device_physdisk_major_minor(dev, &major,
&minor);
+ flexarray_append(back, "physical-device");
+ flexarray_append(back, libxl__sprintf(gc, "%x:%x",
major, minor));
- /* now create a phy device to export the device to the guest */
- goto do_backend_phy;
- case LIBXL_DISK_BACKEND_QDISK:
- flexarray_append(back, "params");
- flexarray_append(back, libxl__sprintf(gc, "%s:%s",
- libxl__device_disk_string_of_format(disk->format),
disk->pdev_path));
- assert(device.backend_kind == LIBXL__DEVICE_KIND_QDISK);
- break;
- default:
- LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend
type: %d\n", disk->backend);
- rc = ERROR_INVAL;
- goto out_free;
- }
+ flexarray_append(back, "params");
+ flexarray_append(back, dev);
- flexarray_append(back, "frontend-id");
- flexarray_append(back, libxl__sprintf(gc, "%d", domid));
- flexarray_append(back, "online");
- flexarray_append(back, "1");
- flexarray_append(back, "removable");
- flexarray_append(back, libxl__sprintf(gc, "%d",
(disk->removable) ? 1 : 0));
- flexarray_append(back, "bootable");
- flexarray_append(back, libxl__sprintf(gc, "%d", 1));
- flexarray_append(back, "state");
- flexarray_append(back, libxl__sprintf(gc, "%d", 1));
- flexarray_append(back, "dev");
- flexarray_append(back, disk->vdev);
- flexarray_append(back, "type");
- flexarray_append(back,
libxl__device_disk_string_of_backend(disk->backend));
- flexarray_append(back, "mode");
- flexarray_append(back, disk->readwrite ? "w" : "r");
- flexarray_append(back, "device-type");
- flexarray_append(back, disk->is_cdrom ? "cdrom" :
"disk");
+ assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD);
+ break;
+ case LIBXL_DISK_BACKEND_TAP:
+ dev = libxl__blktap_devpath(gc, disk->pdev_path,
disk->format);
+ if (!dev) {
+ LOG(ERROR, "failed to get blktap devpath for
%p\n",
+ disk->pdev_path);
+ rc = ERROR_FAIL;
+ goto out_free;
+ }
+ flexarray_append(back, "tapdisk-params");
+ flexarray_append(back, libxl__sprintf(gc, "%s:%s",
+ libxl__device_disk_string_of_format(disk->format),
+ disk->pdev_path));
+
+ /* now create a phy device to export the device to the guest */
+ goto do_backend_phy;
+ case LIBXL_DISK_BACKEND_QDISK:
+ flexarray_append(back, "params");
+ flexarray_append(back, libxl__sprintf(gc, "%s:%s",
+
libxl__device_disk_string_of_format(disk->format), disk->pdev_path));
+ assert(device.backend_kind == LIBXL__DEVICE_KIND_QDISK);
+ break;
+ default:
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk
backend type: %d\n", disk->backend);
+ rc = ERROR_INVAL;
+ goto out_free;
+ }
- flexarray_append(front, "backend-id");
- flexarray_append(front, libxl__sprintf(gc, "%d",
disk->backend_domid));
- flexarray_append(front, "state");
- flexarray_append(front, libxl__sprintf(gc, "%d", 1));
- flexarray_append(front, "virtual-device");
- flexarray_append(front, libxl__sprintf(gc, "%d", device.devid));
- flexarray_append(front, "device-type");
- flexarray_append(front, disk->is_cdrom ? "cdrom" :
"disk");
+ flexarray_append(back, "frontend-id");
+ flexarray_append(back, libxl__sprintf(gc, "%d", domid));
+ flexarray_append(back, "online");
+ flexarray_append(back, "1");
+ flexarray_append(back, "removable");
+ flexarray_append(back, libxl__sprintf(gc, "%d",
(disk->removable) ? 1 : 0));
+ flexarray_append(back, "bootable");
+ flexarray_append(back, libxl__sprintf(gc, "%d", 1));
+ flexarray_append(back, "state");
+ flexarray_append(back, libxl__sprintf(gc, "%d", 1));
+ flexarray_append(back, "dev");
+ flexarray_append(back, disk->vdev);
+ flexarray_append(back, "type");
+ flexarray_append(back,
libxl__device_disk_string_of_backend(disk->backend));
+ flexarray_append(back, "mode");
+ flexarray_append(back, disk->readwrite ? "w" :
"r");
+ flexarray_append(back, "device-type");
+ flexarray_append(back, disk->is_cdrom ? "cdrom" :
"disk");
+
+ flexarray_append(front, "backend-id");
+ flexarray_append(front, libxl__sprintf(gc, "%d",
disk->backend_domid));
+ flexarray_append(front, "state");
+ flexarray_append(front, libxl__sprintf(gc, "%d", 1));
+ flexarray_append(front, "virtual-device");
+ flexarray_append(front, libxl__sprintf(gc, "%d",
device.devid));
+ flexarray_append(front, "device-type");
+ flexarray_append(front, disk->is_cdrom ? "cdrom" :
"disk");
- libxl__device_generic_add(gc, t, &device,
- libxl__xs_kvs_of_flexarray(gc, back,
back->count),
- libxl__xs_kvs_of_flexarray(gc, front,
front->count));
+ libxl__device_generic_add(gc, t, &device,
+ libxl__xs_kvs_of_flexarray(gc, back,
back->count),
+ libxl__xs_kvs_of_flexarray(gc, front,
front->count));
+
+ rc = libxl__xs_transaction_commit(gc, &t);
+ if (!rc) break;
+ if (rc < 0) goto out_free;
+ }
rc = 0;
@@ -1854,13 +1891,20 @@ out_free:
flexarray_free(back);
flexarray_free(front);
out:
+ libxl__xs_transaction_abort(gc, &t);
return rc;
}
+int libxl__device_disk_add(libxl__gc *gc, uint32_t domid,
+ libxl_device_disk *disk)
+{
+ return device_disk_add(gc, domid, disk, NULL, NULL);
+}
+
int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk
*disk)
{
GC_INIT(ctx);
- int rc = libxl__device_disk_add(gc, domid, XBT_NULL, disk);
+ int rc = libxl__device_disk_add(gc, domid, disk);
GC_FREE;
return rc;
}
@@ -2118,9 +2162,8 @@ char * libxl__device_disk_local_attach(libxl__gc *gc,
libxl_ctx *ctx = gc->owner;
char *dev = NULL, *be_path = NULL;
char *ret = NULL;
- int rc, xs_ret;
+ int rc;
libxl__device device;
- xs_transaction_t t = XBT_NULL;
if (in_disk->pdev_path == NULL)
return NULL;
@@ -2164,27 +2207,9 @@ char * libxl__device_disk_local_attach(libxl__gc *gc,
break;
case LIBXL_DISK_BACKEND_QDISK:
if (disk->format != LIBXL_DISK_FORMAT_RAW) {
- do {
- t = xs_transaction_start(ctx->xsh);
- if (t == XBT_NULL) {
- LOG(ERROR, "failed to start a xenstore
transaction");
- goto out;
- }
- disk->vdev = libxl__alloc_vdev(gc, blkdev_start, t);
- if (disk->vdev == NULL) {
- LOG(ERROR, "libxl__alloc_vdev failed");
- goto out;
- }
- if (libxl__device_disk_add(gc, LIBXL_TOOLSTACK_DOMID,
- t, disk)) {
- LOG(ERROR, "libxl_device_disk_add failed");
- goto out;
- }
- xs_ret = xs_transaction_end(ctx->xsh, t, 0);
- } while (xs_ret == 0 && errno == EAGAIN);
- t = XBT_NULL;
- if (xs_ret == 0) {
- LOGE(ERROR, "xenstore transaction failed");
+ if (device_disk_add(gc, LIBXL_TOOLSTACK_DOMID, disk,
+ (void *) libxl__alloc_vdev, blkdev_start))
{
+ LOG(ERROR, "libxl_device_disk_add failed");
goto out;
}
dev = GCSPRINTF("/dev/%s", disk->vdev);
@@ -2213,10 +2238,7 @@ char * libxl__device_disk_local_attach(libxl__gc *gc,
return ret;
out:
- if (t != XBT_NULL)
- xs_transaction_end(ctx->xsh, t, 1);
- else
- libxl__device_disk_local_detach(gc, disk);
+ libxl__device_disk_local_detach(gc, disk);
return NULL;
}
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 52d79a9..4f3a232 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1298,7 +1298,7 @@ _hidden int libxl__device_from_disk(libxl__gc *gc,
uint32_t domid,
libxl_device_disk *disk,
libxl__device *device);
_hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid,
- xs_transaction_t t, libxl_device_disk *disk);
+ libxl_device_disk *disk);
/*
* Make a disk available in this (the control) domain. Returns path to
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 07/19] libxl: convert libxl__device_disk_local_attach to an async op
This will be needed in future patches, when libxl__device_disk_add
becomes async also. Create a new status structure that defines the
local attach of a disk device and use it in
libxl__device_disk_local_attach.
This is done in this patch to split the changes introduced when
libxl__device_disk_add becomes async.
Changes since v9:
* Fixed state changes comments on header of functions.
* Rework libxl__device_disk_local_init to just set rc to 0, and
perform the initialization in the callers context.
* If attach fails, perform a detach, so the state of the local_device
on the callback is Attached if rc == 0, or Idle if rc != 0.
* Free diskpath inside the detach callback.
Changes since v6:
* Added better comments.
* Instead of passing the xs_transaction arround several functions,
put all the xs related operations inside device_disk_add.
* Make sure libxl__device_disk_local_initiate_detach either calls the
async device destroy function, or the callback.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 108 ++++++++++++++++++++++++++++++++--------
tools/libxl/libxl_bootloader.c | 73 ++++++++++++++++++++++-----
tools/libxl/libxl_internal.h | 72 +++++++++++++++++++++-----
3 files changed, 204 insertions(+), 49 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 8df457e..bd64e0c 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2154,19 +2154,19 @@ static char * libxl__alloc_vdev(libxl__gc *gc, const
char *blkdev_start,
return NULL;
}
-char * libxl__device_disk_local_attach(libxl__gc *gc,
- const libxl_device_disk *in_disk,
- libxl_device_disk *disk,
- const char *blkdev_start)
+void libxl__device_disk_local_initiate_attach(libxl__egc *egc,
+ libxl__disk_local_state *dls)
{
- libxl_ctx *ctx = gc->owner;
+ STATE_AO_GC(dls->ao);
+ libxl_ctx *ctx = CTX;
char *dev = NULL, *be_path = NULL;
- char *ret = NULL;
int rc;
libxl__device device;
+ const libxl_device_disk *in_disk = dls->in_disk;
+ libxl_device_disk *disk = &dls->disk;
+ const char *blkdev_start = dls->blkdev_start;
- if (in_disk->pdev_path == NULL)
- return NULL;
+ assert(in_disk->pdev_path);
memcpy(disk, in_disk, sizeof(libxl_device_disk));
disk->pdev_path = libxl__strdup(gc, in_disk->pdev_path);
@@ -2202,6 +2202,7 @@ char * libxl__device_disk_local_attach(libxl__gc *gc,
default:
LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
"unrecognized disk format: %d",
disk->format);
+ rc = ERROR_FAIL;
break;
}
break;
@@ -2210,6 +2211,7 @@ char * libxl__device_disk_local_attach(libxl__gc *gc,
if (device_disk_add(gc, LIBXL_TOOLSTACK_DOMID, disk,
(void *) libxl__alloc_vdev, blkdev_start))
{
LOG(ERROR, "libxl_device_disk_add failed");
+ rc = ERROR_FAIL;
goto out;
}
dev = GCSPRINTF("/dev/%s", disk->vdev);
@@ -2221,6 +2223,7 @@ char * libxl__device_disk_local_attach(libxl__gc *gc,
default:
LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend
"
"type: %d", disk->backend);
+ rc = ERROR_FAIL;
break;
}
@@ -2234,39 +2237,102 @@ char * libxl__device_disk_local_attach(libxl__gc *gc,
goto out;
}
if (dev != NULL)
- ret = strdup(dev);
- return ret;
+ dls->diskpath = strdup(dev);
+
+ dls->callback(egc, dls, 0);
+ return;
out:
- libxl__device_disk_local_detach(gc, disk);
- return NULL;
+ assert(rc);
+ dls->rc = rc;
+ libxl__device_disk_local_initiate_detach(egc, dls);
+ return;
}
-int libxl__device_disk_local_detach(libxl__gc *gc, libxl_device_disk *disk)
+/* Callbacks for local detach */
+
+static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device *aodev);
+
+void libxl__device_disk_local_initiate_detach(libxl__egc *egc,
+ libxl__disk_local_state *dls)
{
+ STATE_AO_GC(dls->ao);
int rc = 0;
+ libxl_device_disk *disk = &dls->disk;
+ libxl__device *device;
+ libxl__ao_device *aodev = &dls->aodev;
+
+ if (!dls->diskpath) goto out;
switch (disk->backend) {
case LIBXL_DISK_BACKEND_QDISK:
if (disk->vdev != NULL) {
- libxl_device_disk_remove(gc->owner, LIBXL_TOOLSTACK_DOMID,
- disk, 0);
- /* fixme-ao */
- rc = libxl_device_disk_destroy(gc->owner,
- LIBXL_TOOLSTACK_DOMID, disk, 0);
+ GCNEW(device);
+ rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID,
+ disk, device);
+ if (rc != 0) goto out;
+
+ libxl__prepare_ao_device(ao, aodev);
+ aodev->action = DEVICE_DISCONNECT;
+ aodev->dev = device;
+ aodev->callback = local_device_detach_cb;
+ aodev->force = 0;
+ libxl__initiate_device_remove(egc, aodev);
+ return;
}
- break;
+ /* disk->vdev == NULL; fall through */
default:
/*
* Nothing to do for PHYSTYPE_PHY.
* For other device types assume that the blktap2 process is
* needed by the soon to be started domain and do nothing.
*/
- break;
+ goto out;
}
+out:
+ if (dls->diskpath) {
+ free(dls->diskpath);
+ dls->diskpath = 0;
+ }
+ /*
+ * If there was an error in dls->rc, it means we have been called from
+ * a failed execution of libxl__device_disk_local_initiate_attach,
+ * so return the original error.
+ */
+ rc = dls->rc ? dls->rc : rc;
+ dls->callback(egc, dls, rc);
+ return;
+}
- return rc;
+static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device *aodev)
+{
+ STATE_AO_GC(aodev->ao);
+ libxl__disk_local_state *dls = CONTAINER_OF(aodev, *dls, aodev);
+ int rc;
+
+ if (dls->diskpath) {
+ free(dls->diskpath);
+ dls->diskpath = 0;
+ }
+
+ if (aodev->rc) {
+ LOGE(ERROR, "unable to %s %s with id %u",
+ aodev->action == DEVICE_CONNECT ? "add" :
"remove",
+ libxl__device_kind_to_string(aodev->dev->kind),
+ aodev->dev->devid);
+ goto out;
+ }
+
+out:
+ /*
+ * If there was an error in dls->rc, it means we have been called from
+ * a failed execution of libxl__device_disk_local_initiate_attach,
+ * so return the original error.
+ */
+ rc = dls->rc ? dls->rc : aodev->rc;
+ dls->callback(egc, dls, rc);
+ return;
}
/******************************************************************************/
diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c
index 7ebc0df..4bcca3d 100644
--- a/tools/libxl/libxl_bootloader.c
+++ b/tools/libxl/libxl_bootloader.c
@@ -75,7 +75,7 @@ static void make_bootloader_args(libxl__gc *gc,
libxl__bootloader_state *bl,
}
}
- ARG(bl->diskpath);
+ ARG(bl->dls.diskpath);
/* Sentinel for execv */
ARG(NULL);
@@ -206,8 +206,9 @@ static int parse_bootloader_result(libxl__egc *egc,
void libxl__bootloader_init(libxl__bootloader_state *bl)
{
assert(bl->ao);
- bl->diskpath = NULL;
+ bl->dls.diskpath = NULL;
bl->openpty.ao = bl->ao;
+ bl->dls.ao = bl->ao;
bl->ptys[0].master = bl->ptys[0].slave = 0;
bl->ptys[1].master = bl->ptys[1].slave = 0;
libxl__ev_child_init(&bl->child);
@@ -224,11 +225,6 @@ static void bootloader_cleanup(libxl__egc *egc,
libxl__bootloader_state *bl)
if (bl->outputpath) libxl__remove_file(gc, bl->outputpath);
if (bl->outputdir) libxl__remove_directory(gc, bl->outputdir);
- if (bl->diskpath) {
- libxl__device_disk_local_detach(gc, &bl->localdisk);
- free(bl->diskpath);
- bl->diskpath = 0;
- }
libxl__domaindeathcheck_stop(gc,&bl->deathcheck);
libxl__datacopier_kill(&bl->keystrokes);
libxl__datacopier_kill(&bl->display);
@@ -249,10 +245,32 @@ static void bootloader_setpaths(libxl__gc *gc,
libxl__bootloader_state *bl)
bl->outputpath = GCSPRINTF(XEN_RUN_DIR
"/bootloader.%"PRIu32".out", domid);
}
+/* Callbacks */
+
+static void bootloader_finished_cb(libxl__egc *egc,
+ libxl__disk_local_state *dls,
+ int rc);
+
static void bootloader_callback(libxl__egc *egc, libxl__bootloader_state *bl,
int rc)
{
bootloader_cleanup(egc, bl);
+
+ bl->dls.callback = bootloader_finished_cb;
+ libxl__device_disk_local_initiate_detach(egc, &bl->dls);
+}
+
+static void bootloader_finished_cb(libxl__egc *egc,
+ libxl__disk_local_state *dls,
+ int rc)
+{
+ STATE_AO_GC(dls->ao);
+ libxl__bootloader_state *bl = CONTAINER_OF(dls, *bl, dls);
+
+ if (rc) {
+ LOG(ERROR, "unable to detach locally attached disk");
+ }
+
bl->callback(egc, bl, rc);
}
@@ -275,6 +293,12 @@ static void bootloader_abort(libxl__egc *egc,
/*----- main flow of control -----*/
+/* Callbacks */
+
+static void bootloader_disk_attached_cb(libxl__egc *egc,
+ libxl__disk_local_state *dls,
+ int rc);
+
void libxl__bootloader_run(libxl__egc *egc, libxl__bootloader_state *bl)
{
STATE_AO_GC(bl->ao);
@@ -282,7 +306,6 @@ void libxl__bootloader_run(libxl__egc *egc,
libxl__bootloader_state *bl)
uint32_t domid = bl->domid;
char *logfile_tmp = NULL;
int rc, r;
- const char *bootloader;
libxl__bootloader_init(bl);
@@ -344,10 +367,34 @@ void libxl__bootloader_run(libxl__egc *egc,
libxl__bootloader_state *bl)
goto out;
}
- bl->diskpath = libxl__device_disk_local_attach(gc, bl->disk,
&bl->localdisk,
- info->blkdev_start);
- if (!bl->diskpath) {
- rc = ERROR_FAIL;
+
+ /* This sets the state of the dls struct from Undefined to Idle */
+ libxl__device_disk_local_init(&bl->dls);
+ bl->dls.ao = ao;
+ bl->dls.in_disk = bl->disk;
+ bl->dls.blkdev_start = info->blkdev_start;
+ bl->dls.callback = bootloader_disk_attached_cb;
+ libxl__device_disk_local_initiate_attach(egc, &bl->dls);
+ return;
+
+ out:
+ assert(rc);
+ out_ok:
+ free(logfile_tmp);
+ bootloader_callback(egc, bl, rc);
+}
+
+static void bootloader_disk_attached_cb(libxl__egc *egc,
+ libxl__disk_local_state *dls,
+ int rc)
+{
+ STATE_AO_GC(dls->ao);
+ libxl__bootloader_state *bl = CONTAINER_OF(dls, *bl, dls);
+ const libxl_domain_build_info *info = bl->info;
+ const char *bootloader;
+
+ if (rc) {
+ LOG(ERROR, "failed to attach local disk for bootloader
execution");
goto out;
}
@@ -389,8 +436,6 @@ void libxl__bootloader_run(libxl__egc *egc,
libxl__bootloader_state *bl)
out:
assert(rc);
- out_ok:
- free(logfile_tmp);
bootloader_callback(egc, bl, rc);
}
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 4f3a232..ab590be 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1300,17 +1300,6 @@ _hidden int libxl__device_from_disk(libxl__gc *gc,
uint32_t domid,
_hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid,
libxl_device_disk *disk);
-/*
- * Make a disk available in this (the control) domain. Returns path to
- * a device.
- */
-_hidden char * libxl__device_disk_local_attach(libxl__gc *gc,
- const libxl_device_disk *in_disk,
- libxl_device_disk *new_disk,
- const char *blkdev_start);
-_hidden int libxl__device_disk_local_detach(libxl__gc *gc,
- libxl_device_disk *disk);
-
_hidden char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid);
struct libxl__xen_console_reader {
@@ -1908,6 +1897,62 @@ struct libxl__ao_devices {
_hidden void libxl__initiate_device_remove(libxl__egc *egc,
libxl__ao_device *aodev);
+/*----- local disk attach: attach a disk locally to run the bootloader -----*/
+
+typedef struct libxl__disk_local_state libxl__disk_local_state;
+typedef void libxl__disk_local_state_callback(libxl__egc*,
+ libxl__disk_local_state*,
+ int rc);
+
+/* A libxl__disk_local_state may be in the following states:
+ * Undefined, Idle, Attaching, Attached, Detaching.
+ */
+struct libxl__disk_local_state {
+ /* filled by the user */
+ libxl__ao *ao;
+ const libxl_device_disk *in_disk;
+ libxl_device_disk disk;
+ const char *blkdev_start;
+ libxl__disk_local_state_callback *callback;
+ /* filled by libxl__device_disk_local_initiate_attach */
+ char *diskpath;
+ /* private for implementation of local detach */
+ libxl__ao_device aodev;
+ int rc;
+};
+
+/*
+ * Clears the internal error code, can be called multiple times, and
+ * must be called before libxl__device_disk_local_initiate_attach.
+ */
+static inline void libxl__device_disk_local_init(libxl__disk_local_state *dls)
+{
+ dls->rc = 0;
+}
+
+/* Make a disk available in this (the control) domain. Always calls
+ * dls->callback when finished.
+ * State Idle -> Attaching
+ *
+ * The state on which the device is when in the callback depends
+ * on the passed value of rc:
+ * Attached if rc == 0
+ * Idle if rc != 0
+ */
+_hidden void libxl__device_disk_local_initiate_attach(libxl__egc *egc,
+ libxl__disk_local_state *dls);
+
+/* Disconnects a disk device form the control domain. If the passed
+ * dls is not attached (or has already been detached),
+ * libxl__device_disk_local_initiate_detach will just call the callback
+ * directly.
+ * State Idle/Attached -> Detaching
+ *
+ * The state on which the device is when in the callback is Idle.
+ */
+_hidden void libxl__device_disk_local_initiate_detach(libxl__egc *egc,
+ libxl__disk_local_state *dls);
+
/*----- datacopier: copies data from one fd to another -----*/
typedef struct libxl__datacopier_state libxl__datacopier_state;
@@ -2097,10 +2142,10 @@ struct libxl__bootloader_state {
/* Should be zeroed by caller on entry. Will be filled in by
* bootloader machinery; represents the local attachment of the
* disk for the benefit of the bootloader. Must be detached by
- * the caller using libxl__device_disk_local_detach, but only
+ * the caller using libxl__device_disk_local_initiate_detach, but only
* after the domain''s kernel and initramfs have been loaded into
* memory and the file references disposed of. */
- libxl_device_disk localdisk;
+ libxl__disk_local_state dls;
uint32_t domid;
/* outputs:
* - caller must initialise kernel and ramdisk to point to file
@@ -2112,7 +2157,6 @@ struct libxl__bootloader_state {
const char *cmdline;
/* private to libxl__run_bootloader */
char *outputpath, *outputdir, *logfile;
- char *diskpath; /* not from gc, represents actually attached disk */
libxl__openpty_state openpty;
libxl__openpty_result ptys[2]; /* [0] is for bootloader */
libxl__ev_child child;
--
1.7.7.5 (Apple Git-26)
This change renames functions and struct values that used to contain
vifs in their names to nics, that provides a more clear name to
define network interfaces without referring to the backend that is
behind them.
This is not a functional change.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.h | 4 +-
tools/libxl/libxl_create.c | 10 ++++----
tools/libxl/libxl_dm.c | 54 ++++++++++++++++++++++----------------------
tools/libxl/libxl_json.c | 8 +++---
tools/libxl/xl_cmdimpl.c | 14 +++++-----
tools/libxl/xl_sxp.c | 20 ++++++++--------
6 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 5c819f1..c730ac5 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -470,10 +470,10 @@ typedef struct {
libxl_domain_create_info c_info;
libxl_domain_build_info b_info;
- int num_disks, num_vifs, num_pcidevs, num_vfbs, num_vkbs;
+ int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs;
libxl_device_disk *disks;
- libxl_device_nic *vifs;
+ libxl_device_nic *nics;
libxl_device_pci *pcidevs;
libxl_device_vfb *vfbs;
libxl_device_vkb *vkbs;
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 16d32c2..a4b8248 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -39,9 +39,9 @@ void libxl_domain_config_dispose(libxl_domain_config
*d_config)
libxl_device_disk_dispose(&d_config->disks[i]);
free(d_config->disks);
- for (i=0; i<d_config->num_vifs; i++)
- libxl_device_nic_dispose(&d_config->vifs[i]);
- free(d_config->vifs);
+ for (i=0; i<d_config->num_nics; i++)
+ libxl_device_nic_dispose(&d_config->nics[i]);
+ free(d_config->nics);
for (i=0; i<d_config->num_pcidevs; i++)
libxl_device_pci_dispose(&d_config->pcidevs[i]);
@@ -870,8 +870,8 @@ static void domcreate_rebuild_done(libxl__egc *egc,
goto error_out;
}
}
- for (i = 0; i < d_config->num_vifs; i++) {
- ret = libxl_device_nic_add(ctx, domid, &d_config->vifs[i]);
+ for (i = 0; i < d_config->num_nics; i++) {
+ ret = libxl_device_nic_add(ctx, domid, &d_config->nics[i]);
if (ret) {
LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
"cannot add nic %d to domain: %d", i, ret);
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 6a041f9..4baf3f7 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -102,10 +102,10 @@ static char **
libxl__build_device_model_args_old(libxl__gc *gc,
{
const libxl_domain_create_info *c_info = &guest_config->c_info;
const libxl_domain_build_info *b_info = &guest_config->b_info;
- const libxl_device_nic *vifs = guest_config->vifs;
+ const libxl_device_nic *nics = guest_config->nics;
const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config);
const libxl_sdl_info *sdl = dm_sdl(guest_config);
- const int num_vifs = guest_config->num_vifs;
+ const int num_nics = guest_config->num_nics;
const char *keymap = dm_keymap(guest_config);
int i;
flexarray_t *dm_args;
@@ -159,7 +159,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc
*gc,
flexarray_vappend(dm_args, "-k", keymap, NULL);
}
if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) {
- int ioemu_vifs = 0;
+ int ioemu_nics = 0;
int nr_set_cpus = 0;
char *s;
@@ -214,31 +214,31 @@ static char **
libxl__build_device_model_args_old(libxl__gc *gc,
libxl__sprintf(gc, "%s", s), NULL);
free(s);
- for (i = 0; i < num_vifs; i++) {
- if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) {
+ for (i = 0; i < num_nics; i++) {
+ if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) {
char *smac = libxl__sprintf(gc,
- LIBXL_MAC_FMT,
LIBXL_MAC_BYTES(vifs[i].mac));
+ LIBXL_MAC_FMT,
LIBXL_MAC_BYTES(nics[i].mac));
const char *ifname = libxl__device_nic_devname(gc,
- domid, vifs[i].devid,
+ domid, nics[i].devid,
LIBXL_NIC_TYPE_IOEMU);
flexarray_vappend(dm_args,
"-net",
GCSPRINTF(
"nic,vlan=%d,macaddr=%s,model=%s",
- vifs[i].devid, smac, vifs[i].model),
+ nics[i].devid, smac, nics[i].model),
"-net",
GCSPRINTF(
"tap,vlan=%d,ifname=%s,bridge=%s,"
"script=%s,downscript=%s",
- vifs[i].devid, ifname, vifs[i].bridge,
+ nics[i].devid, ifname, nics[i].bridge,
libxl_tapif_script(gc),
libxl_tapif_script(gc)),
NULL);
- ioemu_vifs++;
+ ioemu_nics++;
}
}
/* If we have no emulated nics, tell qemu not to create any */
- if ( ioemu_vifs == 0 ) {
+ if ( ioemu_nics == 0 ) {
flexarray_vappend(dm_args, "-net", "none",
NULL);
}
if (libxl_defbool_val(b_info->u.hvm.gfx_passthru)) {
@@ -330,9 +330,9 @@ static char ** libxl__build_device_model_args_new(libxl__gc
*gc,
const libxl_domain_create_info *c_info = &guest_config->c_info;
const libxl_domain_build_info *b_info = &guest_config->b_info;
const libxl_device_disk *disks = guest_config->disks;
- const libxl_device_nic *vifs = guest_config->vifs;
+ const libxl_device_nic *nics = guest_config->nics;
const int num_disks = guest_config->num_disks;
- const int num_vifs = guest_config->num_vifs;
+ const int num_nics = guest_config->num_nics;
const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config);
const libxl_sdl_info *sdl = dm_sdl(guest_config);
const char *keymap = dm_keymap(guest_config);
@@ -409,7 +409,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc
*gc,
}
if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) {
- int ioemu_vifs = 0;
+ int ioemu_nics = 0;
if (b_info->u.hvm.serial) {
flexarray_vappend(dm_args, "-serial",
b_info->u.hvm.serial, NULL);
@@ -468,30 +468,30 @@ static char **
libxl__build_device_model_args_new(libxl__gc *gc,
flexarray_append(dm_args, libxl__sprintf(gc, "%d",
b_info->max_vcpus));
}
- for (i = 0; i < num_vifs; i++) {
- if (vifs[i].nictype == LIBXL_NIC_TYPE_IOEMU) {
+ for (i = 0; i < num_nics; i++) {
+ if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) {
char *smac = libxl__sprintf(gc,
- LIBXL_MAC_FMT, LIBXL_MAC_BYTES(vifs[i].mac));
+ LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac));
const char *ifname = libxl__device_nic_devname(gc,
- guest_domid, vifs[i].devid,
+ guest_domid, nics[i].devid,
LIBXL_NIC_TYPE_IOEMU);
flexarray_append(dm_args, "-device");
flexarray_append(dm_args,
libxl__sprintf(gc,
"%s,id=nic%d,netdev=net%d,mac=%s",
- vifs[i].model, vifs[i].devid,
- vifs[i].devid, smac));
+ nics[i].model, nics[i].devid,
+ nics[i].devid, smac));
flexarray_append(dm_args, "-netdev");
flexarray_append(dm_args, GCSPRINTF(
"type=tap,id=net%d,ifname=%s,"
"script=%s,downscript=%s",
- vifs[i].devid, ifname,
+ nics[i].devid, ifname,
libxl_tapif_script(gc),
libxl_tapif_script(gc)));
- ioemu_vifs++;
+ ioemu_nics++;
}
}
/* If we have no emulated nics, tell qemu not to create any */
- if ( ioemu_vifs == 0 ) {
+ if ( ioemu_nics == 0 ) {
flexarray_append(dm_args, "-net");
flexarray_append(dm_args, "none");
}
@@ -753,8 +753,8 @@ void libxl__spawn_stub_dm(libxl__egc *egc,
libxl__stub_dm_spawn_state *sdss)
dm_config->disks = guest_config->disks;
dm_config->num_disks = guest_config->num_disks;
- dm_config->vifs = guest_config->vifs;
- dm_config->num_vifs = guest_config->num_vifs;
+ dm_config->nics = guest_config->nics;
+ dm_config->num_nics = guest_config->num_nics;
ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info);
if (ret) goto out;
@@ -827,8 +827,8 @@ retry_transaction:
if (ret)
goto out_free;
}
- for (i = 0; i < dm_config->num_vifs; i++) {
- ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->vifs[i]);
+ for (i = 0; i < dm_config->num_nics; i++) {
+ ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->nics[i]);
if (ret)
goto out_free;
}
diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c
index e870606..caa8312 100644
--- a/tools/libxl/libxl_json.c
+++ b/tools/libxl/libxl_json.c
@@ -822,15 +822,15 @@ yajl_gen_status libxl_domain_config_gen_json(yajl_gen
hand,
if (s != yajl_gen_status_ok)
goto out;
- s = yajl_gen_string(hand, (const unsigned char *)"vifs",
- sizeof("vifs")-1);
+ s = yajl_gen_string(hand, (const unsigned char *)"nics",
+ sizeof("nics")-1);
if (s != yajl_gen_status_ok)
goto out;
s = yajl_gen_array_open(hand);
if (s != yajl_gen_status_ok)
goto out;
- for (i = 0; i < p->num_vifs; i++) {
- s = libxl_device_nic_gen_json(hand, &p->vifs[i]);
+ for (i = 0; i < p->num_nics; i++) {
+ s = libxl_device_nic_gen_json(hand, &p->nics[i]);
if (s != yajl_gen_status_ok)
goto out;
}
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 61791e1..8c04fe6 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -920,17 +920,17 @@ static void parse_config_data(const char *config_source,
}
if (!xlu_cfg_get_list (config, "vif", &nics, 0, 0)) {
- d_config->num_vifs = 0;
- d_config->vifs = NULL;
- while ((buf = xlu_cfg_get_listitem (nics, d_config->num_vifs)) !=
NULL) {
+ d_config->num_nics = 0;
+ d_config->nics = NULL;
+ while ((buf = xlu_cfg_get_listitem (nics, d_config->num_nics)) !=
NULL) {
libxl_device_nic *nic;
char *buf2 = strdup(buf);
char *p, *p2;
- d_config->vifs = (libxl_device_nic *) realloc(d_config->vifs,
sizeof (libxl_device_nic) * (d_config->num_vifs+1));
- nic = d_config->vifs + d_config->num_vifs;
+ d_config->nics = (libxl_device_nic *) realloc(d_config->nics,
sizeof (libxl_device_nic) * (d_config->num_nics+1));
+ nic = d_config->nics + d_config->num_nics;
libxl_device_nic_init(nic);
- nic->devid = d_config->num_vifs;
+ nic->devid = d_config->num_nics;
if (default_vifscript) {
free(nic->script);
@@ -1003,7 +1003,7 @@ static void parse_config_data(const char *config_source,
} while ((p = strtok(NULL, ",")) != NULL);
skip:
free(buf2);
- d_config->num_vifs++;
+ d_config->num_nics++;
}
}
diff --git a/tools/libxl/xl_sxp.c b/tools/libxl/xl_sxp.c
index 6e0a389..91f8f75 100644
--- a/tools/libxl/xl_sxp.c
+++ b/tools/libxl/xl_sxp.c
@@ -175,20 +175,20 @@ void printf_info_sexp(int domid, libxl_domain_config
*d_config)
printf("\t)\n");
}
- for (i = 0; i < d_config->num_vifs; i++) {
+ for (i = 0; i < d_config->num_nics; i++) {
printf("\t(device\n");
printf("\t\t(vif\n");
- if (d_config->vifs[i].ifname)
- printf("\t\t\t(vifname %s)\n",
d_config->vifs[i].ifname);
- printf("\t\t\t(backend_domid %d)\n",
d_config->vifs[i].backend_domid);
+ if (d_config->nics[i].ifname)
+ printf("\t\t\t(vifname %s)\n",
d_config->nics[i].ifname);
+ printf("\t\t\t(backend_domid %d)\n",
d_config->nics[i].backend_domid);
printf("\t\t\t(frontend_domid %d)\n", domid);
- printf("\t\t\t(devid %d)\n", d_config->vifs[i].devid);
- printf("\t\t\t(mtu %d)\n", d_config->vifs[i].mtu);
- printf("\t\t\t(model %s)\n", d_config->vifs[i].model);
+ printf("\t\t\t(devid %d)\n", d_config->nics[i].devid);
+ printf("\t\t\t(mtu %d)\n", d_config->nics[i].mtu);
+ printf("\t\t\t(model %s)\n", d_config->nics[i].model);
printf("\t\t\t(mac %02x%02x%02x%02x%02x%02x)\n",
- d_config->vifs[i].mac[0], d_config->vifs[i].mac[1],
- d_config->vifs[i].mac[2], d_config->vifs[i].mac[3],
- d_config->vifs[i].mac[4], d_config->vifs[i].mac[5]);
+ d_config->nics[i].mac[0], d_config->nics[i].mac[1],
+ d_config->nics[i].mac[2], d_config->nics[i].mac[3],
+ d_config->nics[i].mac[4], d_config->nics[i].mac[5]);
printf("\t\t)\n");
printf("\t)\n");
}
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 09/19] libxl: convert libxl_device_disk_add to an async op
This patch converts libxl_device_disk_add to an ao operation that
waits for device backend to reach state XenbusStateInitWait and then
marks the operation as completed. This is not really useful now, but
will be used by later patches that will launch hotplug scripts after
we reached the desired xenbus state.
As usual, libxl_device_disk_add callers have been modified, and the
internal function libxl__device_disk_add has been used if the call was
inside an already running ao.
Changes since v9:
* Removed a wrong comment hunk.
* Fixed Ocaml bindings.
Changes since v8:
* Added a macro to define libxl_device_{type}_add functions, since
they are all equal (just like for device removal/destroy).
Changes since v6:
* Fixed comments.
* Rename libxl__initiate_device_connection to
libxl__wait_device_connection.
* Cancel backend devstate watch if local attach of disk fails.
Changes since v5:
* Change the disk addition to use the new ao_devices structure.
* Change name and comment of _initiate_device_add to
_initiate_device_connect.
Changes since v4:
* Added more comments about libxl__device_disk_add and
libxl__add_disks.
* Removed stray hunk in Makefile.
* Fixed _prepare call libxl__add_disks (separate into a different
loop).
* Moved some code to check if disks have finished to a macro that
generates a custom function, which will also be used for vif
interfaces.
Changes since v2:
* Remove state read from libxl__initiate_device_add
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 144 +++++++++++++++++++++++++---------
tools/libxl/libxl.h | 4 +-
tools/libxl/libxl_create.c | 42 ++++++++---
tools/libxl/libxl_device.c | 77 ++++++++++++++++++
tools/libxl/libxl_dm.c | 73 +++++++++++++-----
tools/libxl/libxl_internal.h | 39 +++++++++-
tools/libxl/xl_cmdimpl.c | 2 +-
tools/ocaml/libs/xl/xenlight_stubs.c | 2 +-
8 files changed, 310 insertions(+), 73 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index bd64e0c..d97add5 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -1749,16 +1749,18 @@ int libxl__device_from_disk(libxl__gc *gc, uint32_t
domid,
* The passed get_vdev_user function is also in charge of printing
* the corresponding error message when appropiate.
*/
-static int device_disk_add(libxl__gc *gc, uint32_t domid,
+static void device_disk_add(libxl__egc *egc, uint32_t domid,
libxl_device_disk *disk,
+ libxl__ao_device *aodev,
void *get_vdev_user(libxl__gc *, const char *,
xs_transaction_t),
const char *blkdev_start)
{
+ STATE_AO_GC(aodev->ao);
flexarray_t *front = NULL;
flexarray_t *back = NULL;
char *dev;
- libxl__device device;
+ libxl__device *device;
int major, minor, rc;
libxl_ctx *ctx = gc->owner;
xs_transaction_t t = XBT_NULL;
@@ -1801,7 +1803,8 @@ static int device_disk_add(libxl__gc *gc, uint32_t domid,
goto out_free;
}
- rc = libxl__device_from_disk(gc, domid, disk, &device);
+ GCNEW(device);
+ rc = libxl__device_from_disk(gc, domid, disk, device);
if (rc != 0) {
LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or
unsupported"
" virtual disk identifier %s", disk->vdev);
@@ -1819,7 +1822,7 @@ static int device_disk_add(libxl__gc *gc, uint32_t domid,
flexarray_append(back, "params");
flexarray_append(back, dev);
- assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD);
+ assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD);
break;
case LIBXL_DISK_BACKEND_TAP:
dev = libxl__blktap_devpath(gc, disk->pdev_path,
disk->format);
@@ -1840,7 +1843,7 @@ static int device_disk_add(libxl__gc *gc, uint32_t domid,
flexarray_append(back, "params");
flexarray_append(back, libxl__sprintf(gc, "%s:%s",
libxl__device_disk_string_of_format(disk->format), disk->pdev_path));
- assert(device.backend_kind == LIBXL__DEVICE_KIND_QDISK);
+ assert(device->backend_kind == LIBXL__DEVICE_KIND_QDISK);
break;
default:
LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk
backend type: %d\n", disk->backend);
@@ -1872,11 +1875,11 @@ static int device_disk_add(libxl__gc *gc, uint32_t
domid,
flexarray_append(front, "state");
flexarray_append(front, libxl__sprintf(gc, "%d", 1));
flexarray_append(front, "virtual-device");
- flexarray_append(front, libxl__sprintf(gc, "%d",
device.devid));
+ flexarray_append(front, libxl__sprintf(gc, "%d",
device->devid));
flexarray_append(front, "device-type");
flexarray_append(front, disk->is_cdrom ? "cdrom" :
"disk");
- libxl__device_generic_add(gc, t, &device,
+ libxl__device_generic_add(gc, t, device,
libxl__xs_kvs_of_flexarray(gc, back,
back->count),
libxl__xs_kvs_of_flexarray(gc, front,
front->count));
@@ -1885,6 +1888,10 @@ static int device_disk_add(libxl__gc *gc, uint32_t domid,
if (rc < 0) goto out_free;
}
+ aodev->dev = device;
+ aodev->action = DEVICE_CONNECT;
+ libxl__wait_device_connection(egc, aodev);
+
rc = 0;
out_free:
@@ -1892,21 +1899,15 @@ out_free:
flexarray_free(front);
out:
libxl__xs_transaction_abort(gc, &t);
- return rc;
-}
-
-int libxl__device_disk_add(libxl__gc *gc, uint32_t domid,
- libxl_device_disk *disk)
-{
- return device_disk_add(gc, domid, disk, NULL, NULL);
+ aodev->rc = rc;
+ if (rc) aodev->callback(egc, aodev);
+ return;
}
-int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk
*disk)
+void libxl__device_disk_add(libxl__egc *egc, uint32_t domid,
+ libxl_device_disk *disk, libxl__ao_device *aodev)
{
- GC_INIT(ctx);
- int rc = libxl__device_disk_add(gc, domid, disk);
- GC_FREE;
- return rc;
+ device_disk_add(egc, domid, disk, aodev, NULL, NULL);
}
static void libxl__device_disk_from_xs_be(libxl__gc *gc,
@@ -2109,11 +2110,13 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid,
libxl_device_disk *disk)
ret = 0;
libxl_device_disk_remove(ctx, domid, disks + i, 0);
- libxl_device_disk_add(ctx, domid, disk);
+ /* fixme-ao */
+ libxl_device_disk_add(ctx, domid, disk, 0);
stubdomid = libxl_get_stubdom_id(ctx, domid);
if (stubdomid) {
libxl_device_disk_remove(ctx, stubdomid, disks + i, 0);
- libxl_device_disk_add(ctx, stubdomid, disk);
+ /* fixme-ao */
+ libxl_device_disk_add(ctx, stubdomid, disk, 0);
}
out:
for (i = 0; i < num; i++)
@@ -2154,14 +2157,17 @@ static char * libxl__alloc_vdev(libxl__gc *gc, const
char *blkdev_start,
return NULL;
}
+/* Callbacks */
+
+static void local_device_attach_cb(libxl__egc *egc, libxl__ao_device *aodev);
+
void libxl__device_disk_local_initiate_attach(libxl__egc *egc,
libxl__disk_local_state *dls)
{
STATE_AO_GC(dls->ao);
libxl_ctx *ctx = CTX;
- char *dev = NULL, *be_path = NULL;
+ char *dev = NULL;
int rc;
- libxl__device device;
const libxl_device_disk *in_disk = dls->in_disk;
libxl_device_disk *disk = &dls->disk;
const char *blkdev_start = dls->blkdev_start;
@@ -2208,13 +2214,12 @@ void libxl__device_disk_local_initiate_attach(libxl__egc
*egc,
break;
case LIBXL_DISK_BACKEND_QDISK:
if (disk->format != LIBXL_DISK_FORMAT_RAW) {
- if (device_disk_add(gc, LIBXL_TOOLSTACK_DOMID, disk,
- (void *) libxl__alloc_vdev, blkdev_start))
{
- LOG(ERROR, "libxl_device_disk_add failed");
- rc = ERROR_FAIL;
- goto out;
- }
- dev = GCSPRINTF("/dev/%s", disk->vdev);
+ libxl__prepare_ao_device(ao, &dls->aodev);
+ dls->aodev.callback = local_device_attach_cb;
+ device_disk_add(egc, LIBXL_TOOLSTACK_DOMID, disk,
+ &dls->aodev, (void *) libxl__alloc_vdev,
+ blkdev_start);
+ return;
} else {
dev = disk->pdev_path;
}
@@ -2227,15 +2232,48 @@ void libxl__device_disk_local_initiate_attach(libxl__egc
*egc,
break;
}
- if (disk->vdev != NULL) {
- rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk,
&device);
- if (rc < 0)
- goto out;
- be_path = libxl__device_backend_path(gc, &device);
- rc = libxl__wait_for_backend(gc, be_path, "4");
- if (rc < 0)
- goto out;
+ if (dev != NULL)
+ dls->diskpath = strdup(dev);
+
+ dls->callback(egc, dls, 0);
+ return;
+
+ out:
+ assert(rc);
+ dls->rc = rc;
+ libxl__device_disk_local_initiate_detach(egc, dls);
+ dls->callback(egc, dls, rc);
+}
+
+static void local_device_attach_cb(libxl__egc *egc, libxl__ao_device *aodev)
+{
+ STATE_AO_GC(aodev->ao);
+ libxl__disk_local_state *dls = CONTAINER_OF(aodev, *dls, aodev);
+ char *dev = NULL, *be_path = NULL;
+ int rc;
+ libxl__device device;
+ libxl_device_disk *disk = &dls->disk;
+
+ rc = aodev->rc;
+ if (rc) {
+ LOGE(ERROR, "unable to %s %s with id %u",
+ aodev->action == DEVICE_CONNECT ? "add" :
"remove",
+ libxl__device_kind_to_string(aodev->dev->kind),
+ aodev->dev->devid);
+ goto out;
}
+
+ dev = GCSPRINTF("/dev/%s", disk->vdev);
+ LOG(DEBUG, "locally attaching qdisk %s", dev);
+
+ rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk, &device);
+ if (rc < 0)
+ goto out;
+ be_path = libxl__device_backend_path(gc, &device);
+ rc = libxl__wait_for_backend(gc, be_path, "4");
+ if (rc < 0)
+ goto out;
+
if (dev != NULL)
dls->diskpath = strdup(dev);
@@ -2973,6 +3011,36 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1)
/******************************************************************************/
+/* Macro for defining device addition functions in a compact way */
+/* The following functions are defined:
+ * libxl_device_disk_add
+ */
+
+#define DEFINE_DEVICE_ADD(type) \
+ int libxl_device_##type##_add(libxl_ctx *ctx, \
+ uint32_t domid, libxl_device_##type *type, \
+ const libxl_asyncop_how *ao_how) \
+ { \
+ AO_CREATE(ctx, domid, ao_how); \
+ libxl__ao_device *aodev; \
+ \
+ GCNEW(aodev); \
+ libxl__prepare_ao_device(ao, aodev); \
+ aodev->callback = device_addrm_aocomplete; \
+ libxl__device_##type##_add(egc, domid, type, aodev); \
+ \
+ return AO_INPROGRESS; \
+ }
+
+/* Define alladd functions and undef the macro */
+
+/* disk */
+DEFINE_DEVICE_ADD(disk)
+
+#undef DEFINE_DEVICE_ADD
+
+/******************************************************************************/
+
int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb)
{
GC_INIT(ctx);
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index c730ac5..f3161d5 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -675,7 +675,9 @@ void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int
nr_vcpus);
*/
/* Disks */
-int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk
*disk);
+int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid,
+ libxl_device_disk *disk,
+ const libxl_asyncop_how *ao_how);
int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid,
libxl_device_disk *disk,
const libxl_asyncop_how *ao_how);
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index a4b8248..181eb53 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -558,6 +558,10 @@ static void
domcreate_bootloader_console_available(libxl__egc *egc,
static void domcreate_bootloader_done(libxl__egc *egc,
libxl__bootloader_state *bl,
int rc);
+
+static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs,
+ int ret);
+
static void domcreate_console_available(libxl__egc *egc,
libxl__domain_create_state *dcs);
@@ -845,12 +849,10 @@ static void domcreate_rebuild_done(libxl__egc *egc,
int ret)
{
STATE_AO_GC(dcs->ao);
- int i;
/* convenience aliases */
const uint32_t domid = dcs->guest_domid;
libxl_domain_config *const d_config = dcs->guest_config;
- libxl__domain_build_state *const state = &dcs->build_state;
libxl_ctx *const ctx = CTX;
if (ret) {
@@ -861,14 +863,34 @@ static void domcreate_rebuild_done(libxl__egc *egc,
store_libxl_entry(gc, domid, &d_config->b_info);
- for (i = 0; i < d_config->num_disks; i++) {
- ret = libxl_device_disk_add(ctx, domid, &d_config->disks[i]);
- if (ret) {
- LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
- "cannot add disk %d to domain: %d", i, ret);
- ret = ERROR_FAIL;
- goto error_out;
- }
+ dcs->aodevs.size = d_config->num_disks;
+ dcs->aodevs.callback = domcreate_launch_dm;
+ libxl__prepare_ao_devices(ao, &dcs->aodevs);
+ libxl__add_disks(egc, ao, domid, 0, d_config, &dcs->aodevs);
+
+ return;
+
+ error_out:
+ assert(ret);
+ domcreate_complete(egc, dcs, ret);
+}
+
+static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs,
+ int ret)
+{
+ libxl__domain_create_state *dcs = CONTAINER_OF(aodevs, *dcs, aodevs);
+ STATE_AO_GC(dcs->ao);
+ int i;
+
+ /* convenience aliases */
+ const uint32_t domid = dcs->guest_domid;
+ libxl_domain_config *const d_config = dcs->guest_config;
+ libxl__domain_build_state *const state = &dcs->build_state;
+ libxl_ctx *const ctx = CTX;
+
+ if (ret) {
+ LOG(ERROR, "unable to add disk devices");
+ goto error_out;
}
for (i = 0; i < d_config->num_nics; i++) {
ret = libxl_device_nic_add(ctx, domid, &d_config->nics[i]);
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index a94beab..a935ced 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -445,6 +445,37 @@ void libxl__ao_devices_callback(libxl__egc *egc,
libxl__ao_device *aodev)
return;
}
+/******************************************************************************/
+
+/* Macro for defining the functions that will add a bunch of disks when
+ * inside an async op.
+ * This macro is added to prevent repetition of code.
+ *
+ * The following functions are defined:
+ * libxl__add_disks
+ */
+
+#define DEFINE_DEVICES_ADD(type)
\
+ void libxl__add_##type##s(libxl__egc *egc, libxl__ao *ao, uint32_t domid,
\
+ int start, libxl_domain_config *d_config,
\
+ libxl__ao_devices *aodevs)
\
+ {
\
+ AO_GC;
\
+ int i;
\
+ int end = start + d_config->num_##type##s;
\
+ for (i = start; i < end; i++) {
\
+ aodevs->array[i].callback = libxl__ao_devices_callback;
\
+ libxl__device_##type##_add(egc, domid,
&d_config->type##s[i-start],\
+ &aodevs->array[i]);
\
+ }
\
+ }
+
+DEFINE_DEVICES_ADD(disk)
+
+#undef DEFINE_DEVICES_ADD
+
+/******************************************************************************/
+
int libxl__device_destroy(libxl__gc *gc, libxl__device *dev)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -573,6 +604,52 @@ static void device_backend_cleanup(libxl__gc *gc,
static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev);
+void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev)
+{
+ STATE_AO_GC(aodev->ao);
+ char *be_path = libxl__device_backend_path(gc, aodev->dev);
+ char *state_path = libxl__sprintf(gc, "%s/state", be_path);
+ libxl_dominfo info;
+ uint32_t domid = aodev->dev->domid;
+ int rc = 0;
+
+ libxl_dominfo_init(&info);
+ rc = libxl_domain_info(CTX, &info, domid);
+ if (rc) {
+ LOG(ERROR, "unable to get info for domain %d", domid);
+ goto out;
+ }
+ if (QEMU_BACKEND(aodev->dev)) {
+ /*
+ * If Qemu is not running, there''s no point in waiting for
+ * it to change the state of the device.
+ *
+ * If Qemu is running, it will set the state of the device to
+ * 4 directly, without waiting in state 2 for any hotplug execution.
+ */
+ device_hotplug_done(egc, aodev);
+ return;
+ }
+
+ rc = libxl__ev_devstate_wait(gc, &aodev->backend_ds,
+ device_backend_callback,
+ state_path, XenbusStateInitWait,
+ LIBXL_INIT_TIMEOUT * 1000);
+ if (rc) {
+ LOG(ERROR, "unable to initialize device %s", be_path);
+ goto out;
+ }
+
+ libxl_dominfo_dispose(&info);
+ return;
+
+out:
+ aodev->rc = rc;
+ libxl_dominfo_dispose(&info);
+ device_hotplug_done(egc, aodev);
+ return;
+}
+
void libxl__initiate_device_remove(libxl__egc *egc,
libxl__ao_device *aodev)
{
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 4baf3f7..9a5cb0a 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -694,6 +694,9 @@ static void spawn_stubdom_pvqemu_cb(libxl__egc *egc,
libxl__dm_spawn_state *stubdom_dmss,
int rc);
+static void spawn_stub_launch_dm(libxl__egc *egc,
+ libxl__ao_devices *aodevs, int ret);
+
static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc,
libxl__destroy_domid_state *dis,
int rc);
@@ -702,10 +705,9 @@ void libxl__spawn_stub_dm(libxl__egc *egc,
libxl__stub_dm_spawn_state *sdss)
{
STATE_AO_GC(sdss->dm.spawn.ao);
libxl_ctx *ctx = libxl__gc_owner(gc);
- int i, num_console = STUBDOM_SPECIAL_CONSOLES, ret;
- libxl__device_console *console;
- libxl_device_vfb vfb;
- libxl_device_vkb vkb;
+ int ret;
+ libxl_device_vfb *vfb;
+ libxl_device_vkb *vkb;
char **args;
struct xs_permissions perm[2];
xs_transaction_t t;
@@ -761,10 +763,12 @@ void libxl__spawn_stub_dm(libxl__egc *egc,
libxl__stub_dm_spawn_state *sdss)
ret = libxl__domain_build_info_setdefault(gc, &dm_config->b_info);
if (ret) goto out;
- libxl__vfb_and_vkb_from_hvm_guest_config(gc, guest_config, &vfb,
&vkb);
- dm_config->vfbs = &vfb;
+ GCNEW(vfb);
+ GCNEW(vkb);
+ libxl__vfb_and_vkb_from_hvm_guest_config(gc, guest_config, vfb, vkb);
+ dm_config->vfbs = vfb;
dm_config->num_vfbs = 1;
- dm_config->vkbs = &vkb;
+ dm_config->vkbs = vkb;
dm_config->num_vkbs = 1;
stubdom_state->pv_kernel.path
@@ -822,22 +826,54 @@ retry_transaction:
if (errno == EAGAIN)
goto retry_transaction;
- for (i = 0; i < dm_config->num_disks; i++) {
- ret = libxl_device_disk_add(ctx, dm_domid,
&dm_config->disks[i]);
- if (ret)
- goto out_free;
- }
+ sdss->aodevs.size = dm_config->num_disks;
+ sdss->aodevs.callback = spawn_stub_launch_dm;
+ libxl__prepare_ao_devices(ao, &sdss->aodevs);
+ libxl__add_disks(egc, ao, dm_domid, 0, dm_config, &sdss->aodevs);
+
+ free(args);
+ return;
+
+out_free:
+ free(args);
+out:
+ assert(ret);
+ spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, ret);
+}
+
+static void spawn_stub_launch_dm(libxl__egc *egc,
+ libxl__ao_devices *aodevs, int ret)
+{
+ libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(aodevs, *sdss, aodevs);
+ STATE_AO_GC(sdss->dm.spawn.ao);
+ libxl_ctx *ctx = libxl__gc_owner(gc);
+ int i, num_console = STUBDOM_SPECIAL_CONSOLES;
+ libxl__device_console *console;
+
+ /* convenience aliases */
+ libxl_domain_config *const dm_config = &sdss->dm_config;
+ libxl_domain_config *const guest_config = sdss->dm.guest_config;
+ const int guest_domid = sdss->dm.guest_domid;
+ libxl__domain_build_state *const d_state = sdss->dm.build_state;
+ libxl__domain_build_state *const stubdom_state = &sdss->dm_state;
+ uint32_t dm_domid = sdss->pvqemu.guest_domid;
+
+ if (ret) {
+ LOG(ERROR, "error connecting disk devices");
+ goto out;
+ }
+
for (i = 0; i < dm_config->num_nics; i++) {
ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->nics[i]);
if (ret)
- goto out_free;
+ goto out;
}
ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]);
if (ret)
- goto out_free;
+ goto out;
ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config->vkbs[0]);
if (ret)
- goto out_free;
+ goto out;
if (guest_config->b_info.u.hvm.serial)
num_console++;
@@ -845,7 +881,7 @@ retry_transaction:
console = libxl__calloc(gc, num_console, sizeof(libxl__device_console));
if (!console) {
ret = ERROR_NOMEM;
- goto out_free;
+ goto out;
}
for (i = 0; i < num_console; i++) {
@@ -881,7 +917,7 @@ retry_transaction:
ret = libxl__device_console_add(gc, dm_domid, &console[i],
i == STUBDOM_CONSOLE_LOGGING ? stubdom_state : NULL);
if (ret)
- goto out_free;
+ goto out;
}
sdss->pvqemu.spawn.ao = ao;
@@ -892,11 +928,8 @@ retry_transaction:
libxl__spawn_local_dm(egc, &sdss->pvqemu);
- free(args);
return;
-out_free:
- free(args);
out:
assert(ret);
spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, ret);
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index ab590be..eb69721 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -72,6 +72,7 @@
#include "_libxl_types_internal.h"
#include "_libxl_types_internal_json.h"
+#define LIBXL_INIT_TIMEOUT 10
#define LIBXL_DESTROY_TIMEOUT 10
#define LIBXL_DEVICE_MODEL_START_TIMEOUT 10
#define LIBXL_QEMU_BODGE_TIMEOUT 2
@@ -1297,8 +1298,6 @@ _hidden void libxl__device_destroy_tapdisk(libxl__gc *gc,
char *be_path);
_hidden int libxl__device_from_disk(libxl__gc *gc, uint32_t domid,
libxl_device_disk *disk,
libxl__device *device);
-_hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid,
- libxl_device_disk *disk);
_hidden char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid);
@@ -1883,6 +1882,27 @@ struct libxl__ao_devices {
* DONE.
*/
+/* AO operation to connect a disk device, called by
+ * libxl_device_disk_add and libxl__add_disks. This function calls
+ * libxl__wait_device_connection to wait for the device to
+ * finish the connection (might involve executing hotplug scripts).
+ *
+ * Once finished, aodev->callback will be executed.
+ */
+_hidden void libxl__device_disk_add(libxl__egc *egc, uint32_t domid,
+ libxl_device_disk *disk,
+ libxl__ao_device *aodev);
+
+/* Waits for the passed device to reach state XenbusStateInitWait.
+ * This is not really useful by itself, but is important when executing
+ * hotplug scripts, since we need to be sure the device is in the correct
+ * state before executing them.
+ *
+ * Once finished, aodev->callback will be executed.
+ */
+_hidden void libxl__wait_device_connection(libxl__egc*,
+ libxl__ao_device *aodev);
+
/* Arranges that dev will be removed to the guest, and the
* hotplug scripts will be executed (if necessary). When
* this is done (or an error happens), the callback in
@@ -2253,6 +2273,19 @@ _hidden void libxl__destroy_domid(libxl__egc *egc,
_hidden void libxl__devices_destroy(libxl__egc *egc,
libxl__devices_remove_state *drs);
+/* Helper function to add a bunch of disks. This should be used when
+ * the caller is inside an async op. "devices" will NOT be prepared
by this
+ * function, so the caller must make sure to call _prepare before calling this
+ * function. The start parameter contains the position inside the aodevs array
+ * that should be used to store the state of this devices.
+ *
+ * The "callback" will be called for each device, and the user is
responsible
+ * for calling libxl__ao_device_check_last on the callback.
+ */
+_hidden void libxl__add_disks(libxl__egc *egc, libxl__ao *ao, uint32_t domid,
+ int start, libxl_domain_config *d_config,
+ libxl__ao_devices *aodevs);
+
/*----- device model creation -----*/
/* First layer; wraps libxl__spawn_spawn. */
@@ -2287,6 +2320,7 @@ typedef struct {
libxl__domain_build_state dm_state;
libxl__dm_spawn_state pvqemu;
libxl__destroy_domid_state dis;
+ libxl__ao_devices aodevs;
} libxl__stub_dm_spawn_state;
_hidden void libxl__spawn_stub_dm(libxl__egc *egc,
libxl__stub_dm_spawn_state*);
@@ -2316,6 +2350,7 @@ struct libxl__domain_create_state {
libxl__save_helper_state shs;
/* necessary if the domain creation failed and we have to destroy it */
libxl__domain_destroy_state dds;
+ libxl__ao_devices aodevs;
};
/*----- Domain suspend (save) functions -----*/
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 8c04fe6..f27e811 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -5355,7 +5355,7 @@ int main_blockattach(int argc, char **argv)
return 0;
}
- if (libxl_device_disk_add(ctx, fe_domid, &disk)) {
+ if (libxl_device_disk_add(ctx, fe_domid, &disk, 0)) {
fprintf(stderr, "libxl_device_disk_add failed.\n");
}
return 0;
diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c
b/tools/ocaml/libs/xl/xenlight_stubs.c
index 53751b1..a158351 100644
--- a/tools/ocaml/libs/xl/xenlight_stubs.c
+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
@@ -247,7 +247,7 @@ value stub_xl_device_disk_add(value info, value domid)
device_disk_val(&gc, &lg, &c_info, info);
INIT_CTX();
- ret = libxl_device_disk_add(ctx, Int_val(domid), &c_info);
+ ret = libxl_device_disk_add(ctx, Int_val(domid), &c_info, 0);
if (ret != 0)
failwith_xl("disk_add", &lg);
FREE_CTX();
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 10/19] libxl: convert libxl_device_nic_add to an async operation
This patch converts libxl_device_nic_add to an ao operation that
waits for device backend to reach state XenbusStateInitWait and then
marks the operation as completed. This is not really useful now, but
will be used by latter patches that will launch hotplug scripts after
we reached the desired xenbus state.
Calls to libxl_device_nic_add have also been moved to occur after the
device model has been launched, so when hotplug scripts are called
from this functions the interfaces already exists.
As usual, libxl_device_nic_add callers have been modified, and the
internal function libxl__device_disk_add has been used if the call was
inside an already running ao.
Changes since v9:
* Fixed Ocaml bindings.
Changes since v5:
* Updated to use the new ao_devices struct.
* Renamed ao_device in nic_add to aodev.
Changes since v4:
* Used the macro defined in previous patch to define the generic
callback to wait for nics to be connected.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 29 ++++++++++++++-----
tools/libxl/libxl.h | 3 +-
tools/libxl/libxl_create.c | 51 ++++++++++++++++++++++++++++-----
tools/libxl/libxl_device.c | 2 +
tools/libxl/libxl_dm.c | 38 +++++++++++++++++++++++--
tools/libxl/libxl_internal.h | 9 ++++++
tools/libxl/xl_cmdimpl.c | 2 +-
tools/ocaml/libs/xl/xenlight_stubs.c | 2 +-
8 files changed, 114 insertions(+), 22 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index d97add5..d27ac20 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2424,12 +2424,13 @@ static int libxl__device_from_nic(libxl__gc *gc,
uint32_t domid,
return 0;
}
-int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic)
+void libxl__device_nic_add(libxl__egc *egc, uint32_t domid,
+ libxl_device_nic *nic, libxl__ao_device *aodev)
{
- GC_INIT(ctx);
+ STATE_AO_GC(aodev->ao);
flexarray_t *front;
flexarray_t *back;
- libxl__device device;
+ libxl__device *device;
char *dompath, **l;
unsigned int nb, rc;
@@ -2460,7 +2461,8 @@ int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid,
libxl_device_nic *nic)
}
}
- rc = libxl__device_from_nic(gc, domid, nic, &device);
+ GCNEW(device);
+ rc = libxl__device_from_nic(gc, domid, nic, device);
if ( rc != 0 ) goto out_free;
flexarray_append(back, "frontend-id");
@@ -2501,6 +2503,9 @@ int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid,
libxl_device_nic *nic)
flexarray_append(back, libxl__strdup(gc, nic->bridge));
flexarray_append(back, "handle");
flexarray_append(back, libxl__sprintf(gc, "%d", nic->devid));
+ flexarray_append(back, "type");
+ flexarray_append(back, libxl__strdup(gc,
+
libxl_nic_type_to_string(nic->nictype)));
flexarray_append(front, "backend-id");
flexarray_append(front, libxl__sprintf(gc, "%d",
nic->backend_domid));
@@ -2511,18 +2516,22 @@ int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid,
libxl_device_nic *nic)
flexarray_append(front, "mac");
flexarray_append(front, libxl__sprintf(gc,
LIBXL_MAC_FMT,
LIBXL_MAC_BYTES(nic->mac)));
- libxl__device_generic_add(gc, XBT_NULL, &device,
+ libxl__device_generic_add(gc, XBT_NULL, device,
libxl__xs_kvs_of_flexarray(gc, back,
back->count),
libxl__xs_kvs_of_flexarray(gc, front,
front->count));
- /* FIXME: wait for plug */
+ aodev->dev = device;
+ aodev->action = DEVICE_CONNECT;
+ libxl__wait_device_connection(egc, aodev);
+
rc = 0;
out_free:
flexarray_free(back);
flexarray_free(front);
out:
- GC_FREE;
- return rc;
+ aodev->rc = rc;
+ if (rc) aodev->callback(egc, aodev);
+ return;
}
static void libxl__device_nic_from_xs_be(libxl__gc *gc,
@@ -3014,6 +3023,7 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1)
/* Macro for defining device addition functions in a compact way */
/* The following functions are defined:
* libxl_device_disk_add
+ * libxl_device_nic_add
*/
#define DEFINE_DEVICE_ADD(type) \
@@ -3037,6 +3047,9 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1)
/* disk */
DEFINE_DEVICE_ADD(disk)
+/* nic */
+DEFINE_DEVICE_ADD(nic)
+
#undef DEFINE_DEVICE_ADD
/******************************************************************************/
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index f3161d5..d548090 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -696,7 +696,8 @@ int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t
domid,
int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk
*disk);
/* Network Interfaces */
-int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic
*nic);
+int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic,
+ const libxl_asyncop_how *ao_how);
int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid,
libxl_device_nic *nic,
const libxl_asyncop_how *ao_how);
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 181eb53..36f7366 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -562,6 +562,9 @@ static void domcreate_bootloader_done(libxl__egc *egc,
static void domcreate_launch_dm(libxl__egc *egc, libxl__ao_devices *aodevs,
int ret);
+static void domcreate_attach_pci(libxl__egc *egc, libxl__ao_devices *aodevs,
+ int ret);
+
static void domcreate_console_available(libxl__egc *egc,
libxl__domain_create_state *dcs);
@@ -893,13 +896,11 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__ao_devices *aodevs,
goto error_out;
}
for (i = 0; i < d_config->num_nics; i++) {
- ret = libxl_device_nic_add(ctx, domid, &d_config->nics[i]);
- if (ret) {
- LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
- "cannot add nic %d to domain: %d", i, ret);
- ret = ERROR_FAIL;
- goto error_out;
- }
+ /* We have to init the nic here, because we still haven''t
+ * called libxl_device_nic_add at this point, but qemu needs
+ * the nic information to be complete.
+ */
+ libxl__device_nic_setdefault(gc, &d_config->nics[i]);
}
switch (d_config->c_info.type) {
case LIBXL_DOMAIN_TYPE_HVM:
@@ -972,7 +973,6 @@ static void domcreate_devmodel_started(libxl__egc *egc,
{
libxl__domain_create_state *dcs = CONTAINER_OF(dmss, *dcs, dmss.dm);
STATE_AO_GC(dmss->spawn.ao);
- int i;
libxl_ctx *ctx = CTX;
int domid = dcs->guest_domid;
@@ -992,6 +992,41 @@ static void domcreate_devmodel_started(libxl__egc *egc,
}
}
+ /* Plug nic interfaces */
+ if (d_config->num_nics > 0) {
+ /* Attach nics */
+ dcs->aodevs.size = d_config->num_nics;
+ dcs->aodevs.callback = domcreate_attach_pci;
+ libxl__prepare_ao_devices(ao, &dcs->aodevs);
+ libxl__add_nics(egc, ao, domid, 0, d_config, &dcs->aodevs);
+ return;
+ }
+
+ domcreate_attach_pci(egc, &dcs->aodevs, 0);
+ return;
+
+error_out:
+ assert(ret);
+ domcreate_complete(egc, dcs, ret);
+}
+
+static void domcreate_attach_pci(libxl__egc *egc, libxl__ao_devices *aodevs,
+ int ret)
+{
+ libxl__domain_create_state *dcs = CONTAINER_OF(aodevs, *dcs, aodevs);
+ STATE_AO_GC(dcs->ao);
+ int i;
+ libxl_ctx *ctx = CTX;
+ int domid = dcs->guest_domid;
+
+ /* convenience aliases */
+ libxl_domain_config *const d_config = dcs->guest_config;
+
+ if (ret) {
+ LOG(ERROR, "unable to add nic devices");
+ goto error_out;
+ }
+
for (i = 0; i < d_config->num_pcidevs; i++)
libxl__device_pci_add(gc, domid, &d_config->pcidevs[i], 1);
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index a935ced..ccbd84a 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -453,6 +453,7 @@ void libxl__ao_devices_callback(libxl__egc *egc,
libxl__ao_device *aodev)
*
* The following functions are defined:
* libxl__add_disks
+ * libxl__add_nics
*/
#define DEFINE_DEVICES_ADD(type)
\
@@ -471,6 +472,7 @@ void libxl__ao_devices_callback(libxl__egc *egc,
libxl__ao_device *aodev)
}
DEFINE_DEVICES_ADD(disk)
+DEFINE_DEVICES_ADD(nic)
#undef DEFINE_DEVICES_ADD
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 9a5cb0a..8f5618b 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -697,6 +697,10 @@ static void spawn_stubdom_pvqemu_cb(libxl__egc *egc,
static void spawn_stub_launch_dm(libxl__egc *egc,
libxl__ao_devices *aodevs, int ret);
+static void stubdom_pvqemu_cb(libxl__egc *egc,
+ libxl__ao_devices *aodevs,
+ int rc);
+
static void spaw_stubdom_pvqemu_destroy_cb(libxl__egc *egc,
libxl__destroy_domid_state *dis,
int rc);
@@ -864,9 +868,11 @@ static void spawn_stub_launch_dm(libxl__egc *egc,
}
for (i = 0; i < dm_config->num_nics; i++) {
- ret = libxl_device_nic_add(ctx, dm_domid, &dm_config->nics[i]);
- if (ret)
- goto out;
+ /* We have to init the nic here, because we still haven''t
+ * called libxl_device_nic_add at this point, but qemu needs
+ * the nic information to be complete.
+ */
+ libxl__device_nic_setdefault(gc, &dm_config->nics[i]);
}
ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]);
if (ret)
@@ -943,9 +949,35 @@ static void spawn_stubdom_pvqemu_cb(libxl__egc *egc,
CONTAINER_OF(stubdom_dmss, *sdss, pvqemu);
STATE_AO_GC(sdss->dm.spawn.ao);
uint32_t dm_domid = sdss->pvqemu.guest_domid;
+ libxl_domain_config *d_config = stubdom_dmss->guest_config;
if (rc) goto out;
+ if (d_config->num_nics > 0) {
+ sdss->aodevs.size = d_config->num_nics;
+ sdss->aodevs.callback = stubdom_pvqemu_cb;
+ libxl__prepare_ao_devices(ao, &sdss->aodevs);
+ libxl__add_nics(egc, ao, dm_domid, 0, d_config, &sdss->aodevs);
+ return;
+ }
+
+out:
+ stubdom_pvqemu_cb(egc, &sdss->aodevs, rc);
+}
+
+static void stubdom_pvqemu_cb(libxl__egc *egc,
+ libxl__ao_devices *aodevs,
+ int rc)
+{
+ libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(aodevs, *sdss, aodevs);
+ STATE_AO_GC(sdss->dm.spawn.ao);
+ uint32_t dm_domid = sdss->pvqemu.guest_domid;
+
+ if (rc) {
+ LOGE(ERROR, "error connecting nics devices");
+ goto out;
+ }
+
rc = libxl_domain_unpause(CTX, dm_domid);
if (rc) goto out;
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index eb69721..67dfebe 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1893,6 +1893,11 @@ _hidden void libxl__device_disk_add(libxl__egc *egc,
uint32_t domid,
libxl_device_disk *disk,
libxl__ao_device *aodev);
+/* AO operation to connect a nic device */
+_hidden void libxl__device_nic_add(libxl__egc *egc, uint32_t domid,
+ libxl_device_nic *nic,
+ libxl__ao_device *aodev);
+
/* Waits for the passed device to reach state XenbusStateInitWait.
* This is not really useful by itself, but is important when executing
* hotplug scripts, since we need to be sure the device is in the correct
@@ -2286,6 +2291,10 @@ _hidden void libxl__add_disks(libxl__egc *egc, libxl__ao
*ao, uint32_t domid,
int start, libxl_domain_config *d_config,
libxl__ao_devices *aodevs);
+_hidden void libxl__add_nics(libxl__egc *egc, libxl__ao *ao, uint32_t domid,
+ int start, libxl_domain_config *d_config,
+ libxl__ao_devices *aodevs);
+
/*----- device model creation -----*/
/* First layer; wraps libxl__spawn_spawn. */
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index f27e811..183dd99 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -5244,7 +5244,7 @@ int main_networkattach(int argc, char **argv)
return 0;
}
- if (libxl_device_nic_add(ctx, domid, &nic)) {
+ if (libxl_device_nic_add(ctx, domid, &nic, 0)) {
fprintf(stderr, "libxl_device_nic_add failed.\n");
return 1;
}
diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c
b/tools/ocaml/libs/xl/xenlight_stubs.c
index a158351..0e9c65e 100644
--- a/tools/ocaml/libs/xl/xenlight_stubs.c
+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
@@ -281,7 +281,7 @@ value stub_xl_device_nic_add(value info, value domid)
device_nic_val(&gc, &lg, &c_info, info);
INIT_CTX();
- ret = libxl_device_nic_add(ctx, Int_val(domid), &c_info);
+ ret = libxl_device_nic_add(ctx, Int_val(domid), &c_info, 0);
if (ret != 0)
failwith_xl("nic_add", &lg);
FREE_CTX();
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 11/19] libxl: add option to choose who executes hotplug scripts
Add and option to xl.conf file to decide if hotplug scripts are
executed from the toolstack (xl) or from udev as it used to be in the
past.
This option is only introduced in this patch, but it has no effect
since the code to call hotplug scripts from libxl is introduced in a
latter patch.
This choice will be saved in "libxl/disable_udev", as specified in the
DISABLE_UDEV_PATH constant.
Changes since v8:
* Free list of returned VMs
* Use libxl__xs_{write,rm}_checked.
* Change initialization of dm_config->c_info.run_hotplug_scripts.
Changes since v2:
* Change atoi(...) to !!atoi(...) to prevent returning negative
values from xenstore (which will be handled as errors).
* Check for errors on the return value of libxl__hotplug_settings.
Changes since v1:
* Used an auxiliary function to check for the current setting.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
docs/man/xl.conf.pod.5 | 8 ++++++++
tools/examples/xl.conf | 5 +++++
tools/libxl/libxl_create.c | 40 +++++++++++++++++++++++++++++++++++++++-
tools/libxl/libxl_dm.c | 3 +++
tools/libxl/libxl_internal.c | 19 +++++++++++++++++++
tools/libxl/libxl_internal.h | 3 +++
tools/libxl/libxl_types.idl | 1 +
tools/libxl/xl.c | 4 ++++
tools/libxl/xl.h | 1 +
tools/libxl/xl_cmdimpl.c | 1 +
10 files changed, 84 insertions(+), 1 deletions(-)
diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5
index 149430c..23932be 100644
--- a/docs/man/xl.conf.pod.5
+++ b/docs/man/xl.conf.pod.5
@@ -55,6 +55,14 @@ default.
Default: C<1>
+=item B<run_hotplug_scripts=BOOLEAN>
+
+If disabled hotplug scripts will be called from udev, as it used to
+be in the previous releases. With the default option, hotplug scripts
+will be launched by xl directly.
+
+Default: C<1>
+
=item B<lockfile="PATH">
Sets the path to the lock file used by xl to serialise certain
diff --git a/tools/examples/xl.conf b/tools/examples/xl.conf
index ebf057c..28ab796 100644
--- a/tools/examples/xl.conf
+++ b/tools/examples/xl.conf
@@ -15,3 +15,8 @@
# first block device to be used for temporary VM disk mounts
#blkdev_start="xvda"
+
+# default option to run hotplug scripts from xl
+# if disabled the old behaviour will be used, and hotplug scripts will be
+# launched by udev.
+#run_hotplug_scripts=1
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 36f7366..d3dc038 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -70,6 +70,8 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc,
libxl_defbool_setdefault(&c_info->oos, true);
}
+ libxl_defbool_setdefault(&c_info->run_hotplug_scripts, true);
+
return 0;
}
@@ -382,7 +384,7 @@ int libxl__domain_make(libxl__gc *gc,
libxl_domain_create_info *info,
uint32_t *domid)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
- int flags, ret, rc;
+ int flags, ret, rc, nb_vm;
char *uuid_string;
char *dom_path, *vm_path, *libxl_path;
struct xs_permissions roperm[2];
@@ -390,6 +392,7 @@ int libxl__domain_make(libxl__gc *gc,
libxl_domain_create_info *info,
struct xs_permissions noperm[1];
xs_transaction_t t = 0;
xen_domain_handle_t handle;
+ libxl_vminfo *vm_list;
assert(!libxl_domid_valid_guest(*domid));
@@ -503,6 +506,41 @@ retry_transaction:
libxl__sprintf(gc, "%s/hvmloader/generation-id-address",
dom_path),
rwperm, ARRAY_SIZE(rwperm));
+ vm_list = libxl_list_vm(ctx, &nb_vm);
+ if (!vm_list) {
+ LOG(ERROR, "cannot get number of running guests");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ libxl_vminfo_list_free(vm_list, nb_vm);
+ int hotplug_setting = libxl__hotplug_settings(gc, t);
+ if (hotplug_setting < 0) {
+ LOG(ERROR, "unable to get current hotplug scripts execution
setting");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ if (libxl_defbool_val(info->run_hotplug_scripts) != hotplug_setting
&&
+ (nb_vm - 1)) {
+ LOG(ERROR, "cannot change hotplug execution option once set,
"
+ "please shutdown all guests before changing it");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ if (libxl_defbool_val(info->run_hotplug_scripts)) {
+ rc = libxl__xs_write_checked(gc, t, DISABLE_UDEV_PATH, "1");
+ if (rc) {
+ LOGE(ERROR, "unable to write %s = 1", DISABLE_UDEV_PATH);
+ goto out;
+ }
+ } else {
+ rc = libxl__xs_rm_checked(gc, t, DISABLE_UDEV_PATH);
+ if (rc) {
+ LOGE(ERROR, "unable to delete %s", DISABLE_UDEV_PATH);
+ goto out;
+ }
+ }
+
xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/uuid", vm_path),
uuid_string, strlen(uuid_string));
xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/name", vm_path),
info->name, strlen(info->name));
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 8f5618b..dbbd0db 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -762,6 +762,9 @@ void libxl__spawn_stub_dm(libxl__egc *egc,
libxl__stub_dm_spawn_state *sdss)
dm_config->nics = guest_config->nics;
dm_config->num_nics = guest_config->num_nics;
+ dm_config->c_info.run_hotplug_scripts +
guest_config->c_info.run_hotplug_scripts;
+
ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info);
if (ret) goto out;
ret = libxl__domain_build_info_setdefault(gc, &dm_config->b_info);
diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c
index fbff7d0..4775bb6 100644
--- a/tools/libxl/libxl_internal.c
+++ b/tools/libxl/libxl_internal.c
@@ -353,6 +353,25 @@ libxl_device_model_version
libxl__device_model_version_running(libxl__gc *gc,
return value;
}
+int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t)
+{
+ int rc = 0;
+ char *val;
+
+ val = libxl__xs_read(gc, t, DISABLE_UDEV_PATH);
+ if (!val && errno != ENOENT) {
+ LOGE(ERROR, "cannot read %s from xenstore",
DISABLE_UDEV_PATH);
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ if (!val) val = "0";
+
+ rc = !!atoi(val);
+
+out:
+ return rc;
+}
+
/*
* Local variables:
* mode: C
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 67dfebe..cd55da6 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -91,6 +91,7 @@
#define STUBDOM_CONSOLE_SERIAL 3
#define STUBDOM_SPECIAL_CONSOLES 3
#define TAP_DEVICE_SUFFIX "-emu"
+#define DISABLE_UDEV_PATH "libxl/disable_udev"
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
@@ -1470,6 +1471,8 @@ _hidden libxl__json_object *libxl__json_parse(libxl__gc
*gc, const char *s);
_hidden libxl_device_model_version
libxl__device_model_version_running(libxl__gc *gc, uint32_t domid);
+/* Check how executes hotplug script currently */
+int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t);
/*
* Calling context and GC for event-generating functions:
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index c3fbe77..9c83436 100644
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -231,6 +231,7 @@ libxl_domain_create_info =
Struct("domain_create_info",[
("xsdata", libxl_key_value_list),
("platformdata", libxl_key_value_list),
("poolid", uint32),
+ ("run_hotplug_scripts",libxl_defbool),
], dir=DIR_IN)
MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT")
diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c
index d6f2b3e..f31e836 100644
--- a/tools/libxl/xl.c
+++ b/tools/libxl/xl.c
@@ -39,6 +39,7 @@ int dryrun_only;
int force_execution;
int autoballoon = 1;
char *blkdev_start;
+int run_hotplug_scripts = 1;
char *lockfile;
char *default_vifscript = NULL;
char *default_bridge = NULL;
@@ -70,6 +71,9 @@ static void parse_global_config(const char *configfile,
if (!xlu_cfg_get_long (config, "autoballoon", &l, 0))
autoballoon = l;
+ if (!xlu_cfg_get_long (config, "run_hotplug_scripts", &l, 0))
+ run_hotplug_scripts = l;
+
if (!xlu_cfg_get_string (config, "lockfile", &buf, 0))
lockfile = strdup(buf);
else {
diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h
index b0ba357..0b2f848 100644
--- a/tools/libxl/xl.h
+++ b/tools/libxl/xl.h
@@ -140,6 +140,7 @@ int xl_child_pid(xlchildnum); /* returns 0 if child struct
is not in use */
/* global options */
extern int autoballoon;
+extern int run_hotplug_scripts;
extern int dryrun_only;
extern char *lockfile;
extern char *default_vifscript;
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 183dd99..5162b6f 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -595,6 +595,7 @@ static void parse_config_data(const char *config_source,
}
}
+ libxl_defbool_set(&c_info->run_hotplug_scripts,
run_hotplug_scripts);
c_info->type = LIBXL_DOMAIN_TYPE_PV;
if (!xlu_cfg_get_string (config, "builder", &buf, 0)
&&
!strncmp(buf, "hvm", strlen(buf)))
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 12/19] libxl: rename _IOEMU nic type to VIF_IOEMU
This change will avoid the confusion caused by the fact that IOEMU
means both PV and TAP network interfaces.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 4 ++--
tools/libxl/libxl_dm.c | 8 ++++----
tools/libxl/libxl_types.idl | 2 +-
tools/libxl/xl_cmdimpl.c | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index d27ac20..05ba211 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2406,7 +2406,7 @@ int libxl__device_nic_setdefault(libxl__gc *gc,
libxl_device_nic *nic)
libxl__xen_script_dir_path()) < 0 )
return ERROR_FAIL;
if (!nic->nictype)
- nic->nictype = LIBXL_NIC_TYPE_IOEMU;
+ nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU;
return 0;
}
@@ -2702,7 +2702,7 @@ const char *libxl__device_nic_devname(libxl__gc *gc,
switch (type) {
case LIBXL_NIC_TYPE_VIF:
return GCSPRINTF("vif%u.%d", domid, devid);
- case LIBXL_NIC_TYPE_IOEMU:
+ case LIBXL_NIC_TYPE_VIF_IOEMU:
return GCSPRINTF("vif%u.%d" TAP_DEVICE_SUFFIX, domid, devid);
default:
abort();
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index dbbd0db..f21fb4f 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -215,12 +215,12 @@ static char **
libxl__build_device_model_args_old(libxl__gc *gc,
free(s);
for (i = 0; i < num_nics; i++) {
- if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) {
+ if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) {
char *smac = libxl__sprintf(gc,
LIBXL_MAC_FMT,
LIBXL_MAC_BYTES(nics[i].mac));
const char *ifname = libxl__device_nic_devname(gc,
domid, nics[i].devid,
- LIBXL_NIC_TYPE_IOEMU);
+ LIBXL_NIC_TYPE_VIF_IOEMU);
flexarray_vappend(dm_args,
"-net",
GCSPRINTF(
@@ -469,12 +469,12 @@ static char **
libxl__build_device_model_args_new(libxl__gc *gc,
b_info->max_vcpus));
}
for (i = 0; i < num_nics; i++) {
- if (nics[i].nictype == LIBXL_NIC_TYPE_IOEMU) {
+ if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) {
char *smac = libxl__sprintf(gc,
LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac));
const char *ifname = libxl__device_nic_devname(gc,
guest_domid, nics[i].devid,
- LIBXL_NIC_TYPE_IOEMU);
+ LIBXL_NIC_TYPE_VIF_IOEMU);
flexarray_append(dm_args, "-device");
flexarray_append(dm_args,
libxl__sprintf(gc,
"%s,id=nic%d,netdev=net%d,mac=%s",
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index 9c83436..1a6c4a2 100644
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -60,7 +60,7 @@ libxl_disk_backend = Enumeration("disk_backend", [
])
libxl_nic_type = Enumeration("nic_type", [
- (1, "IOEMU"),
+ (1, "VIF_IOEMU"),
(2, "VIF"),
])
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 5162b6f..1371458 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -979,7 +979,7 @@ static void parse_config_data(const char *config_source,
nic->bridge = strdup(p2 + 1);
} else if (!strcmp(p, "type")) {
if (!strcmp(p2 + 1, "ioemu"))
- nic->nictype = LIBXL_NIC_TYPE_IOEMU;
+ nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU;
else
nic->nictype = LIBXL_NIC_TYPE_VIF;
} else if (!strcmp(p, "ip")) {
@@ -5196,7 +5196,7 @@ int main_networkattach(int argc, char **argv)
if (!strcmp("vif", oparg)) {
nic.nictype = LIBXL_NIC_TYPE_VIF;
} else if (!strcmp("ioemu", oparg)) {
- nic.nictype = LIBXL_NIC_TYPE_IOEMU;
+ nic.nictype = LIBXL_NIC_TYPE_VIF_IOEMU;
} else {
fprintf(stderr, "Invalid parameter
`type''.\n");
return 1;
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 13/19] libxl: set correct nic type depending on the guest
Fix the use of nic type, which results in the following for each type
of domain:
* HVM: let the user choose, if none specified use VIF_IOEMU.
* PV: use VIF always.
Changes since v9:
* Don''t force nic type for HVM-stubdom guests.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 20 ++++++++++++++++----
tools/libxl/libxl_create.c | 2 +-
tools/libxl/libxl_dm.c | 2 +-
tools/libxl/libxl_internal.h | 3 ++-
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 05ba211..5c5c876 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2375,7 +2375,8 @@ out:
/******************************************************************************/
-int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic)
+int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic,
+ uint32_t domid)
{
if (!nic->mtu)
nic->mtu = 1492;
@@ -2405,8 +2406,19 @@ int libxl__device_nic_setdefault(libxl__gc *gc,
libxl_device_nic *nic)
if ( !nic->script && asprintf(&nic->script,
"%s/vif-bridge",
libxl__xen_script_dir_path()) < 0 )
return ERROR_FAIL;
- if (!nic->nictype)
- nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU;
+
+ switch (libxl__domain_type(gc, domid)) {
+ case LIBXL_DOMAIN_TYPE_HVM:
+ if (!nic->nictype)
+ nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU;
+ break;
+ case LIBXL_DOMAIN_TYPE_PV:
+ nic->nictype = LIBXL_NIC_TYPE_VIF;
+ break;
+ default:
+ abort();
+ }
+
return 0;
}
@@ -2434,7 +2446,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t
domid,
char *dompath, **l;
unsigned int nb, rc;
- rc = libxl__device_nic_setdefault(gc, nic);
+ rc = libxl__device_nic_setdefault(gc, nic, domid);
if (rc) goto out;
front = flexarray_make(16, 1);
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index d3dc038..7db9457 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -938,7 +938,7 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__ao_devices *aodevs,
* called libxl_device_nic_add at this point, but qemu needs
* the nic information to be complete.
*/
- libxl__device_nic_setdefault(gc, &d_config->nics[i]);
+ libxl__device_nic_setdefault(gc, &d_config->nics[i], domid);
}
switch (d_config->c_info.type) {
case LIBXL_DOMAIN_TYPE_HVM:
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index f21fb4f..cbe518f 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -875,7 +875,7 @@ static void spawn_stub_launch_dm(libxl__egc *egc,
* called libxl_device_nic_add at this point, but qemu needs
* the nic information to be complete.
*/
- libxl__device_nic_setdefault(gc, &dm_config->nics[i]);
+ libxl__device_nic_setdefault(gc, &dm_config->nics[i], dm_domid);
}
ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]);
if (ret)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index cd55da6..3d87030 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -897,7 +897,8 @@ _hidden int libxl__domain_build_info_setdefault(libxl__gc
*gc,
libxl_domain_build_info *b_info);
_hidden int libxl__device_disk_setdefault(libxl__gc *gc,
libxl_device_disk *disk);
-_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic);
+_hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic,
+ uint32_t domid);
_hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb);
_hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb);
_hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci);
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 14/19] libxl: use libxl__xs_path_cleanup on device_destroy
Since the hotplug script that was in charge of cleaning the backend is
no longer launched, we need to clean the backend by ourselves, so use
libxl__xs_path_cleanup instead of xs_rm.
Changes sinve v2:
* Changed the goto construction to a do-while loop.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl_device.c | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index ccbd84a..d730b39 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -480,16 +480,26 @@ DEFINE_DEVICES_ADD(nic)
int libxl__device_destroy(libxl__gc *gc, libxl__device *dev)
{
- libxl_ctx *ctx = libxl__gc_owner(gc);
char *be_path = libxl__device_backend_path(gc, dev);
char *fe_path = libxl__device_frontend_path(gc, dev);
+ xs_transaction_t t = 0;
+ int rc = 0;
- xs_rm(ctx->xsh, XBT_NULL, be_path);
- xs_rm(ctx->xsh, XBT_NULL, fe_path);
+ do {
+ t = xs_transaction_start(CTX->xsh);
+ libxl__xs_path_cleanup(gc, t, fe_path);
+ libxl__xs_path_cleanup(gc, t, be_path);
+ rc = !xs_transaction_end(CTX->xsh, t, 0);
+ } while (rc && errno == EAGAIN);
+ if (rc) {
+ LOGE(ERROR, "unable to finish transaction");
+ goto out;
+ }
libxl__device_destroy_tapdisk(gc, be_path);
- return 0;
+out:
+ return rc;
}
/* Callback for device destruction */
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 15/19] libxl: call hotplug scripts for disk devices from libxl
Since most of the needed work is already done in previous patches,
this patch only contains the necessary code to call hotplug scripts
for disk devices, that should be called when the device is added or
removed from a guest.
We will chain the launch of the disk hotplug scripts after the
device_backend_callback callback, or directly from
libxl__initiate_device_{add,remove} if the device is already in the
desired state.
Changes since v8:
* Print "hotplug_error" xenstore entry if hotplug execution fails and
hotplug_error contains information.
Changes since v5:
* Added common exit point using the device_hotplug_done function.
* Changed the "what" field in ao_device to "const char *".
Changes since v4:
* Init args and env to NULL.
* Correctly propagate errors from libxl__get_hotplug_script_info.
* Replaced if in libxl__ev_child_inuse with asserts.
* Renamed fork_cb to child_death_cb.
* Move deregistration of device_hotplug_timeout_cb to the top of the
function.
* Removed "pid" field from libxl__ao_device struct.
* Moved arraysize declaration.
* Fixed diff complain about no newline at the end of libxl_netbsd.c.
Changes since v2:
* Added array size check with assert.
* Added NetBSD code (so compilation is not broken).
* Removed a check for null in device_hotplug_timeout_cb.
Changes since v1:
* Moved all the event related code that was inside libxl_linux.c into
libxl_device.c, so the flow of the device addition/removal event is
all in the same file.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/hotplug/Linux/xen-backend.rules | 6 +-
tools/hotplug/Linux/xen-hotplug-common.sh | 6 ++
tools/libxl/libxl.c | 10 ++
tools/libxl/libxl_device.c | 133 ++++++++++++++++++++++++++++-
tools/libxl/libxl_internal.h | 20 ++++-
tools/libxl/libxl_linux.c | 97 +++++++++++++++++++++
tools/libxl/libxl_netbsd.c | 8 ++
7 files changed, 274 insertions(+), 6 deletions(-)
diff --git a/tools/hotplug/Linux/xen-backend.rules
b/tools/hotplug/Linux/xen-backend.rules
index 405387f..d55ff11 100644
--- a/tools/hotplug/Linux/xen-backend.rules
+++ b/tools/hotplug/Linux/xen-backend.rules
@@ -1,11 +1,11 @@
-SUBSYSTEM=="xen-backend", KERNEL=="tap*",
RUN+="/etc/xen/scripts/blktap $env{ACTION}"
-SUBSYSTEM=="xen-backend", KERNEL=="vbd*",
RUN+="/etc/xen/scripts/block $env{ACTION}"
+SUBSYSTEM=="xen-backend", KERNEL=="tap*",
ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap
$env{ACTION}"
+SUBSYSTEM=="xen-backend", KERNEL=="vbd*",
ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block
$env{ACTION}"
SUBSYSTEM=="xen-backend", KERNEL=="vtpm*",
RUN+="/etc/xen/scripts/vtpm $env{ACTION}"
SUBSYSTEM=="xen-backend", KERNEL=="vif2-*",
RUN+="/etc/xen/scripts/vif2 $env{ACTION}"
SUBSYSTEM=="xen-backend", KERNEL=="vif-*",
ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online
type_if=vif"
SUBSYSTEM=="xen-backend", KERNEL=="vif-*",
ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline
type_if=vif"
SUBSYSTEM=="xen-backend", KERNEL=="vscsi*",
RUN+="/etc/xen/scripts/vscsi $env{ACTION}"
-SUBSYSTEM=="xen-backend", ACTION=="remove",
RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
+SUBSYSTEM=="xen-backend", ACTION=="remove",
ENV{UDEV_CALL}="1",
RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
KERNEL=="evtchn", NAME="xen/%k"
SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*",
NAME="xen/%k", MODE="0600"
SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*",
NAME="xen/blktap-2/%k", MODE="0600"
diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh
b/tools/hotplug/Linux/xen-hotplug-common.sh
index 8f6557d..4a7bc73 100644
--- a/tools/hotplug/Linux/xen-hotplug-common.sh
+++ b/tools/hotplug/Linux/xen-hotplug-common.sh
@@ -15,6 +15,12 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+# Hack to prevent the execution of hotplug scripts from udev if the domain
+# has been launched from libxl
+if [ -n "${UDEV_CALL}" ] && \
+ xenstore-read "libxl/disable_udev" >/dev/null 2>&1; then
+ exit 0
+fi
dir=$(dirname "$0")
. "$dir/hotplugpath.sh"
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 5c5c876..25d9786 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -1822,6 +1822,11 @@ static void device_disk_add(libxl__egc *egc, uint32_t
domid,
flexarray_append(back, "params");
flexarray_append(back, dev);
+ flexarray_append(back, "script");
+ flexarray_append(back, GCSPRINTF("%s/%s",
+ libxl__xen_script_dir_path(),
+ "block"));
+
assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD);
break;
case LIBXL_DISK_BACKEND_TAP:
@@ -1837,6 +1842,11 @@ static void device_disk_add(libxl__egc *egc, uint32_t
domid,
libxl__device_disk_string_of_format(disk->format),
disk->pdev_path));
+ flexarray_append(back, "script");
+ flexarray_append(back, GCSPRINTF("%s/%s",
+ libxl__xen_script_dir_path(),
+ "blktap"));
+
/* now create a phy device to export the device to the guest */
goto do_backend_phy;
case LIBXL_DISK_BACKEND_QDISK:
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index d730b39..0632952 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -410,9 +410,12 @@ void libxl__prepare_ao_device(libxl__ao *ao,
libxl__ao_device *aodev)
aodev->ao = ao;
aodev->rc = 0;
aodev->dev = NULL;
- /* Initialize timer for QEMU Bodge */
+ /* Initialize timer for QEMU Bodge and hotplug execution */
libxl__ev_time_init(&aodev->timeout);
aodev->active = 1;
+ /* We init this here because we might call device_hotplug_done
+ * without actually calling any hotplug script */
+ libxl__ev_child_init(&aodev->child);
}
void libxl__prepare_ao_devices(libxl__ao *ao, libxl__ao_devices *aodevs)
@@ -614,6 +617,15 @@ static void device_backend_callback(libxl__egc *egc,
libxl__ev_devstate *ds,
static void device_backend_cleanup(libxl__gc *gc,
libxl__ao_device *aodev);
+static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev);
+
+static void device_hotplug_timeout_cb(libxl__egc *egc, libxl__ev_time *ev,
+ const struct timeval *requested_abs);
+
+static void device_hotplug_child_death_cb(libxl__egc *egc,
+ libxl__ev_child *child,
+ pid_t pid, int status);
+
static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev);
void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev)
@@ -639,7 +651,7 @@ void libxl__wait_device_connection(libxl__egc *egc,
libxl__ao_device *aodev)
* If Qemu is running, it will set the state of the device to
* 4 directly, without waiting in state 2 for any hotplug execution.
*/
- device_hotplug_done(egc, aodev);
+ device_hotplug(egc, aodev);
return;
}
@@ -773,6 +785,9 @@ static void device_qemu_timeout(libxl__egc *egc,
libxl__ev_time *ev,
rc = libxl__xs_write_checked(gc, XBT_NULL, state_path, "6");
if (rc) goto out;
+ device_hotplug(egc, aodev);
+ return;
+
out:
aodev->rc = rc;
device_hotplug_done(egc, aodev);
@@ -798,6 +813,9 @@ static void device_backend_callback(libxl__egc *egc,
libxl__ev_devstate *ds,
goto out;
}
+ device_hotplug(egc, aodev);
+ return;
+
out:
aodev->rc = rc;
device_hotplug_done(egc, aodev);
@@ -810,6 +828,112 @@ static void device_backend_cleanup(libxl__gc *gc,
libxl__ao_device *aodev)
libxl__ev_devstate_cancel(gc, &aodev->backend_ds);
}
+static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev)
+{
+ STATE_AO_GC(aodev->ao);
+ char *be_path = libxl__device_backend_path(gc, aodev->dev);
+ char **args = NULL, **env = NULL;
+ int rc = 0;
+ int hotplug;
+ pid_t pid;
+
+ /* Check if we have to execute hotplug scripts for this device
+ * and return the necessary args/env vars for execution */
+ hotplug = libxl__get_hotplug_script_info(gc, aodev->dev, &args,
&env,
+ aodev->action);
+ switch (hotplug) {
+ case 0:
+ /* no hotplug script to execute */
+ goto out;
+ case 1:
+ /* execute hotplug script */
+ break;
+ default:
+ /* everything else is an error */
+ LOG(ERROR, "unable to get args/env to execute hotplug script for
"
+ "device %s", libxl__device_backend_path(gc,
aodev->dev));
+ rc = hotplug;
+ goto out;
+ }
+
+ /* Set hotplug timeout */
+ rc = libxl__ev_time_register_rel(gc, &aodev->timeout,
+ device_hotplug_timeout_cb,
+ LIBXL_HOTPLUG_TIMEOUT * 1000);
+ if (rc) {
+ LOG(ERROR, "unable to register timeout for hotplug device
%s", be_path);
+ goto out;
+ }
+
+ aodev->what = GCSPRINTF("%s %s", args[0], args[1]);
+ LOG(DEBUG, "calling hotplug script: %s %s", args[0], args[1]);
+
+ /* fork and execute hotplug script */
+ pid = libxl__ev_child_fork(gc, &aodev->child,
device_hotplug_child_death_cb);
+ if (pid == -1) {
+ LOG(ERROR, "unable to fork");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ if (!pid) {
+ /* child */
+ libxl__exec(gc, -1, -1, -1, args[0], args, env);
+ /* notreached */
+ abort();
+ }
+
+ assert(libxl__ev_child_inuse(&aodev->child));
+
+ return;
+
+out:
+ aodev->rc = rc;
+ device_hotplug_done(egc, aodev);
+ return;
+}
+
+static void device_hotplug_timeout_cb(libxl__egc *egc, libxl__ev_time *ev,
+ const struct timeval *requested_abs)
+{
+ libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout);
+ STATE_AO_GC(aodev->ao);
+
+ libxl__ev_time_deregister(gc, &aodev->timeout);
+
+ assert(libxl__ev_child_inuse(&aodev->child));
+ LOG(DEBUG, "killing hotplug script %s because of timeout",
aodev->what);
+ if (kill(aodev->child.pid, SIGKILL)) {
+ LOGEV(ERROR, errno, "unable to kill hotplug script %s [%ld]",
+ aodev->what, (unsigned
long)aodev->child.pid);
+ }
+
+ return;
+}
+
+static void device_hotplug_child_death_cb(libxl__egc *egc,
+ libxl__ev_child *child,
+ pid_t pid, int status)
+{
+ libxl__ao_device *aodev = CONTAINER_OF(child, *aodev, child);
+ STATE_AO_GC(aodev->ao);
+ char *be_path = libxl__device_backend_path(gc, aodev->dev);
+ char *hotplug_error;
+
+ if (status) {
+ libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR,
+ aodev->what, pid, status);
+ hotplug_error = libxl__xs_read(gc, XBT_NULL,
+ GCSPRINTF("%s/hotplug-error",
be_path));
+ if (hotplug_error)
+ LOG(ERROR, "reason of failure reported by hotplug script:
%s",
+ hotplug_error);
+ aodev->rc = ERROR_FAIL;
+ }
+
+ device_hotplug_done(egc, aodev);
+}
+
static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev)
{
STATE_AO_GC(aodev->ao);
@@ -818,6 +942,11 @@ static void device_hotplug_done(libxl__egc *egc,
libxl__ao_device *aodev)
xs_transaction_t t = 0;
int rc;
+ /* Clean events and check reentrancy */
+ libxl__ev_time_deregister(gc, &aodev->timeout);
+ assert(!libxl__ev_child_inuse(&aodev->child));
+
+ /* Clean xenstore if it''s a disconnection */
if (aodev->action == DEVICE_DISCONNECT) {
for (;;) {
rc = libxl__xs_transaction_start(gc, &t);
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 3d87030..786b534 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -74,6 +74,7 @@
#define LIBXL_INIT_TIMEOUT 10
#define LIBXL_DESTROY_TIMEOUT 10
+#define LIBXL_HOTPLUG_TIMEOUT 10
#define LIBXL_DEVICE_MODEL_START_TIMEOUT 10
#define LIBXL_QEMU_BODGE_TIMEOUT 2
#define LIBXL_XENCONSOLE_LIMIT 1048576
@@ -1792,11 +1793,14 @@ struct libxl__ao_device {
int active;
int rc;
libxl__ev_devstate backend_ds;
- /* Bodge for Qemu devices */
+ /* Bodge for Qemu devices, also used for timeout of hotplug execution */
libxl__ev_time timeout;
/* Used internally to have a reference to the upper libxl__ao_devices
* struct when present */
libxl__ao_devices *aodevs;
+ /* device hotplug execution */
+ const char *what;
+ libxl__ev_child child;
};
/* Helper struct to simply the plug/unplug of multiple devices at the same
@@ -1926,6 +1930,20 @@ _hidden void libxl__wait_device_connection(libxl__egc*,
_hidden void libxl__initiate_device_remove(libxl__egc *egc,
libxl__ao_device *aodev);
+/*
+ * libxl__get_hotplug_script_info returns the args and env that should
+ * be passed to the hotplug script for the requested device.
+ *
+ * Since a device might not need to execute any hotplug script, this function
+ * can return the following values:
+ * < 0: Error
+ * 0: No need to execute hotplug script
+ * 1: Execute hotplug script
+ */
+_hidden int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev,
+ char ***args, char ***env,
+ libxl__device_action action);
+
/*----- local disk attach: attach a disk locally to run the bootloader -----*/
typedef struct libxl__disk_local_state libxl__disk_local_state;
diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c
index 0169b2f..97b3fd4 100644
--- a/tools/libxl/libxl_linux.c
+++ b/tools/libxl/libxl_linux.c
@@ -77,3 +77,100 @@ char *libxl__devid_to_localdev(libxl__gc *gc, int devid)
"%d", minor & (nr_parts - 1));
return ret;
}
+
+/* Hotplug scripts helpers */
+
+static char **get_hotplug_env(libxl__gc *gc, libxl__device *dev)
+{
+ char *be_path = libxl__device_backend_path(gc, dev);
+ char *script;
+ const char *type = libxl__device_kind_to_string(dev->backend_kind);
+ char **env;
+ int nr = 0;
+
+ script = libxl__xs_read(gc, XBT_NULL,
+ GCSPRINTF("%s/%s", be_path,
"script"));
+ if (!script) {
+ LOGEV(ERROR, errno, "unable to read script from %s",
be_path);
+ return NULL;
+ }
+
+ const int arraysize = 9;
+ GCNEW_ARRAY(env, arraysize);
+ env[nr++] = "script";
+ env[nr++] = script;
+ env[nr++] = "XENBUS_TYPE";
+ env[nr++] = libxl__strdup(gc, type);
+ env[nr++] = "XENBUS_PATH";
+ env[nr++] = GCSPRINTF("backend/%s/%u/%d", type, dev->domid,
dev->devid);
+ env[nr++] = "XENBUS_BASE_PATH";
+ env[nr++] = "backend";
+ env[nr++] = NULL;
+ assert(nr == arraysize);
+
+ return env;
+}
+
+/* Hotplug scripts caller functions */
+
+static int libxl__hotplug_disk(libxl__gc *gc, libxl__device *dev,
+ char ***args, char ***env,
+ libxl__device_action action)
+{
+ char *be_path = libxl__device_backend_path(gc, dev);
+ char *script;
+ int nr = 0, rc = 0;
+
+ script = libxl__xs_read(gc, XBT_NULL,
+ GCSPRINTF("%s/%s", be_path,
"script"));
+ if (!script) {
+ LOGEV(ERROR, errno, "unable to read script from %s",
be_path);
+ rc = ERROR_FAIL;
+ goto error;
+ }
+
+ *env = get_hotplug_env(gc, dev);
+ if (!*env) {
+ rc = ERROR_FAIL;
+ goto error;
+ }
+
+ const int arraysize = 3;
+ GCNEW_ARRAY(*args, arraysize);
+ (*args)[nr++] = script;
+ (*args)[nr++] = action == DEVICE_CONNECT ? "add" :
"remove";
+ (*args)[nr++] = NULL;
+ assert(nr == arraysize);
+
+ rc = 1;
+
+error:
+ return rc;
+}
+
+int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev,
+ char ***args, char ***env,
+ libxl__device_action action)
+{
+ char *disable_udev = libxl__xs_read(gc, XBT_NULL, DISABLE_UDEV_PATH);
+ int rc;
+
+ /* Check if we have to run hotplug scripts */
+ if (!disable_udev) {
+ rc = 0;
+ goto out;
+ }
+
+ switch (dev->backend_kind) {
+ case LIBXL__DEVICE_KIND_VBD:
+ rc = libxl__hotplug_disk(gc, dev, args, env, action);
+ break;
+ default:
+ /* No need to execute any hotplug scripts */
+ rc = 0;
+ break;
+ }
+
+out:
+ return rc;
+}
diff --git a/tools/libxl/libxl_netbsd.c b/tools/libxl/libxl_netbsd.c
index dbf5f71..a2f8d3f 100644
--- a/tools/libxl/libxl_netbsd.c
+++ b/tools/libxl/libxl_netbsd.c
@@ -30,3 +30,11 @@ char *libxl__devid_to_localdev(libxl__gc *gc, int devid)
/* TODO */
return NULL;
}
+
+/* Hotplug scripts caller functions */
+int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev,
+ char ***args, char ***env,
+ libxl__device_action action)
+{
+ return 0;
+}
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 16/19] libxl: call hotplug scripts for nic devices from libxl
Since most of the needed work is already done in previous patches,
this patch only contains the necessary code to call hotplug scripts
for nic devices, that should be called when the device is added or
removed from a guest.
Added another parameter to libxl__get_hotplug_script_info, that is
used to know the number of times hotplug scripts have been called for
that device. This is currently used by IOEMU nics on Linux.
Changes since v8:
* Correctly detect errors from hotplug execution and cancel domain
creation if an error is found.
Changes since v6:
* Added an rc = 0 before exitting libxl__nic_type if successful.
Changes since v4:
* Add num_exec to NetBSD dummy function.
* Better comment in the prototype of libxl__get_hotplug_script_info.
* Remove nasty use of goto.
* Keep calling device_hotplug until libxl__get_hotplug_script_info
returns <= 0. This is used by TAP nics which also have a VIF
interface (PV_IOEMU).
Changes since v2:
* Change libxl__nic_type to return the value in a parameter passed by
the caller.
* Rename vif_execute to num_exec, to represent the number of times
hotplug scripts have been called for that device.
Changes since v1:
* Move event code to libxl_device.c (as in previous patch).
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson<ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/hotplug/Linux/xen-backend.rules | 6 +-
tools/libxl/libxl_device.c | 60 +++++++++++++++++++--
tools/libxl/libxl_internal.h | 14 +++++-
tools/libxl/libxl_linux.c | 95 +++++++++++++++++++++++++++++++-
tools/libxl/libxl_netbsd.c | 3 +-
5 files changed, 166 insertions(+), 12 deletions(-)
diff --git a/tools/hotplug/Linux/xen-backend.rules
b/tools/hotplug/Linux/xen-backend.rules
index d55ff11..c591a3f 100644
--- a/tools/hotplug/Linux/xen-backend.rules
+++ b/tools/hotplug/Linux/xen-backend.rules
@@ -2,8 +2,8 @@ SUBSYSTEM=="xen-backend", KERNEL=="tap*",
ENV{UDEV_CALL}="1", RUN+="/etc/xen/scr
SUBSYSTEM=="xen-backend", KERNEL=="vbd*",
ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block
$env{ACTION}"
SUBSYSTEM=="xen-backend", KERNEL=="vtpm*",
RUN+="/etc/xen/scripts/vtpm $env{ACTION}"
SUBSYSTEM=="xen-backend", KERNEL=="vif2-*",
RUN+="/etc/xen/scripts/vif2 $env{ACTION}"
-SUBSYSTEM=="xen-backend", KERNEL=="vif-*",
ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online
type_if=vif"
-SUBSYSTEM=="xen-backend", KERNEL=="vif-*",
ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline
type_if=vif"
+SUBSYSTEM=="xen-backend", KERNEL=="vif-*",
ENV{UDEV_CALL}="1", ACTION=="online",
RUN+="/etc/xen/scripts/vif-setup online type_if=vif"
+SUBSYSTEM=="xen-backend", KERNEL=="vif-*",
ENV{UDEV_CALL}="1", ACTION=="offline",
RUN+="/etc/xen/scripts/vif-setup offline type_if=vif"
SUBSYSTEM=="xen-backend", KERNEL=="vscsi*",
RUN+="/etc/xen/scripts/vscsi $env{ACTION}"
SUBSYSTEM=="xen-backend", ACTION=="remove",
ENV{UDEV_CALL}="1",
RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
KERNEL=="evtchn", NAME="xen/%k"
@@ -13,4 +13,4 @@ KERNEL=="blktap-control",
NAME="xen/blktap-2/control", MODE="0600"
KERNEL=="gntdev", NAME="xen/%k", MODE="0600"
KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600"
KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m",
MODE="0600"
-SUBSYSTEM=="net", KERNEL=="vif*-emu",
ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION}
type_if=tap"
+SUBSYSTEM=="net", KERNEL=="vif*-emu",
ACTION=="add", ENV{UDEV_CALL}="1",
RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap"
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index 0632952..4c5a7e2 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -100,6 +100,31 @@ out:
return numdevs;
}
+int libxl__nic_type(libxl__gc *gc, libxl__device *dev, libxl_nic_type *nictype)
+{
+ char *snictype, *be_path;
+ int rc = 0;
+
+ be_path = libxl__device_backend_path(gc, dev);
+ snictype = libxl__xs_read(gc, XBT_NULL,
+ GCSPRINTF("%s/%s", be_path,
"type"));
+ if (!snictype) {
+ LOGE(ERROR, "unable to read nictype from %s", be_path);
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ rc = libxl_nic_type_from_string(snictype, nictype);
+ if (rc) {
+ LOGE(ERROR, "unable to parse nictype from %s", be_path);
+ goto out;
+ }
+
+ rc = 0;
+
+out:
+ return rc;
+}
+
int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t,
libxl__device *device, char **bents, char **fents)
{
@@ -628,6 +653,8 @@ static void device_hotplug_child_death_cb(libxl__egc *egc,
static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev);
+static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev);
+
void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev)
{
STATE_AO_GC(aodev->ao);
@@ -840,7 +867,8 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device
*aodev)
/* Check if we have to execute hotplug scripts for this device
* and return the necessary args/env vars for execution */
hotplug = libxl__get_hotplug_script_info(gc, aodev->dev, &args,
&env,
- aodev->action);
+ aodev->action,
+ aodev->num_exec);
switch (hotplug) {
case 0:
/* no hotplug script to execute */
@@ -920,6 +948,8 @@ static void device_hotplug_child_death_cb(libxl__egc *egc,
char *be_path = libxl__device_backend_path(gc, aodev->dev);
char *hotplug_error;
+ device_hotplug_clean(gc, aodev);
+
if (status) {
libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR,
aodev->what, pid, status);
@@ -929,8 +959,25 @@ static void device_hotplug_child_death_cb(libxl__egc *egc,
LOG(ERROR, "reason of failure reported by hotplug script:
%s",
hotplug_error);
aodev->rc = ERROR_FAIL;
+ if (aodev->action == DEVICE_CONNECT)
+ /*
+ * Only fail on device connection, on disconnection
+ * ignore error, and continue with the remove process
+ */
+ goto error;
}
+ /* Increase num_exec and call hotplug scripts again if necessary
+ * If no more executions are needed, device_hotplug will call
+ * device_hotplug_done breaking the loop.
+ */
+ aodev->num_exec++;
+ device_hotplug(egc, aodev);
+
+ return;
+
+error:
+ assert(aodev->rc);
device_hotplug_done(egc, aodev);
}
@@ -942,9 +989,7 @@ static void device_hotplug_done(libxl__egc *egc,
libxl__ao_device *aodev)
xs_transaction_t t = 0;
int rc;
- /* Clean events and check reentrancy */
- libxl__ev_time_deregister(gc, &aodev->timeout);
- assert(!libxl__ev_child_inuse(&aodev->child));
+ device_hotplug_clean(gc, aodev);
/* Clean xenstore if it''s a disconnection */
if (aodev->action == DEVICE_DISCONNECT) {
@@ -966,6 +1011,13 @@ out:
return;
}
+static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev)
+{
+ /* Clean events and check reentrancy */
+ libxl__ev_time_deregister(gc, &aodev->timeout);
+ assert(!libxl__ev_child_inuse(&aodev->child));
+}
+
static void devices_remove_callback(libxl__egc *egc, libxl__ao_devices *aodevs,
int rc)
{
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 786b534..cfe9dc0 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -879,6 +879,8 @@ _hidden int libxl__parse_backend_path(libxl__gc *gc, const
char *path,
libxl__device *dev);
_hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev);
_hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state);
+_hidden int libxl__nic_type(libxl__gc *gc, libxl__device *dev,
+ libxl_nic_type *nictype);
/*
* For each aggregate type which can be used as an input we provide:
@@ -1800,6 +1802,7 @@ struct libxl__ao_device {
libxl__ao_devices *aodevs;
/* device hotplug execution */
const char *what;
+ int num_exec;
libxl__ev_child child;
};
@@ -1939,10 +1942,19 @@ _hidden void libxl__initiate_device_remove(libxl__egc
*egc,
* < 0: Error
* 0: No need to execute hotplug script
* 1: Execute hotplug script
+ *
+ * The last parameter, "num_exec" refeers to the number of times
hotplug
+ * scripts have been called for this device.
+ *
+ * The main body of libxl will, for each device, keep calling
+ * libxl__get_hotplug_script_info, with incrementing values of
+ * num_exec, and executing the resulting script accordingly,
+ * until libxl__get_hotplug_script_info returns<=0.
*/
_hidden int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev,
char ***args, char ***env,
- libxl__device_action action);
+ libxl__device_action action,
+ int num_exec);
/*----- local disk attach: attach a disk locally to run the bootloader -----*/
diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c
index 97b3fd4..1c2b99a 100644
--- a/tools/libxl/libxl_linux.c
+++ b/tools/libxl/libxl_linux.c
@@ -87,6 +87,7 @@ static char **get_hotplug_env(libxl__gc *gc, libxl__device
*dev)
const char *type = libxl__device_kind_to_string(dev->backend_kind);
char **env;
int nr = 0;
+ libxl_nic_type nictype;
script = libxl__xs_read(gc, XBT_NULL,
GCSPRINTF("%s/%s", be_path,
"script"));
@@ -95,7 +96,7 @@ static char **get_hotplug_env(libxl__gc *gc, libxl__device
*dev)
return NULL;
}
- const int arraysize = 9;
+ const int arraysize = 13;
GCNEW_ARRAY(env, arraysize);
env[nr++] = "script";
env[nr++] = script;
@@ -105,14 +106,90 @@ static char **get_hotplug_env(libxl__gc *gc, libxl__device
*dev)
env[nr++] = GCSPRINTF("backend/%s/%u/%d", type, dev->domid,
dev->devid);
env[nr++] = "XENBUS_BASE_PATH";
env[nr++] = "backend";
+ if (dev->backend_kind == LIBXL__DEVICE_KIND_VIF) {
+ if (libxl__nic_type(gc, dev, &nictype)) {
+ LOG(ERROR, "unable to get nictype");
+ return NULL;
+ }
+ switch (nictype) {
+ case LIBXL_NIC_TYPE_VIF_IOEMU:
+ env[nr++] = "INTERFACE";
+ env[nr++] = libxl__strdup(gc, libxl__device_nic_devname(gc,
+ dev->domid,
dev->devid,
+
LIBXL_NIC_TYPE_VIF_IOEMU));
+ case LIBXL_NIC_TYPE_VIF:
+ env[nr++] = "vif";
+ env[nr++] = libxl__strdup(gc, libxl__device_nic_devname(gc,
+ dev->domid,
dev->devid,
+ LIBXL_NIC_TYPE_VIF));
+ break;
+ default:
+ return NULL;
+ }
+ }
+
env[nr++] = NULL;
- assert(nr == arraysize);
+ assert(nr <= arraysize);
return env;
}
/* Hotplug scripts caller functions */
+static int libxl__hotplug_nic(libxl__gc *gc, libxl__device *dev,
+ char ***args, char ***env,
+ libxl__device_action action, int num_exec)
+{
+ char *be_path = libxl__device_backend_path(gc, dev);
+ char *script;
+ int nr = 0, rc = 0;
+ libxl_nic_type nictype;
+
+ script = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/%s", be_path,
+
"script"));
+ if (!script) {
+ LOGE(ERROR, "unable to read script from %s", be_path);
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ rc = libxl__nic_type(gc, dev, &nictype);
+ if (rc) {
+ LOG(ERROR, "error when fetching nic type");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ if (nictype == LIBXL_NIC_TYPE_VIF && num_exec != 0) {
+ rc = 0;
+ goto out;
+ }
+
+ *env = get_hotplug_env(gc, dev);
+ if (!env) {
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ const int arraysize = 4;
+ GCNEW_ARRAY(*args, arraysize);
+ (*args)[nr++] = script;
+
+ if (nictype == LIBXL_NIC_TYPE_VIF_IOEMU && num_exec) {
+ (*args)[nr++] = action == DEVICE_CONNECT ? "add" :
"remove";
+ (*args)[nr++] = libxl__strdup(gc, "type_if=tap");
+ (*args)[nr++] = NULL;
+ } else {
+ (*args)[nr++] = action == DEVICE_CONNECT ? "online" :
"offline";
+ (*args)[nr++] = libxl__strdup(gc, "type_if=vif");
+ (*args)[nr++] = NULL;
+ }
+ assert(nr == arraysize);
+ rc = 1;
+
+out:
+ return rc;
+}
+
static int libxl__hotplug_disk(libxl__gc *gc, libxl__device *dev,
char ***args, char ***env,
libxl__device_action action)
@@ -150,7 +227,8 @@ error:
int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev,
char ***args, char ***env,
- libxl__device_action action)
+ libxl__device_action action,
+ int num_exec)
{
char *disable_udev = libxl__xs_read(gc, XBT_NULL, DISABLE_UDEV_PATH);
int rc;
@@ -163,8 +241,19 @@ int libxl__get_hotplug_script_info(libxl__gc *gc,
libxl__device *dev,
switch (dev->backend_kind) {
case LIBXL__DEVICE_KIND_VBD:
+ if (num_exec != 0) {
+ rc = 0;
+ goto out;
+ }
rc = libxl__hotplug_disk(gc, dev, args, env, action);
break;
+ case LIBXL__DEVICE_KIND_VIF:
+ if (num_exec > 1) {
+ rc = 0;
+ goto out;
+ }
+ rc = libxl__hotplug_nic(gc, dev, args, env, action, num_exec);
+ break;
default:
/* No need to execute any hotplug scripts */
rc = 0;
diff --git a/tools/libxl/libxl_netbsd.c b/tools/libxl/libxl_netbsd.c
index a2f8d3f..28cdf21 100644
--- a/tools/libxl/libxl_netbsd.c
+++ b/tools/libxl/libxl_netbsd.c
@@ -34,7 +34,8 @@ char *libxl__devid_to_localdev(libxl__gc *gc, int devid)
/* Hotplug scripts caller functions */
int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev,
char ***args, char ***env,
- libxl__device_action action)
+ libxl__device_action action,
+ int num_exec)
{
return 0;
}
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 17/19] libxl: convert libxl_device_vkb_add to an async operation
Split libxl_device_vkb_add into libxl__device_vkb_add (to be used
inside already running ao''s), and make libxl_device_vkb_add a stub to
call libxl__device_vkb_add.
Changes since v9:
* Fixed Ocaml bindings.
* Don''t abort if num_vkbs > 0.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 26 +++++++++++++++++++-------
tools/libxl/libxl.h | 3 ++-
tools/libxl/libxl_create.c | 18 ++++++++++--------
tools/libxl/libxl_device.c | 2 ++
tools/libxl/libxl_dm.c | 9 ++++-----
tools/libxl/libxl_internal.h | 9 +++++++++
tools/ocaml/libs/xl/xenlight_stubs.c | 2 +-
7 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 25d9786..7de82a9 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2831,12 +2831,13 @@ static int libxl__device_from_vkb(libxl__gc *gc,
uint32_t domid,
return 0;
}
-int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb)
+void libxl__device_vkb_add(libxl__egc *egc, uint32_t domid,
+ libxl_device_vkb *vkb, libxl__ao_device *aodev)
{
- GC_INIT(ctx);
+ STATE_AO_GC(aodev->ao);
flexarray_t *front;
flexarray_t *back;
- libxl__device device;
+ libxl__device *device;
int rc;
rc = libxl__device_vkb_setdefault(gc, vkb);
@@ -2853,7 +2854,8 @@ int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid,
libxl_device_vkb *vkb)
goto out_free;
}
- rc = libxl__device_from_vkb(gc, domid, vkb, &device);
+ GCNEW(device);
+ rc = libxl__device_from_vkb(gc, domid, vkb, device);
if (rc != 0) goto out_free;
flexarray_append(back, "frontend-id");
@@ -2870,16 +2872,22 @@ int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid,
libxl_device_vkb *vkb)
flexarray_append(front, "state");
flexarray_append(front, libxl__sprintf(gc, "%d", 1));
- libxl__device_generic_add(gc, XBT_NULL, &device,
+ libxl__device_generic_add(gc, XBT_NULL, device,
libxl__xs_kvs_of_flexarray(gc, back,
back->count),
libxl__xs_kvs_of_flexarray(gc, front,
front->count));
+
+ aodev->dev = device;
+ aodev->action = DEVICE_CONNECT;
+ libxl__wait_device_connection(egc, aodev);
+
rc = 0;
out_free:
flexarray_free(back);
flexarray_free(front);
out:
- GC_FREE;
- return rc;
+ aodev->rc = rc;
+ if (rc) aodev->callback(egc, aodev);
+ return;
}
/******************************************************************************/
@@ -3046,6 +3054,7 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1)
/* The following functions are defined:
* libxl_device_disk_add
* libxl_device_nic_add
+ * libxl_device_vkb_add
*/
#define DEFINE_DEVICE_ADD(type) \
@@ -3072,6 +3081,9 @@ DEFINE_DEVICE_ADD(disk)
/* nic */
DEFINE_DEVICE_ADD(nic)
+/* vkb */
+DEFINE_DEVICE_ADD(vkb)
+
#undef DEFINE_DEVICE_ADD
/******************************************************************************/
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index d548090..84d4efd 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -710,7 +710,8 @@ int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid,
libxl_device_nic *nic, libxl_nicinfo *nicinfo);
/* Keyboard */
-int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb
*vkb);
+int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb,
+ const libxl_asyncop_how *ao_how);
int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid,
libxl_device_vkb *vkb,
const libxl_asyncop_how *ao_how);
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 7db9457..39c858a 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -904,10 +904,18 @@ static void domcreate_rebuild_done(libxl__egc *egc,
store_libxl_entry(gc, domid, &d_config->b_info);
- dcs->aodevs.size = d_config->num_disks;
+ if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM &&
!d_config->num_vkbs) {
+ d_config->vkbs = libxl__zalloc(NOGC, sizeof(*d_config->vkbs));
+ libxl_device_vkb_init(&d_config->vkbs[0]);
+ d_config->num_vkbs = 1;
+ }
+
+ dcs->aodevs.size = d_config->num_disks + d_config->num_vkbs;
dcs->aodevs.callback = domcreate_launch_dm;
libxl__prepare_ao_devices(ao, &dcs->aodevs);
libxl__add_disks(egc, ao, domid, 0, d_config, &dcs->aodevs);
+ libxl__add_vkbs(egc, ao, domid, d_config->num_disks, d_config,
+ &dcs->aodevs);
return;
@@ -930,7 +938,7 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__ao_devices *aodevs,
libxl_ctx *const ctx = CTX;
if (ret) {
- LOG(ERROR, "unable to add disk devices");
+ LOG(ERROR, "unable to add misc devices");
goto error_out;
}
for (i = 0; i < d_config->num_nics; i++) {
@@ -944,7 +952,6 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__ao_devices *aodevs,
case LIBXL_DOMAIN_TYPE_HVM:
{
libxl__device_console console;
- libxl_device_vkb vkb;
ret = init_console_info(&console, 0);
if ( ret )
@@ -952,10 +959,6 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__ao_devices *aodevs,
libxl__device_console_add(gc, domid, &console, state);
libxl__device_console_dispose(&console);
- libxl_device_vkb_init(&vkb);
- libxl_device_vkb_add(ctx, domid, &vkb);
- libxl_device_vkb_dispose(&vkb);
-
dcs->dmss.dm.guest_domid = domid;
if (libxl_defbool_val(d_config->b_info.device_model_stubdomain))
libxl__spawn_stub_dm(egc, &dcs->dmss);
@@ -970,7 +973,6 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__ao_devices *aodevs,
for (i = 0; i < d_config->num_vfbs; i++) {
libxl_device_vfb_add(ctx, domid, &d_config->vfbs[i]);
- libxl_device_vkb_add(ctx, domid, &d_config->vkbs[i]);
}
ret = init_console_info(&console, 0);
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index 4c5a7e2..65cd264 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -482,6 +482,7 @@ void libxl__ao_devices_callback(libxl__egc *egc,
libxl__ao_device *aodev)
* The following functions are defined:
* libxl__add_disks
* libxl__add_nics
+ * libxl__add_vkbs
*/
#define DEFINE_DEVICES_ADD(type)
\
@@ -501,6 +502,7 @@ void libxl__ao_devices_callback(libxl__egc *egc,
libxl__ao_device *aodev)
DEFINE_DEVICES_ADD(disk)
DEFINE_DEVICES_ADD(nic)
+DEFINE_DEVICES_ADD(vkb)
#undef DEFINE_DEVICES_ADD
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index cbe518f..a6ee080 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -833,10 +833,12 @@ retry_transaction:
if (errno == EAGAIN)
goto retry_transaction;
- sdss->aodevs.size = dm_config->num_disks;
+ sdss->aodevs.size = dm_config->num_disks + dm_config->num_vkbs;
sdss->aodevs.callback = spawn_stub_launch_dm;
libxl__prepare_ao_devices(ao, &sdss->aodevs);
libxl__add_disks(egc, ao, dm_domid, 0, dm_config, &sdss->aodevs);
+ libxl__add_vkbs(egc, ao, dm_domid, dm_config->num_disks, dm_config,
+ &sdss->aodevs);
free(args);
return;
@@ -866,7 +868,7 @@ static void spawn_stub_launch_dm(libxl__egc *egc,
uint32_t dm_domid = sdss->pvqemu.guest_domid;
if (ret) {
- LOG(ERROR, "error connecting disk devices");
+ LOG(ERROR, "error connecting misc devices");
goto out;
}
@@ -880,9 +882,6 @@ static void spawn_stub_launch_dm(libxl__egc *egc,
ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]);
if (ret)
goto out;
- ret = libxl_device_vkb_add(ctx, dm_domid, &dm_config->vkbs[0]);
- if (ret)
- goto out;
if (guest_config->b_info.u.hvm.serial)
num_console++;
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index cfe9dc0..41c5e5b 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1909,6 +1909,11 @@ _hidden void libxl__device_nic_add(libxl__egc *egc,
uint32_t domid,
libxl_device_nic *nic,
libxl__ao_device *aodev);
+/* AO operation to connect a vkb device */
+_hidden void libxl__device_vkb_add(libxl__egc *egc, uint32_t domid,
+ libxl_device_vkb *vkb,
+ libxl__ao_device *aodev);
+
/* Waits for the passed device to reach state XenbusStateInitWait.
* This is not really useful by itself, but is important when executing
* hotplug scripts, since we need to be sure the device is in the correct
@@ -2329,6 +2334,10 @@ _hidden void libxl__add_nics(libxl__egc *egc, libxl__ao
*ao, uint32_t domid,
int start, libxl_domain_config *d_config,
libxl__ao_devices *aodevs);
+_hidden void libxl__add_vkbs(libxl__egc *egc, libxl__ao *ao, uint32_t domid,
+ int start, libxl_domain_config *d_config,
+ libxl__ao_devices *aodevs);
+
/*----- device model creation -----*/
/* First layer; wraps libxl__spawn_spawn. */
diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c
b/tools/ocaml/libs/xl/xenlight_stubs.c
index 0e9c65e..3d2493b 100644
--- a/tools/ocaml/libs/xl/xenlight_stubs.c
+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
@@ -315,7 +315,7 @@ value stub_xl_device_vkb_add(value info, value domid)
device_vkb_val(&gc, &lg, &c_info, info);
INIT_CTX();
- ret = libxl_device_vkb_add(ctx, Int_val(domid), &c_info);
+ ret = libxl_device_vkb_add(ctx, Int_val(domid), &c_info, 0);
if (ret != 0)
failwith_xl("vkb_add", &lg);
FREE_CTX();
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 18/19] libxl: convert libxl_device_vfb_add to an async operation
Split libxl_device_vfb_add into libxl__device_vfb_add (to be used
inside already running ao''s), and make libxl_device_vfb_add a stub
to call libxl__device_vfb_add.
Changes since v9:
* Fixed Ocaml bindings.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 26 +++++++++++++++++++-------
tools/libxl/libxl.h | 3 ++-
tools/libxl/libxl_create.c | 10 ++++------
tools/libxl/libxl_device.c | 2 ++
tools/libxl/libxl_dm.c | 9 +++++----
tools/libxl/libxl_internal.h | 9 +++++++++
tools/ocaml/libs/xl/xenlight_stubs.c | 2 +-
7 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 7de82a9..412794f 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2923,12 +2923,13 @@ static int libxl__device_from_vfb(libxl__gc *gc,
uint32_t domid,
return 0;
}
-int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb)
+void libxl__device_vfb_add(libxl__egc *egc, uint32_t domid,
+ libxl_device_vfb *vfb, libxl__ao_device *aodev)
{
- GC_INIT(ctx);
+ STATE_AO_GC(aodev->ao);
flexarray_t *front;
flexarray_t *back;
- libxl__device device;
+ libxl__device *device;
int rc;
rc = libxl__device_vfb_setdefault(gc, vfb);
@@ -2945,7 +2946,8 @@ int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid,
libxl_device_vfb *vfb)
goto out_free;
}
- rc = libxl__device_from_vfb(gc, domid, vfb, &device);
+ GCNEW(device);
+ rc = libxl__device_from_vfb(gc, domid, vfb, device);
if (rc != 0) goto out_free;
flexarray_append_pair(back, "frontend-id", libxl__sprintf(gc,
"%d", domid));
@@ -2975,16 +2977,22 @@ int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid,
libxl_device_vfb *vfb)
libxl__sprintf(gc, "%d",
vfb->backend_domid));
flexarray_append_pair(front, "state", libxl__sprintf(gc,
"%d", 1));
- libxl__device_generic_add(gc, XBT_NULL, &device,
+ libxl__device_generic_add(gc, XBT_NULL, device,
libxl__xs_kvs_of_flexarray(gc, back,
back->count),
libxl__xs_kvs_of_flexarray(gc, front,
front->count));
+
+ aodev->dev = device;
+ aodev->action = DEVICE_CONNECT;
+ libxl__wait_device_connection(egc, aodev);
+
rc = 0;
out_free:
flexarray_free(front);
flexarray_free(back);
out:
- GC_FREE;
- return rc;
+ aodev->rc = rc;
+ if (rc) aodev->callback(egc, aodev);
+ return;
}
/******************************************************************************/
@@ -3055,6 +3063,7 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1)
* libxl_device_disk_add
* libxl_device_nic_add
* libxl_device_vkb_add
+ * libxl_device_vfb_add
*/
#define DEFINE_DEVICE_ADD(type) \
@@ -3084,6 +3093,9 @@ DEFINE_DEVICE_ADD(nic)
/* vkb */
DEFINE_DEVICE_ADD(vkb)
+/* vfb */
+DEFINE_DEVICE_ADD(vfb)
+
#undef DEFINE_DEVICE_ADD
/******************************************************************************/
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 84d4efd..414475e 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -720,7 +720,8 @@ int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid,
const libxl_asyncop_how *ao_how);
/* Framebuffer */
-int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb
*vfb);
+int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb,
+ const libxl_asyncop_how *ao_how);
int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid,
libxl_device_vfb *vfb,
const libxl_asyncop_how *ao_how);
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 39c858a..03edb3d 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -910,12 +910,15 @@ static void domcreate_rebuild_done(libxl__egc *egc,
d_config->num_vkbs = 1;
}
- dcs->aodevs.size = d_config->num_disks + d_config->num_vkbs;
+ dcs->aodevs.size = d_config->num_disks + d_config->num_vkbs +
+ d_config->num_vfbs;
dcs->aodevs.callback = domcreate_launch_dm;
libxl__prepare_ao_devices(ao, &dcs->aodevs);
libxl__add_disks(egc, ao, domid, 0, d_config, &dcs->aodevs);
libxl__add_vkbs(egc, ao, domid, d_config->num_disks, d_config,
&dcs->aodevs);
+ libxl__add_vfbs(egc, ao, domid, d_config->num_disks +
d_config->num_vkbs,
+ d_config, &dcs->aodevs);
return;
@@ -935,7 +938,6 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__ao_devices *aodevs,
const uint32_t domid = dcs->guest_domid;
libxl_domain_config *const d_config = dcs->guest_config;
libxl__domain_build_state *const state = &dcs->build_state;
- libxl_ctx *const ctx = CTX;
if (ret) {
LOG(ERROR, "unable to add misc devices");
@@ -971,10 +973,6 @@ static void domcreate_launch_dm(libxl__egc *egc,
libxl__ao_devices *aodevs,
int need_qemu = 0;
libxl__device_console console;
- for (i = 0; i < d_config->num_vfbs; i++) {
- libxl_device_vfb_add(ctx, domid, &d_config->vfbs[i]);
- }
-
ret = init_console_info(&console, 0);
if ( ret )
goto error_out;
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index 65cd264..f9c8784 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -483,6 +483,7 @@ void libxl__ao_devices_callback(libxl__egc *egc,
libxl__ao_device *aodev)
* libxl__add_disks
* libxl__add_nics
* libxl__add_vkbs
+ * libxl__add_vfbs
*/
#define DEFINE_DEVICES_ADD(type)
\
@@ -503,6 +504,7 @@ void libxl__ao_devices_callback(libxl__egc *egc,
libxl__ao_device *aodev)
DEFINE_DEVICES_ADD(disk)
DEFINE_DEVICES_ADD(nic)
DEFINE_DEVICES_ADD(vkb)
+DEFINE_DEVICES_ADD(vfb)
#undef DEFINE_DEVICES_ADD
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index a6ee080..cc35380 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -833,12 +833,16 @@ retry_transaction:
if (errno == EAGAIN)
goto retry_transaction;
- sdss->aodevs.size = dm_config->num_disks + dm_config->num_vkbs;
+ sdss->aodevs.size = dm_config->num_disks + dm_config->num_vkbs +
+ dm_config->num_vfbs;
sdss->aodevs.callback = spawn_stub_launch_dm;
libxl__prepare_ao_devices(ao, &sdss->aodevs);
libxl__add_disks(egc, ao, dm_domid, 0, dm_config, &sdss->aodevs);
libxl__add_vkbs(egc, ao, dm_domid, dm_config->num_disks, dm_config,
&sdss->aodevs);
+ libxl__add_vfbs(egc, ao, dm_domid,
+ dm_config->num_disks + dm_config->num_vfbs,
dm_config,
+ &sdss->aodevs);
free(args);
return;
@@ -879,9 +883,6 @@ static void spawn_stub_launch_dm(libxl__egc *egc,
*/
libxl__device_nic_setdefault(gc, &dm_config->nics[i], dm_domid);
}
- ret = libxl_device_vfb_add(ctx, dm_domid, &dm_config->vfbs[0]);
- if (ret)
- goto out;
if (guest_config->b_info.u.hvm.serial)
num_console++;
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 41c5e5b..d02c5ef 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1914,6 +1914,11 @@ _hidden void libxl__device_vkb_add(libxl__egc *egc,
uint32_t domid,
libxl_device_vkb *vkb,
libxl__ao_device *aodev);
+/* AO operation to connect a vfb device */
+_hidden void libxl__device_vfb_add(libxl__egc *egc, uint32_t domid,
+ libxl_device_vfb *vfb,
+ libxl__ao_device *aodev);
+
/* Waits for the passed device to reach state XenbusStateInitWait.
* This is not really useful by itself, but is important when executing
* hotplug scripts, since we need to be sure the device is in the correct
@@ -2338,6 +2343,10 @@ _hidden void libxl__add_vkbs(libxl__egc *egc, libxl__ao
*ao, uint32_t domid,
int start, libxl_domain_config *d_config,
libxl__ao_devices *aodevs);
+_hidden void libxl__add_vfbs(libxl__egc *egc, libxl__ao *ao, uint32_t domid,
+ int start, libxl_domain_config *d_config,
+ libxl__ao_devices *aodevs);
+
/*----- device model creation -----*/
/* First layer; wraps libxl__spawn_spawn. */
diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c
b/tools/ocaml/libs/xl/xenlight_stubs.c
index 3d2493b..adda67f 100644
--- a/tools/ocaml/libs/xl/xenlight_stubs.c
+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
@@ -369,7 +369,7 @@ value stub_xl_device_vfb_add(value info, value domid)
device_vfb_val(&gc, &lg, &c_info, info);
INIT_CTX();
- ret = libxl_device_vfb_add(ctx, Int_val(domid), &c_info);
+ ret = libxl_device_vfb_add(ctx, Int_val(domid), &c_info, 0);
if (ret != 0)
failwith_xl("vfb_add", &lg);
FREE_CTX();
--
1.7.7.5 (Apple Git-26)
Roger Pau Monne
2012-Jul-20 14:12 UTC
[PATCH v10 19/19] xl: main_blockdetach don''t call destroy if remove succeeds
xl was calling libxl_device_disk_destroy after a successful call to
libxl_device_disk_remove, which leads to an error.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/xl_cmdimpl.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 1371458..d68bac3 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -5416,8 +5416,7 @@ int main_blockdetach(int argc, char **argv)
}
if (libxl_device_disk_remove(ctx, domid, &disk, 0)) {
fprintf(stderr, "libxl_device_disk_remove failed.\n");
- } else
- libxl_device_disk_destroy(ctx, domid, &disk, 0);
+ }
return 0;
}
--
1.7.7.5 (Apple Git-26)
Ian Campbell
2012-Jul-20 14:55 UTC
Re: [PATCH v10 19/19] xl: main_blockdetach don''t call destroy if remove succeeds
On Fri, 2012-07-20 at 15:12 +0100, Roger Pau Monne wrote:> xl was calling libxl_device_disk_destroy after a successful call to > libxl_device_disk_remove, which leads to an error. > > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Signed-off-by: Roger Pau Monne <roger.pau@citrix.com> > --- > tools/libxl/xl_cmdimpl.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index 1371458..d68bac3 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -5416,8 +5416,7 @@ int main_blockdetach(int argc, char **argv) > } > if (libxl_device_disk_remove(ctx, domid, &disk, 0)) { > fprintf(stderr, "libxl_device_disk_remove failed.\n"); > - } else > - libxl_device_disk_destroy(ctx, domid, &disk, 0); > + }Somebody should probably be calling dispose on the disk here, unconditionally. dispose used to be called destroy so that might be where the confusion arose? Ian.
Ian Campbell
2012-Jul-20 15:20 UTC
Re: [PATCH v10 15/19] libxl: call hotplug scripts for disk devices from libxl
On Fri, 2012-07-20 at 15:12 +0100, Roger Pau Monne wrote:> + if (status) { > + libxl_report_child_exitstatus(CTX, LIBXL__LOG_ERROR, > + aodev->what, pid, status); > + hotplug_error = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/hotplug-error", be_path)); > + if (hotplug_error) > + LOG(ERROR, "reason of failure reported by hotplug script: %s", > + hotplug_error);This should be "reason *for* failure" but actually it''s rather verbose, the log line is ~100 chars before you even append hotplug_error. I think just a "script: " prefix, or even nothing, would be ok. Ian.
Ian Campbell
2012-Jul-20 15:38 UTC
Re: [PATCH v10 14/19] libxl: use libxl__xs_path_cleanup on device_destroy
On Fri, 2012-07-20 at 15:12 +0100, Roger Pau Monne wrote:> Since the hotplug script that was in charge of cleaning the backend is > no longer launched, we need to clean the backend by ourselves, so use > libxl__xs_path_cleanup instead of xs_rm.Something in this series, I suspect this patch, is causing lots of: libxl: debug: libxl_xshelp.c:222:libxl__xs_path_cleanup: unable to remove path /local/domain/81/device/console/3: No such file or directory on destroy. I suspect that libxl__xs_path_cleanup should be checking for ENOENT and "failing" silently in that case, since failing to cleanup something which doesn''t exist is harmless. Ian.
Ian Campbell
2012-Jul-20 16:01 UTC
Re: [PATCH v10 16/19] libxl: call hotplug scripts for nic devices from libxl
> + switch (nictype) { > + case LIBXL_NIC_TYPE_VIF_IOEMU: > + env[nr++] = "INTERFACE"; > + env[nr++] = libxl__strdup(gc, libxl__device_nic_devname(gc, > + dev->domid, dev->devid, > + LIBXL_NIC_TYPE_VIF_IOEMU));Is this fall-through of the case deliberate? If so then a comment would be good. However I''m not sure about this. It seems like the hotplug scripts are only called once in the VIF_IOEMU case? I would expect one call for the PV VIF device and one for the TAP device? Perhaps I''m just missing the location of the other one? Is this "num_exec" variable involved in some way? But you don''t propagate that to get_hotplug_env() and therefore include *both* sets of env vars? In any case something related seems to be broken for guests which use a stub domain and use vifname=foo. What I see in that case is the script called three times... 1. For the PV interface of the stub domain (LIBXL_NIC_TYPE_VIF), renames vifX+1.0 -> foo-emu (*) 2. For the PV interface of the real domain (LIBXL_NIC_TYPE_VIF_IOEMU part 1), renames vifX.0 -> foo 3. For the emu interface of the real domain (LIBXL_NIC_TYPE_VIF_IOEMU part 2) renames vifX.0 -> foo-emu The rename in #3 fails, because foo-emu already exists. But in fact this call to the script should never happen for a domain with a stub domain since the emulated device in this case is within the stub domain, not the driver domain. (*) This is with the patch I posted earlier to rename the stub domain''s vif with a -emu suffix. Without that then the clash is at #2 instead. Ian.
Ian Campbell
2012-Jul-20 16:03 UTC
Re: [PATCH v10 16/19] libxl: call hotplug scripts for nic devices from libxl
On Fri, 2012-07-20 at 15:12 +0100, Roger Pau Monne wrote:> + if (nictype == LIBXL_NIC_TYPE_VIF_IOEMU && num_exec) { > + (*args)[nr++] = action == DEVICE_CONNECT ? "add" : "remove"; > + (*args)[nr++] = libxl__strdup(gc, "type_if=tap");This strdup (and the one below) are redundant, aren''t they?> + (*args)[nr++] = NULL; > + } else { > + (*args)[nr++] = action == DEVICE_CONNECT ? "online" : "offline"; > + (*args)[nr++] = libxl__strdup(gc, "type_if=vif"); > + (*args)[nr++] = NULL; > + } > + assert(nr == arraysize);num_exec is a really clumsy way to track "in need to execute script for type FOO next". Couldn''t we have an explicit enum?
Ian Campbell
2012-Jul-20 16:12 UTC
Re: [PATCH v10 16/19] libxl: call hotplug scripts for nic devices from libxl
On Fri, 2012-07-20 at 17:01 +0100, Ian Campbell wrote:> > + switch (nictype) { > > + case LIBXL_NIC_TYPE_VIF_IOEMU: > > + env[nr++] = "INTERFACE"; > > + env[nr++] = libxl__strdup(gc, libxl__device_nic_devname(gc, > > + dev->domid, dev->devid, > > + LIBXL_NIC_TYPE_VIF_IOEMU)); > > Is this fall-through of the case deliberate? If so then a comment would > be good.Also -- isn''t the strdup redendant here too?
Ian Campbell
2012-Jul-20 16:34 UTC
Re: [PATCH v10 12/19] libxl: rename _IOEMU nic type to VIF_IOEMU
On Fri, 2012-07-20 at 15:12 +0100, Roger Pau Monne wrote:> This change will avoid the confusion caused by the fact that IOEMU > means both PV and TAP network interfaces.You missed some in comments. e.g. in static void libxl__device_nic_from_xs_be(libxl__gc *gc, const char *be_path, libxl_device_nic *nic) ... /* XXX ioemu nics are not in xenstore at all? */ nic->nictype = LIBXL_NIC_TYPE_VIF; nic->model = NULL; /* XXX Only for TYPE_IOEMU */ nic->ifname = NULL; /* XXX Only for TYPE_IOEMU */ (I also suspect this comment is just wrong...)
Ian Jackson
2012-Jul-20 16:35 UTC
Re: [PATCH v10 02/19] libxl: change ao_device_remove to ao_device
Roger Pau Monne writes ("[PATCH v10 02/19] libxl: change ao_device_remove
to ao_device"):> Introduce a new structure to track state of device backends, that will
> be used in following patches on this series.
>
> This structure if used for both device creation and device
> destruction and removes libxl__ao_device_remove.
Thanks.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> +static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev,
> + const struct timeval *requested_abs)
> +{
> + libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout);
> + STATE_AO_GC(aodev->ao);
> + char *be_path = libxl__device_backend_path(gc, aodev->dev);
> + char *state_path = GCSPRINTF("%s/state", be_path);
> + int rc = 0;
> +
> + libxl__ev_time_deregister(gc, &aodev->timeout);
This last call is unnecessary, but harmless. A timeout is
already deregistered when the event system calls the handler.
Ian.
Ian Campbell
2012-Jul-20 16:36 UTC
Re: [PATCH v10 16/19] libxl: call hotplug scripts for nic devices from libxl
On Fri, 2012-07-20 at 17:01 +0100, Ian Campbell wrote:> > + switch (nictype) { > > + case LIBXL_NIC_TYPE_VIF_IOEMU: > > + env[nr++] = "INTERFACE"; > > + env[nr++] = libxl__strdup(gc, libxl__device_nic_devname(gc, > > + dev->domid, dev->devid, > > + LIBXL_NIC_TYPE_VIF_IOEMU)); > > Is this fall-through of the case deliberate? If so then a comment would > be good. > > However I''m not sure about this. It seems like the hotplug scripts are > only called once in the VIF_IOEMU case? I would expect one call for the > PV VIF device and one for the TAP device? Perhaps I''m just missing the > location of the other one? Is this "num_exec" variable involved in some > way? But you don''t propagate that to get_hotplug_env() and therefore > include *both* sets of env vars? > > In any case something related seems to be broken for guests which use a > stub domain and use vifname=foo. What I see in that case is the script > called three times... > 1. For the PV interface of the stub domain (LIBXL_NIC_TYPE_VIF), > renames vifX+1.0 -> foo-emu (*) > 2. For the PV interface of the real domain > (LIBXL_NIC_TYPE_VIF_IOEMU part 1), renames vifX.0 -> foo > 3. For the emu interface of the real domain > (LIBXL_NIC_TYPE_VIF_IOEMU part 2) renames vifX.0 -> foo-emu > > The rename in #3 fails, because foo-emu already exists. But in fact this > call to the script should never happen for a domain with a stub domain > since the emulated device in this case is within the stub domain, not > the driver domain.My slightly skanky fix, still with debugging still, is below. I''m posting it now because it''s late and I''m going home. I think a better fix would be to determine up front which scripts needed running and track that instead of num_execs. diff -r 574bece33c88 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Jul 20 15:58:18 2012 +0100 +++ b/tools/libxl/libxl_dm.c Fri Jul 20 17:35:54 2012 +0100 @@ -616,6 +616,25 @@ static char ** libxl__build_device_model } } +static void libxl__dm_nics_from_hvm_guest_config(libxl__gc *gc, + libxl_domain_config * const guest_config, + libxl_domain_config *dm_config) +{ + int i, nr = guest_config->num_nics; + + GCNEW_ARRAY(dm_config->nics, nr); + + for (i=0; i<nr; i++) { + dm_config->nics[i] = guest_config->nics[i]; + if (dm_config->nics[i].ifname) + dm_config->nics[i].ifname = GCSPRINTF("%s" TAP_DEVICE_SUFFIX, + dm_config->nics[i].ifname); + dm_config->nics[i].nictype = LIBXL_NIC_TYPE_VIF; + } + + dm_config->num_nics = nr; +} + static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, const libxl_domain_config *guest_config, libxl_device_vfb *vfb, @@ -764,8 +783,7 @@ void libxl__spawn_stub_dm(libxl__egc *eg dm_config->disks = guest_config->disks; dm_config->num_disks = guest_config->num_disks; - dm_config->nics = guest_config->nics; - dm_config->num_nics = guest_config->num_nics; + libxl__dm_nics_from_hvm_guest_config(gc, guest_config, dm_config); dm_config->c_info.run_hotplug_scripts guest_config->c_info.run_hotplug_scripts; diff -r 574bece33c88 tools/libxl/libxl_linux.c --- a/tools/libxl/libxl_linux.c Fri Jul 20 15:58:18 2012 +0100 +++ b/tools/libxl/libxl_linux.c Fri Jul 20 17:35:54 2012 +0100 @@ -117,11 +117,13 @@ static char **get_hotplug_env(libxl__gc env[nr++] = libxl__strdup(gc, libxl__device_nic_devname(gc, dev->domid, dev->devid, LIBXL_NIC_TYPE_VIF_IOEMU)); + fprintf(stderr, "dom%d: %d: VIF_IOEMU %s = %s\n", dev->domid, dev->devid, env[nr-2], env[nr-1]); case LIBXL_NIC_TYPE_VIF: env[nr++] = "vif"; env[nr++] = libxl__strdup(gc, libxl__device_nic_devname(gc, dev->domid, dev->devid, LIBXL_NIC_TYPE_VIF)); + fprintf(stderr, "dom%d: %d: VIF %s = %s\n", dev->domid, dev->devid, env[nr-2], env[nr-1]); break; default: return NULL; @@ -159,11 +161,22 @@ static int libxl__hotplug_nic(libxl__gc rc = ERROR_FAIL; goto out; } + + fprintf(stderr, "%s: type=%s num_exec=%d action=%d hasstubdom=%s isstubdom=%s\n", + __func__, libxl_nic_type_to_string(nictype), + num_exec, action, + libxl_get_stubdom_id(CTX, dev->domid) ? "yes" : "no", + libxl_is_stubdom(CTX, dev->domid, NULL) ? "yes" : "no"); + if (nictype == LIBXL_NIC_TYPE_VIF && num_exec != 0) { rc = 0; goto out; } - + if (nictype == LIBXL_NIC_TYPE_VIF_IOEMU && num_exec != 0 && libxl_get_stubdom_id(CTX, dev->domid)) { + fprintf(stderr, "skipping EMU for domain w/ stubdom\n"); + rc = 0; + goto out; + } *env = get_hotplug_env(gc, dev); if (!env) { rc = ERROR_FAIL;
Ian Campbell
2012-Jul-20 16:39 UTC
Re: [PATCH v10 12/19] libxl: rename _IOEMU nic type to VIF_IOEMU
On Fri, 2012-07-20 at 17:34 +0100, Ian Campbell wrote:> On Fri, 2012-07-20 at 15:12 +0100, Roger Pau Monne wrote: > > This change will avoid the confusion caused by the fact that IOEMU > > means both PV and TAP network interfaces. > > You missed some in comments.Also I think it makes the type argument to libxl__device_nic_devname a bit misleading. Should perhaps become "bool emulated" ? Ian.
Ian Jackson
2012-Jul-20 17:21 UTC
Re: [PATCH v10 05/19] libxl: move bootloader data strucutres and prototypes
Roger Pau Monne writes ("[PATCH v10 05/19] libxl: move bootloader data
strucutres and prototypes"):> Move bootloader and related data after all the device stuff, since
> libxl__bootloader_state will depend on libxl__ao_device (to perform
> the local attach of a device).
>
> This is pure code motion.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Ian Jackson
2012-Jul-20 17:24 UTC
Re: [PATCH v10 06/19] libxl: refactor disk addition to take a helper
Roger Pau Monne writes ("[PATCH v10 06/19] libxl: refactor disk addition to
take a helper"):> Change libxl__device_disk_add to no longer take a xs transaction and
> instead pass a helper for the local attach case that''s used to get
the
> free vdev.
>
> This function contains some non-functional changes due to an
> indentation change.
...> +/* Specific function called directly only by local disk attach,
> + * all other users should instead use the regular
> + * libxl__device_disk_add wrapper
> + *
> + * The (optionally) passed function get_vdev_user will be used to
> + * set the vdev the disk should be attached to. When it is set the caller
> + * must also pass blkdev_start, which will be passed to get_vdev_user.
> + *
> + * The passed get_vdev_user function is also in charge of printing
> + * the corresponding error message when appropiate.
> + */
> +static int device_disk_add(libxl__gc *gc, uint32_t domid,
> + libxl_device_disk *disk,
> + void *get_vdev_user(libxl__gc *, const char *,
> + xs_transaction_t),
> + const char *blkdev_start)
Uh, I meant:
+ char *get_vdev(libxl__gc *, void *user,
+ xs_transaction_t),
+ void *get_vdev_user)
I was trying to suggest that device_disk_add shouldn''t need to know
the meaning of the parameter which you''ve called blkdev_start.
I think what you have now is even odder than before.
Ian.
Ian Jackson
2012-Jul-20 18:03 UTC
Re: [PATCH v10 07/19] libxl: convert libxl__device_disk_local_attach to an async op
Roger Pau Monne writes ("[PATCH v10 07/19] libxl: convert
libxl__device_disk_local_attach to an async op"):> This will be needed in future patches, when libxl__device_disk_add
> becomes async also. Create a new status structure that defines the
> local attach of a disk device and use it in
> libxl__device_disk_local_attach.
>
> This is done in this patch to split the changes introduced when
> libxl__device_disk_add becomes async.
Thanks for this. See my other comment earlier today about the error
handling. The rest of my comments are below. Very nearly there I
think.
Thanks,
Ian.
> @@ -2234,39 +2237,102 @@ char * libxl__device_disk_local_attach(libxl__gc
*gc,
> goto out;
> }
> if (dev != NULL)
> - ret = strdup(dev);
> - return ret;
> + dls->diskpath = strdup(dev);
libxl__strdup, surely. And I''m not sure I understand why this string
can''t be from the gc. In any case the memory allocation strategy
should be documented in the struct. Eg:
> +struct libxl__disk_local_state {
...> + /* filled by libxl__device_disk_local_initiate_attach */
> + char *diskpath;
+ char *diskpath; /* from the gc */
or
+ char *diskpath; /* non-0 whenever Attached, disposed by detach */
or something.
> +void libxl__device_disk_local_initiate_detach(libxl__egc *egc,
> + libxl__disk_local_state *dls)
> {
...> +out:
> + if (dls->diskpath) {
> + free(dls->diskpath);
> + dls->diskpath = 0;
> + }
> + /*
> + * If there was an error in dls->rc, it means we have been called
from
> + * a failed execution of libxl__device_disk_local_initiate_attach,
> + * so return the original error.
> + */
> + rc = dls->rc ? dls->rc : rc;
> + dls->callback(egc, dls, rc);
> + return;
This seems to occur twice. Once here and once in
local_device_detach_cb. Clearly they should be unified, probably by
dismembering local_device_detach_cb:
...> +static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device
*aodev)
> +{
> + STATE_AO_GC(aodev->ao);
> + libxl__disk_local_state *dls = CONTAINER_OF(aodev, *dls, aodev);
> + int rc;
> +
> + if (dls->diskpath) {
> + free(dls->diskpath);
> + dls->diskpath = 0;
> + }
> +
> + if (aodev->rc) {
...> + }
> +
> +out:
> + /*
> + * If there was an error in dls->rc, it means we have been called
from
> + * a failed execution of libxl__device_disk_local_initiate_attach,
> + * so return the original error.
> + */
> + rc = dls->rc ? dls->rc : aodev->rc;
> + dls->callback(egc, dls, rc);
> + return;
> diff --git a/tools/libxl/libxl_bootloader.c
b/tools/libxl/libxl_bootloader.c
> index 7ebc0df..4bcca3d 100644
> --- a/tools/libxl/libxl_bootloader.c
> +++ b/tools/libxl/libxl_bootloader.c
> @@ -249,10 +245,32 @@ static void bootloader_setpaths(libxl__gc *gc,
libxl__bootloader_state *bl)
...> +/* Callbacks */
> +
> +static void bootloader_finished_cb(libxl__egc *egc,
> + libxl__disk_local_state *dls,
> + int rc);
Wouldn''t this be better named
bootloader_local_detached_cb
or something ? Because the function called when the bootloader
finishes is bootloader_callback.
> static void bootloader_callback(libxl__egc *egc, libxl__bootloader_state
*bl,
> int rc)
> {
> bootloader_cleanup(egc, bl);
> +
> + bl->dls.callback = bootloader_finished_cb;
> + libxl__device_disk_local_initiate_detach(egc, &bl->dls);
> +}
> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
> index 4f3a232..ab590be 100644
...> +/*
> + * Clears the internal error code, can be called multiple times, and
> + * must be called before libxl__device_disk_local_initiate_attach.
> + */
> +static inline void libxl__device_disk_local_init(libxl__disk_local_state
*dls)
"Clears the internal error code" should not be in interface
documentation, since it refers to an implementation detail.
Perhaps you mean "Prepares a dls for use". You should explicitly
state which of the documented states it transitions between. I guess
"Undefined -> Idle" ?
> +/* Make a disk available in this (the control) domain. Always calls
> + * dls->callback when finished.
> + * State Idle -> Attaching
> + *
> + * The state on which the device is when in the callback depends
> + * on the passed value of rc:
> + * Attached if rc == 0
> + * Idle if rc != 0
A nit: this would be slightly easier to read if there the two
subordinate options were indented.
Also correct English would be "the state in which the device is" but
really you mean the state of the dls, not of the device. I would
write:
+ * The state of dls on entry to the callback depends on the value
+ * of rc passed to the callback:
+ * rc == 0: Attached if rc == 0
+ * rc != 0: Idle
> +_hidden void libxl__device_disk_local_initiate_attach(libxl__egc *egc,
> + libxl__disk_local_state
*dls);
> +
> +/* Disconnects a disk device form the control domain. If the passed
> + * dls is not attached (or has already been detached),
> + * libxl__device_disk_local_initiate_detach will just call the callback
> + * directly.
> + * State Idle/Attached -> Detaching
> + *
> + * The state on which the device is when in the callback is Idle.
Again, "in which", "dls" or reword as above.
> @@ -2097,10 +2142,10 @@ struct libxl__bootloader_state {
> /* Should be zeroed by caller on entry. Will be filled in by
> * bootloader machinery; represents the local attachment of the
> * disk for the benefit of the bootloader. Must be detached by
> - * the caller using libxl__device_disk_local_detach, but only
> + * the caller using libxl__device_disk_local_initiate_detach, but only
> * after the domain''s kernel and initramfs have been loaded
into
> * memory and the file references disposed of. */
Is this last comment, which I wrote, wrong ? That is, as previously
discussed, is it legal to detach the disk before the kernel and
initramfs have been loaded into the domain''s memory ?
I think it probably is. If so perhaps I should write a separate
patch to fix it.
Thanks,
Ian.
Ian Jackson
2012-Jul-20 18:04 UTC
Re: [PATCH v10 09/19] libxl: convert libxl_device_disk_add to an async op
Roger Pau Monne writes ("[PATCH v10 09/19] libxl: convert
libxl_device_disk_add to an async op"):> Changes since v9:
> * Removed a wrong comment hunk.
Did that make it into the other patch it should have been in ?
Anyway, this patch is
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Ian Jackson
2012-Jul-20 18:06 UTC
Re: [PATCH v10 13/19] libxl: set correct nic type depending on the guest
Roger Pau Monne writes ("[PATCH v10 13/19] libxl: set correct nic type
depending on the guest"):> Fix the use of nic type, which results in the following for each type
> of domain:
...> > * HVM: let the user choose, if none specified use VIF_IOEMU.
> * PV: use VIF always.
I think attempts by the user to use VIF_IOEMU with a PV domain should
be rejected with ERROR_INVAL, not silently ignored.
> -int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic)
> +int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic,
> + uint32_t domid)
...> + case LIBXL_DOMAIN_TYPE_PV:
> + nic->nictype = LIBXL_NIC_TYPE_VIF;
> + break;
Somewhere here.
Thanks,
Ian.
Ian Jackson
2012-Jul-20 18:08 UTC
Re: [PATCH v10 17/19] libxl: convert libxl_device_vkb_add to an async operation
Roger Pau Monne writes ("[PATCH v10 17/19] libxl: convert
libxl_device_vkb_add to an async operation"):> Split libxl_device_vkb_add into libxl__device_vkb_add (to be used
> inside already running ao''s), and make libxl_device_vkb_add a stub
to
> call libxl__device_vkb_add.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
But if you are reposting for any reason you might like
> - dcs->aodevs.size = d_config->num_disks;
> + if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM &&
!d_config->num_vkbs) {
> + d_config->vkbs = libxl__zalloc(NOGC,
sizeof(*d_config->vkbs));
to turn that into a use of GCNEW. Or move
> + libxl_device_vkb_init(&d_config->vkbs[0]);
> + d_config->num_vkbs = 1;
that assignment up and use GCNEW_ARRAY. Up to you.
Thanks,
Ian.
Ian Jackson
2012-Jul-20 18:11 UTC
Re: [PATCH v10 18/19] libxl: convert libxl_device_vfb_add to an async operation
Roger Pau Monne writes ("[PATCH v10 18/19] libxl: convert
libxl_device_vfb_add to an async operation"):> Split libxl_device_vfb_add into libxl__device_vfb_add (to be used
> inside already running ao''s), and make libxl_device_vfb_add a stub
> to call libxl__device_vfb_add.
If I''m not mistaken this has the effect of newly waiting for vfbs to
enter the correct state on xenstore. Is that intentional ? If so it
needs to be explained in the commit message.
Aside from that it looks plausible.
Thanks,
Ian.
Roger Pau Monne
2012-Jul-23 08:58 UTC
Re: [PATCH v10 17/19] libxl: convert libxl_device_vkb_add to an async operation
Ian Jackson wrote:> Roger Pau Monne writes ("[PATCH v10 17/19] libxl: convert libxl_device_vkb_add to an async operation"): >> Split libxl_device_vkb_add into libxl__device_vkb_add (to be used >> inside already running ao''s), and make libxl_device_vkb_add a stub to >> call libxl__device_vkb_add. > > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> > > But if you are reposting for any reason you might like > >> - dcs->aodevs.size = d_config->num_disks; >> + if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM && !d_config->num_vkbs) { >> + d_config->vkbs = libxl__zalloc(NOGC, sizeof(*d_config->vkbs)); > > to turn that into a use of GCNEW. Or move > >> + libxl_device_vkb_init(&d_config->vkbs[0]); >> + d_config->num_vkbs = 1; > > that assignment up and use GCNEW_ARRAY. Up to you.I can''t use GCNEW because this is not allocated from the GC (I''m passing NOGC to zalloc). Thanks.
Roger Pau Monne
2012-Jul-23 09:22 UTC
Re: [PATCH v10 16/19] libxl: call hotplug scripts for nic devices from libxl
Ian Campbell wrote:>> + switch (nictype) { >> + case LIBXL_NIC_TYPE_VIF_IOEMU: >> + env[nr++] = "INTERFACE"; >> + env[nr++] = libxl__strdup(gc, libxl__device_nic_devname(gc, >> + dev->domid, dev->devid, >> + LIBXL_NIC_TYPE_VIF_IOEMU)); > > Is this fall-through of the case deliberate? If so then a comment would > be good. > > However I''m not sure about this. It seems like the hotplug scripts are > only called once in the VIF_IOEMU case? I would expect one call for the > PV VIF device and one for the TAP device? Perhaps I''m just missing the > location of the other one? Is this "num_exec" variable involved in some > way? But you don''t propagate that to get_hotplug_env() and therefore > include *both* sets of env vars?Yes, we perform two calls, one for the vif device and one for the tap device. I agree that this approach is not really clear, what might be more suitable is to return arrays of hotplug execution items from get_hotplug_script_info: args { {"/etc/xen/script/foo", "bar"}, {"/etc/xen/script/foo2", "bar2"}, NULL }; And the same with env, so we keep executing items until we reach args[i] == NULL.> In any case something related seems to be broken for guests which use a > stub domain and use vifname=foo. What I see in that case is the script > called three times... > 1. For the PV interface of the stub domain (LIBXL_NIC_TYPE_VIF), > renames vifX+1.0 -> foo-emu (*) > 2. For the PV interface of the real domain > (LIBXL_NIC_TYPE_VIF_IOEMU part 1), renames vifX.0 -> foo > 3. For the emu interface of the real domain > (LIBXL_NIC_TYPE_VIF_IOEMU part 2) renames vifX.0 -> foo-emu > > The rename in #3 fails, because foo-emu already exists. But in fact this > call to the script should never happen for a domain with a stub domain > since the emulated device in this case is within the stub domain, not > the driver domain.As talked, the correct fix for this seems to detect if the guest has a stubdom and return 0 on the second call to get_hotplug_script_info, to prevent the execution of #3.> (*) This is with the patch I posted earlier to rename the stub domain''s > vif with a -emu suffix. Without that then the clash is at #2 instead.
Ian Campbell
2012-Jul-23 09:26 UTC
Re: [PATCH v10 17/19] libxl: convert libxl_device_vkb_add to an async operation
On Mon, 2012-07-23 at 09:58 +0100, Roger Pau Monne wrote:> Ian Jackson wrote: > > Roger Pau Monne writes ("[PATCH v10 17/19] libxl: convert libxl_device_vkb_add to an async operation"): > >> Split libxl_device_vkb_add into libxl__device_vkb_add (to be used > >> inside already running ao''s), and make libxl_device_vkb_add a stub to > >> call libxl__device_vkb_add. > > > > > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> > > > > But if you are reposting for any reason you might like > > > >> - dcs->aodevs.size = d_config->num_disks; > >> + if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM && !d_config->num_vkbs) { > >> + d_config->vkbs = libxl__zalloc(NOGC, sizeof(*d_config->vkbs)); > > > > to turn that into a use of GCNEW. Or move > > > >> + libxl_device_vkb_init(&d_config->vkbs[0]); > >> + d_config->num_vkbs = 1; > > > > that assignment up and use GCNEW_ARRAY. Up to you. > > I can''t use GCNEW because this is not allocated from the GC (I''m passing > NOGC to zalloc).GCNEW uses libxl__zalloc which can take a NOGC, as can GCNEW_ARRAY via libxl__calloc. In both cases perhaps the doc comment needs an update. Ian.
Roger Pau Monne
2012-Jul-23 11:32 UTC
Re: [PATCH v10 07/19] libxl: convert libxl__device_disk_local_attach to an async op
Ian Jackson wrote:> Roger Pau Monne writes ("[PATCH v10 07/19] libxl: convert libxl__device_disk_local_attach to an async op"): >> This will be needed in future patches, when libxl__device_disk_add >> becomes async also. Create a new status structure that defines the >> local attach of a disk device and use it in >> libxl__device_disk_local_attach. >> >> This is done in this patch to split the changes introduced when >> libxl__device_disk_add becomes async. > > Thanks for this. See my other comment earlier today about the error > handling. The rest of my comments are below. Very nearly there I > think. > > Thanks, > Ian. > >> @@ -2234,39 +2237,102 @@ char * libxl__device_disk_local_attach(libxl__gc *gc, >> goto out; >> } >> if (dev != NULL) >> - ret = strdup(dev); >> - return ret; >> + dls->diskpath = strdup(dev); > > libxl__strdup, surely. And I''m not sure I understand why this string > can''t be from the gc. In any case the memory allocation strategy > should be documented in the struct. Eg: > >> +struct libxl__disk_local_state { > ... >> + /* filled by libxl__device_disk_local_initiate_attach */ >> + char *diskpath; > > + char *diskpath; /* from the gc */ > or > + char *diskpath; /* non-0 whenever Attached, disposed by detach */ > or something.I''ve changed diskpath to be allocated from the gc.>> +void libxl__device_disk_local_initiate_detach(libxl__egc *egc, >> + libxl__disk_local_state *dls) >> { > ... >> +out: >> + if (dls->diskpath) { >> + free(dls->diskpath); >> + dls->diskpath = 0; >> + } >> + /* >> + * If there was an error in dls->rc, it means we have been called from >> + * a failed execution of libxl__device_disk_local_initiate_attach, >> + * so return the original error. >> + */ >> + rc = dls->rc ? dls->rc : rc; >> + dls->callback(egc, dls, rc); >> + return; > > This seems to occur twice. Once here and once in > local_device_detach_cb. Clearly they should be unified, probably by > dismembering local_device_detach_cb:I''m calling local_device_detach_cb instead of the callback directly.> ... >> +static void local_device_detach_cb(libxl__egc *egc, libxl__ao_device *aodev) >> +{ >> + STATE_AO_GC(aodev->ao); >> + libxl__disk_local_state *dls = CONTAINER_OF(aodev, *dls, aodev); >> + int rc; >> + >> + if (dls->diskpath) { >> + free(dls->diskpath); >> + dls->diskpath = 0; >> + } >> + >> + if (aodev->rc) { > ... >> + } >> + >> +out: >> + /* >> + * If there was an error in dls->rc, it means we have been called from >> + * a failed execution of libxl__device_disk_local_initiate_attach, >> + * so return the original error. >> + */ >> + rc = dls->rc ? dls->rc : aodev->rc; >> + dls->callback(egc, dls, rc); >> + return; > > >> diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c >> index 7ebc0df..4bcca3d 100644 >> --- a/tools/libxl/libxl_bootloader.c >> +++ b/tools/libxl/libxl_bootloader.c >> @@ -249,10 +245,32 @@ static void bootloader_setpaths(libxl__gc *gc, libxl__bootloader_state *bl) > ... >> +/* Callbacks */ >> + >> +static void bootloader_finished_cb(libxl__egc *egc, >> + libxl__disk_local_state *dls, >> + int rc); > > Wouldn''t this be better named > bootloader_local_detached_cb > or something ? Because the function called when the bootloader > finishes is bootloader_callback.Yes, changed to bootloader_local_detached_cb.>> static void bootloader_callback(libxl__egc *egc, libxl__bootloader_state *bl, >> int rc) >> { >> bootloader_cleanup(egc, bl); >> + >> + bl->dls.callback = bootloader_finished_cb; >> + libxl__device_disk_local_initiate_detach(egc, &bl->dls); >> +} > >> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h >> index 4f3a232..ab590be 100644 > ... >> +/* >> + * Clears the internal error code, can be called multiple times, and >> + * must be called before libxl__device_disk_local_initiate_attach. >> + */ >> +static inline void libxl__device_disk_local_init(libxl__disk_local_state *dls) > > "Clears the internal error code" should not be in interface > documentation, since it refers to an implementation detail. > > Perhaps you mean "Prepares a dls for use". You should explicitly > state which of the documented states it transitions between. I guess > "Undefined -> Idle" ?Changed the comment, and added the state transition.>> +/* Make a disk available in this (the control) domain. Always calls >> + * dls->callback when finished. >> + * State Idle -> Attaching >> + * >> + * The state on which the device is when in the callback depends >> + * on the passed value of rc: >> + * Attached if rc == 0 >> + * Idle if rc != 0 > > A nit: this would be slightly easier to read if there the two > subordinate options were indented. > > Also correct English would be "the state in which the device is" but > really you mean the state of the dls, not of the device. I would > write: > + * The state of dls on entry to the callback depends on the value > + * of rc passed to the callback: > + * rc == 0: Attached if rc == 0 > + * rc != 0: Idle > >> +_hidden void libxl__device_disk_local_initiate_attach(libxl__egc *egc, >> + libxl__disk_local_state *dls); >> + >> +/* Disconnects a disk device form the control domain. If the passed >> + * dls is not attached (or has already been detached), >> + * libxl__device_disk_local_initiate_detach will just call the callback >> + * directly. >> + * State Idle/Attached -> Detaching >> + * >> + * The state on which the device is when in the callback is Idle. > > Again, "in which", "dls" or reword as above.I''ve addressed both comments.>> @@ -2097,10 +2142,10 @@ struct libxl__bootloader_state { >> /* Should be zeroed by caller on entry. Will be filled in by >> * bootloader machinery; represents the local attachment of the >> * disk for the benefit of the bootloader. Must be detached by >> - * the caller using libxl__device_disk_local_detach, but only >> + * the caller using libxl__device_disk_local_initiate_detach, but only >> * after the domain''s kernel and initramfs have been loaded into >> * memory and the file references disposed of. */ > > Is this last comment, which I wrote, wrong ? That is, as previously > discussed, is it legal to detach the disk before the kernel and > initramfs have been loaded into the domain''s memory ? > > I think it probably is. If so perhaps I should write a separate > patch to fix it.I didn''t change this comment, but if you want I can do that in this patch. The bootloader makes a copy of the kernel/initramfs to somewhere, and that is what we load to the memory.
Ian Jackson
2012-Jul-23 11:44 UTC
Re: [PATCH v10 17/19] libxl: convert libxl_device_vkb_add to an async operation
Roger Pau Monne writes ("Re: [PATCH v10 17/19] libxl: convert
libxl_device_vkb_add to an async operation"):> I can''t use GCNEW because this is not allocated from the GC
(I''m passing
> NOGC to zalloc).
Oh of course, sorry.
Ian.
Roger Pau Monne
2012-Jul-23 11:58 UTC
Re: [PATCH v10 18/19] libxl: convert libxl_device_vfb_add to an async operation
Ian Jackson wrote:> Roger Pau Monne writes ("[PATCH v10 18/19] libxl: convert libxl_device_vfb_add to an async operation"): >> Split libxl_device_vfb_add into libxl__device_vfb_add (to be used >> inside already running ao''s), and make libxl_device_vfb_add a stub >> to call libxl__device_vfb_add. > > If I''m not mistaken this has the effect of newly waiting for vfbs to > enter the correct state on xenstore. Is that intentional ?Yes, libxl waits for vfb to reach state 2 (InitWait), is that ok?> If so it > needs to be explained in the commit message.Ok, I will rework on the commit message.> Aside from that it looks plausible. > > Thanks, > Ian.
Ian Campbell
2012-Jul-23 12:17 UTC
Re: [PATCH v10 01/19] execute hotplug scripts from libxl v10
On Fri, 2012-07-20 at 15:12 +0100, Roger Pau Monne wrote:> Changes are available in the git repository at: > git://xenbits.xen.org/people/royger/xen.git hotplug.v10 > > Roger Pau Monne (19): > *libxl: check backend state before setting it to "closing" > libxl: change ao_device_remove to ao_device > *libxl: move device model creation prototypes > *libxl: convert libxl_domain_destroy to an async op > *libxl: move bootloader data strucutres and prototypesIan J has now acked all of these, so I have applied them.> libxl: refactor disk addition to take a helper > libxl: convert libxl__device_disk_local_attach to an async op > *libxl: rename vifs to nics > *libxl: convert libxl_device_disk_add to an async op > *libxl: convert libxl_device_nic_add to an async operation > *libxl: add option to choose who executes hotplug scripts > *libxl: rename _IOEMU nic type to VIF_IOEMU > libxl: set correct nic type depending on the guest > *libxl: use libxl__xs_path_cleanup on device_destroy > *libxl: call hotplug scripts for disk devices from libxl > *libxl: call hotplug scripts for nic devices from libxl > libxl: convert libxl_device_vkb_add to an async operation > libxl: convert libxl_device_vfb_add to an async operation > xl: main_blockdetach don''t call destroy if remove succeeds > > * Acked > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel