[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v4 08/13] libxl: change vfb to use generec add function
From: Oleksandr Grytsov <oleksandr_grytsov@xxxxxxxx> Signed-off-by: Oleksandr Grytsov <oleksandr_grytsov@xxxxxxxx> --- tools/libxl/libxl_console.c | 74 ++++++++++++-------------------------------- tools/libxl/libxl_create.c | 3 +- tools/libxl/libxl_dm.c | 3 +- tools/libxl/libxl_internal.h | 6 +--- 4 files changed, 25 insertions(+), 61 deletions(-) diff --git a/tools/libxl/libxl_console.c b/tools/libxl/libxl_console.c index 48fccec..4aae82c 100644 --- a/tools/libxl/libxl_console.c +++ b/tools/libxl/libxl_console.c @@ -603,7 +603,8 @@ static int libxl__device_from_vkb(libxl__gc *gc, uint32_t domid, return 0; } -int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb) +static int libxl__device_vfb_setdefault(libxl__gc *gc, uint32_t domid, + libxl_device_vfb *vfb, bool hotplug) { int rc; @@ -639,49 +640,11 @@ 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, - const libxl_asyncop_how *ao_how) +static int libxl__set_xenstore_vfb(libxl__gc *gc, uint32_t domid, + libxl_device_vfb *vfb, + flexarray_t *back, flexarray_t *front, + flexarray_t *ro_front) { - AO_CREATE(ctx, domid, ao_how); - int rc; - - rc = libxl__device_vfb_add(gc, domid, vfb); - if (rc) { - LOGD(ERROR, domid, "Unable to add vfb device"); - goto out; - } - -out: - libxl__ao_complete(egc, ao, rc); - return AO_INPROGRESS; -} - -int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid, libxl_device_vfb *vfb) -{ - flexarray_t *front; - flexarray_t *back; - libxl__device device; - int rc; - - rc = libxl__device_vfb_setdefault(gc, vfb); - if (rc) goto out; - - front = flexarray_make(gc, 16, 1); - back = flexarray_make(gc, 16, 1); - - if (vfb->devid == -1) { - if ((vfb->devid = libxl__device_nextid(gc, domid, "vfb")) < 0) { - rc = ERROR_FAIL; - goto out; - } - } - - rc = libxl__device_from_vfb(gc, domid, vfb, &device); - if (rc != 0) goto out; - - flexarray_append_pair(back, "frontend-id", GCSPRINTF("%d", domid)); - flexarray_append_pair(back, "online", "1"); - flexarray_append_pair(back, "state", GCSPRINTF("%d", XenbusStateInitialising)); flexarray_append_pair(back, "vnc", libxl_defbool_val(vfb->vnc.enable) ? "1" : "0"); flexarray_append_pair(back, "vnclisten", vfb->vnc.listen); @@ -701,17 +664,7 @@ int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid, libxl_device_vfb *vfb) flexarray_append_pair(back, "display", vfb->sdl.display); } - flexarray_append_pair(front, "backend-id", - GCSPRINTF("%d", vfb->backend_domid)); - flexarray_append_pair(front, "state", GCSPRINTF("%d", XenbusStateInitialising)); - - libxl__device_generic_add(gc, XBT_NULL, &device, - libxl__xs_kvs_of_flexarray(gc, back), - libxl__xs_kvs_of_flexarray(gc, front), - NULL); - rc = 0; -out: - return rc; + return 0; } /* The following functions are defined: @@ -738,8 +691,21 @@ DEFINE_DEVICE_TYPE_STRUCT(vkb, .skip_attach = 1 ); +#define libxl__add_vfbs NULL +#define libxl_device_vfb_list NULL +#define libxl_device_vfb_compare NULL + /* vfb */ LIBXL_DEFINE_DEVICE_REMOVE(vfb) +static LIBXL_DEFINE_UPDATE_DEVID(vfb, "vfb") + +DEFINE_DEVICE_TYPE_STRUCT(vfb, + .skip_attach = 1, + .set_xenstore_config = (int (*)(libxl__gc *, uint32_t, void *, + flexarray_t *back, flexarray_t *front, + flexarray_t *ro_front)) + libxl__set_xenstore_vfb +); libxl_xen_console_reader * libxl_xen_console_read_start(libxl_ctx *ctx, int clear) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 9634811..8089713 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1371,7 +1371,8 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, libxl__device device; for (i = 0; i < d_config->num_vfbs; i++) { - libxl__device_vfb_add(gc, domid, &d_config->vfbs[i]); + libxl__device_add(gc, domid, &libxl__vfb_devtype, + &d_config->vfbs[i]); libxl__device_add(gc, domid, &libxl__vkb_devtype, &d_config->vkbs[i]); } diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index b37f47e..0a4f811 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1975,7 +1975,8 @@ static void spawn_stub_launch_dm(libxl__egc *egc, if (ret) goto out; } - ret = libxl__device_vfb_add(gc, dm_domid, &dm_config->vfbs[0]); + ret = libxl__device_add(gc, dm_domid, &libxl__vfb_devtype, + &dm_config->vfbs[0]); if (ret) goto out; ret = libxl__device_add(gc, dm_domid, &libxl__vkb_devtype, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 49440d7..36b4d1e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1247,7 +1247,6 @@ _hidden int libxl__device_disk_setdefault(libxl__gc *gc, uint32_t domid); _hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, uint32_t domid, bool hotplug); -_hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); _hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); _hidden void libxl__rdm_setdefault(libxl__gc *gc, libxl_domain_build_info *b_info); @@ -2657,10 +2656,6 @@ struct libxl__multidev { * it's a valid state. */ -/* Internal function to connect a vfb device */ -_hidden int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid, - libxl_device_vfb *vfb); - /* 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 @@ -3547,6 +3542,7 @@ static inline int *libxl__device_type_get_num( return (int *)((void *)d_config + dt->num_offset); } +extern const struct libxl_device_type libxl__vfb_devtype; extern const struct libxl_device_type libxl__vkb_devtype; extern const struct libxl_device_type libxl__disk_devtype; extern const struct libxl_device_type libxl__nic_devtype; -- 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 |