|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v3 04/11] libxl: add generic function to add device
From: Oleksandr Grytsov <oleksandr_grytsov@xxxxxxxx>
Add libxl__device_add functio.
Almost all devices have similar libxl__device_xxxx_add function.
This generic function implements same functionality but
using the device handling framework. The device specific
part this is setting xen store configuration. This part
is moved to set_xenstore_config callback of the device framework.
Signed-off-by: Oleksandr Grytsov <oleksandr_grytsov@xxxxxxxx>
---
tools/libxl/libxl_create.c | 2 +
tools/libxl/libxl_device.c | 103 +++++++++++++++++++++++++++++++++++++++++++
tools/libxl/libxl_internal.h | 15 +++++++
tools/libxl/libxl_usb.c | 2 +
tools/libxl/libxl_vdispl.c | 17 ++++++-
5 files changed, 138 insertions(+), 1 deletion(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index bffbc45..4e5ba29 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -1430,6 +1430,8 @@ out:
#define libxl_device_dtdev_list NULL
#define libxl_device_dtdev_compare NULL
+#define libxl__device_from_dtdev NULL
+#define libxl__device_dtdev_setdefault NULL
static DEFINE_DEVICE_TYPE_STRUCT(dtdev);
const struct libxl_device_type *device_type_tbl[] = {
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index 8bcfa2b..e202503 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -1793,6 +1793,109 @@ out:
return AO_CREATE_FAIL(rc);
}
+static int device_add_domain_config(libxl__gc *gc, uint32_t domid,
+ const struct libxl_device_type *dt,
+ void *type)
+{
+ int rc;
+ libxl_domain_config d_config;
+ libxl__domain_userdata_lock *lock = NULL;
+ int *num_dev;
+ int i;
+ void *item = NULL;
+
+ libxl_domain_config_init(&d_config);
+
+ lock = libxl__lock_domain_userdata(gc, domid);
+ if (!lock) {
+ rc = ERROR_LOCK_FAIL; goto out;
+ }
+
+ rc = libxl__get_domain_configuration(gc, domid, &d_config);
+ if (rc) goto out;
+
+ num_dev = libxl__device_type_get_num(dt, &d_config);
+
+ /* Check for existing device */
+ for (i = 0; i < *num_dev; i++) {
+ if (dt->compare(libxl__device_type_get_elem(dt, &d_config, i), type)) {
+ item = libxl__device_type_get_elem(dt, &d_config, i);
+ }
+ }
+
+ if (!item) {
+ void **devs= libxl__device_type_get_ptr(dt, &d_config);
+ *devs = libxl__realloc(NOGC, *devs,
+ dt->dev_elem_size * (*num_dev + 1));
+ item = libxl__device_type_get_elem(dt, &d_config, *num_dev);
+ (*num_dev)++;
+ } else {
+ dt->dispose(item);
+ }
+
+ dt->init(item);
+ dt->copy(CTX, item, type);
+
+ rc = libxl__dm_check_start(gc, &d_config, domid);
+ if (rc) goto out;
+
+ rc = libxl__set_domain_configuration(gc, domid, &d_config);
+ if (rc) goto out;
+
+ rc = 0;
+
+out:
+ if (lock) libxl__unlock_domain_userdata(lock);
+ libxl_domain_config_dispose(&d_config);
+ return rc;
+}
+
+void libxl__device_add(libxl__egc *egc, uint32_t domid,
+ const struct libxl_device_type *dt, void *type,
+ libxl__ao_device *aodev)
+{
+ STATE_AO_GC(aodev->ao);
+ libxl__device *device;
+ int rc;
+
+ rc = dt->set_default(gc, domid, type);
+ if (rc) goto out;
+
+ GCNEW(device);
+ rc = dt->to_device(gc, domid, type, device);
+ if ( rc != 0 ) goto out;
+
+ rc = libxl__device_exists(gc, XBT_NULL, device);
+ if (rc < 0) goto out;
+ if (rc == 1) { /* already exists in xenstore */
+ LOGD(ERROR, domid, "device already exists in xenstore");
+ aodev->action = LIBXL__DEVICE_ACTION_ADD; /* for error message */
+ rc = ERROR_DEVICE_EXISTS;
+ goto out;
+ }
+
+ if (aodev->update_json) {
+ rc = device_add_domain_config(gc, domid, dt, type);
+ if (rc) goto out;
+ }
+
+ if (dt->set_xenstore_config) {
+ rc = dt->set_xenstore_config(gc, domid, type);
+ if (rc) goto out;
+ }
+
+ aodev->dev = device;
+ aodev->action = LIBXL__DEVICE_ACTION_ADD;
+ libxl__wait_device_connection(egc, aodev);
+
+ rc = 0;
+
+out:
+ aodev->rc = rc;
+ if(rc) aodev->callback(egc, aodev);
+ return;
+}
+
void* libxl__device_list(const struct libxl_device_type *dt,
libxl_ctx *ctx, uint32_t domid, int *num)
{
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index c192559..3397655 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -3484,13 +3484,17 @@ struct libxl_device_type {
void (*add)(libxl__egc *, libxl__ao *, uint32_t, libxl_domain_config *,
libxl__multidev *);
void *(*list)(libxl_ctx *, uint32_t, int *);
+ int (*set_default)(libxl__gc *, uint32_t, void *);
+ int (*to_device)(libxl__gc *, uint32_t, void *, libxl__device *);
void (*init)(void *);
+ void (*copy)(libxl_ctx *, void *, void *);
void (*dispose)(void *);
int (*compare)(void *, void *);
void (*merge)(libxl_ctx *, void *, void *);
int (*dm_needed)(void *, unsigned);
void (*update_config)(libxl__gc *, void *, void *);
int (*from_xenstore)(libxl__gc *, const char *, uint32_t, void *);
+ int (*set_xenstore_config)(libxl__gc *, uint32_t, void *);
};
#define DEFINE_DEVICE_TYPE_STRUCT_X(name, sname, ...)
\
@@ -3502,7 +3506,14 @@ struct libxl_device_type {
.add = libxl__add_ ## name ## s,
\
.list = (void *(*)(libxl_ctx *, uint32_t, int *))
\
libxl_device_ ## sname ## _list,
\
+ .set_default = (int (*)(libxl__gc *, uint32_t, void *))
\
+ libxl__device_ ## sname ## _setdefault,
\
+ .to_device = (int (*)(libxl__gc *, uint32_t,
\
+ void *, libxl__device *))
\
+ libxl__device_from_ ## name,
\
.init = (void (*)(void *))libxl_device_ ## sname ## _init,
\
+ .copy = (void (*)(libxl_ctx *, void *, void *))
\
+ libxl_device_ ## sname ## _copy,
\
.dispose = (void (*)(void *))libxl_device_ ## sname ## _dispose,
\
.compare = (int (*)(void *, void *))
\
libxl_device_ ## sname ## _compare,
\
@@ -4354,6 +4365,10 @@ static inline bool libxl__acpi_defbool_val(const
libxl_domain_build_info *b_info
return libxl_defbool_val(b_info->acpi) &&
libxl_defbool_val(b_info->u.hvm.acpi);
}
+
+void libxl__device_add(libxl__egc *egc, uint32_t domid,
+ const struct libxl_device_type *dt, void *type,
+ libxl__ao_device *aodev);
void* libxl__device_list(const struct libxl_device_type *dt,
libxl_ctx *ctx, uint32_t domid, int *num);
void libxl__device_list_free(const struct libxl_device_type *dt,
diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c
index d8948d5..d1ec28f 100644
--- a/tools/libxl/libxl_usb.c
+++ b/tools/libxl/libxl_usb.c
@@ -1968,6 +1968,8 @@ void libxl_device_usbdev_list_free(libxl_device_usbdev
*list, int nr)
DEFINE_DEVICE_TYPE_STRUCT(usbctrl,
.dm_needed = libxl_device_usbctrl_dm_needed
);
+
+#define libxl__device_from_usbdev NULL
DEFINE_DEVICE_TYPE_STRUCT(usbdev);
/*
diff --git a/tools/libxl/libxl_vdispl.c b/tools/libxl/libxl_vdispl.c
index a628adc..c79bcda 100644
--- a/tools/libxl/libxl_vdispl.c
+++ b/tools/libxl/libxl_vdispl.c
@@ -14,6 +14,21 @@
#include "libxl_internal.h"
+static int libxl__device_vdispl_setdefault(libxl__gc *gc, uint32_t domid,
+ libxl_device_vdispl *vdispl)
+{
+ int rc;
+
+ rc = libxl__resolve_domid(gc, vdispl->backend_domname,
+ &vdispl->backend_domid);
+
+ if (vdispl->devid == -1) {
+ vdispl->devid = libxl__device_nextid(gc, domid, "vdispl");
+ }
+
+ return rc;
+}
+
static int libxl__device_from_vdispl(libxl__gc *gc, uint32_t domid,
libxl_device_vdispl *vdispl,
libxl__device *device)
@@ -47,7 +62,7 @@ static void libxl__device_vdispl_add(libxl__egc *egc,
uint32_t domid,
libxl_device_vdispl *vdispl,
libxl__ao_device *aodev)
{
-
+ libxl__device_add(egc, domid, &libxl__vdispl_devtype, vdispl, aodev);
}
libxl_device_vdispl *libxl_device_vdispl_list(libxl_ctx *ctx, uint32_t domid,
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |