|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v5 3/8] libxl: add a transaction parameter to libxl__device_generic_add
On Fri, 2012-05-04 at 12:13 +0100, Stefano Stabellini wrote:
> Add a xs_transaction_t parameter to libxl__device_generic_add, if it is
> XBT_NULL, allocate a proper one.
>
> Update all the callers.
>
> This patch contains a large number of unchecked xenstore operations, we
> might want to fix this in the future.
>
> Changes in v4:
> - libxl__device_generic_add: do not end the transaction is the caller
> provided it;
> - libxl__device_generic_add: fix success exit path.
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> ---
> tools/libxl/libxl.c | 10 +++++-----
> tools/libxl/libxl_device.c | 17 +++++++++++------
> tools/libxl/libxl_internal.h | 4 ++--
> tools/libxl/libxl_pci.c | 2 +-
> 4 files changed, 19 insertions(+), 14 deletions(-)
>
> diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
> index 1357efc..525f0d6 100644
> --- a/tools/libxl/libxl.c
> +++ b/tools/libxl/libxl.c
> @@ -1401,7 +1401,7 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t
> domid, libxl_device_disk *dis
> flexarray_append(front, "device-type");
> flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk");
>
> - libxl__device_generic_add(gc, &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));
>
> @@ -1802,7 +1802,7 @@ 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, &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));
>
> @@ -2080,7 +2080,7 @@ int libxl__device_console_add(libxl__gc *gc, uint32_t
> domid,
> flexarray_append(front, LIBXL_XENCONSOLE_PROTOCOL);
> }
>
> - libxl__device_generic_add(gc, &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));
> rc = 0;
> @@ -2151,7 +2151,7 @@ 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, &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));
> rc = 0;
> @@ -2284,7 +2284,7 @@ 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, &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));
> rc = 0;
> diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
> index c7e057d..88cdc7d 100644
> --- a/tools/libxl/libxl_device.c
> +++ b/tools/libxl/libxl_device.c
> @@ -58,14 +58,14 @@ int libxl__parse_backend_path(libxl__gc *gc,
> return libxl__device_kind_from_string(strkind, &dev->backend_kind);
> }
>
> -int libxl__device_generic_add(libxl__gc *gc, libxl__device *device,
> - char **bents, char **fents)
> +int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t,
> + libxl__device *device, char **bents, char **fents)
> {
> libxl_ctx *ctx = libxl__gc_owner(gc);
> char *frontend_path, *backend_path;
> - xs_transaction_t t;
> struct xs_permissions frontend_perms[2];
> struct xs_permissions backend_perms[2];
> + int create_transaction = t == XBT_NULL;
>
> frontend_path = libxl__device_frontend_path(gc, device);
> backend_path = libxl__device_backend_path(gc, device);
> @@ -81,7 +81,8 @@ int libxl__device_generic_add(libxl__gc *gc, libxl__device
> *device,
> backend_perms[1].perms = XS_PERM_READ;
>
> retry_transaction:
> - t = xs_transaction_start(ctx->xsh);
> + if (create_transaction)
> + t = xs_transaction_start(ctx->xsh);
> /* FIXME: read frontend_path and check state before removing stuff */
>
> if (fents) {
> @@ -100,13 +101,17 @@ retry_transaction:
> libxl__xs_writev(gc, t, backend_path, bents);
> }
>
> + if (!create_transaction)
> + return 0;
> +
> if (!xs_transaction_end(ctx->xsh, t, 0)) {
> if (errno == EAGAIN)
> goto retry_transaction;
> - else
> + else {
> LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xs transaction failed");
> + return ERROR_FAIL;
> + }
> }
> -
> return 0;
> }
>
> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
> index 965d13b..2c8f06a 100644
> --- a/tools/libxl/libxl_internal.h
> +++ b/tools/libxl/libxl_internal.h
> @@ -683,8 +683,8 @@ _hidden int libxl__device_console_add(libxl__gc *gc,
> uint32_t domid,
> libxl__device_console *console,
> libxl__domain_build_state *state);
>
> -_hidden int libxl__device_generic_add(libxl__gc *gc, libxl__device *device,
> - char **bents, char **fents);
> +_hidden int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t,
> + libxl__device *device, char **bents, char **fents);
> _hidden char *libxl__device_backend_path(libxl__gc *gc, libxl__device
> *device);
> _hidden char *libxl__device_frontend_path(libxl__gc *gc, libxl__device
> *device);
> _hidden int libxl__parse_backend_path(libxl__gc *gc, const char *path,
> diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
> index 3856bd9..335c645 100644
> --- a/tools/libxl/libxl_pci.c
> +++ b/tools/libxl/libxl_pci.c
> @@ -102,7 +102,7 @@ int libxl__create_pci_backend(libxl__gc *gc, uint32_t
> domid,
> flexarray_append_pair(front, "backend-id", libxl__sprintf(gc, "%d", 0));
> flexarray_append_pair(front, "state", libxl__sprintf(gc, "%d", 1));
>
> - libxl__device_generic_add(gc, &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));
>
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |