From: Oleksandr Grytsov <al1img@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: ian.jackson@eu.citrix.com, wei.liu2@citrix.com,
Oleksandr Grytsov <oleksandr_grytsov@epam.com>
Subject: [PATCH v6 06/13] libxl: change p9 to use generec add function
Date: Tue, 12 Sep 2017 16:48:11 +0300 [thread overview]
Message-ID: <1505224098-19330-7-git-send-email-al1img@gmail.com> (raw)
In-Reply-To: <1505224098-19330-1-git-send-email-al1img@gmail.com>
From: Oleksandr Grytsov <oleksandr_grytsov@epam.com>
Signed-off-by: Oleksandr Grytsov <oleksandr_grytsov@epam.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl_9pfs.c | 59 ++++++++++++++++----------------------------
tools/libxl/libxl_create.c | 2 +-
tools/libxl/libxl_internal.h | 7 +-----
3 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/tools/libxl/libxl_9pfs.c b/tools/libxl/libxl_9pfs.c
index 5443f7a..61d284c 100644
--- a/tools/libxl/libxl_9pfs.c
+++ b/tools/libxl/libxl_9pfs.c
@@ -17,12 +17,10 @@
#include "libxl_internal.h"
-int libxl__device_p9_setdefault(libxl__gc *gc, libxl_device_p9 *p9)
+static int libxl__device_p9_setdefault(libxl__gc *gc, uint32_t domid,
+ libxl_device_p9 *p9, bool hotplug)
{
- int rc;
-
- rc = libxl__resolve_domid(gc, p9->backend_domname, &p9->backend_domid);
- return rc;
+ return libxl__resolve_domid(gc, p9->backend_domname, &p9->backend_domid);
}
static int libxl__device_from_p9(libxl__gc *gc, uint32_t domid,
@@ -41,44 +39,29 @@ static int libxl__device_from_p9(libxl__gc *gc, uint32_t domid,
static LIBXL_DEFINE_UPDATE_DEVID(p9, "9pfs")
-int libxl__device_p9_add(libxl__gc *gc, uint32_t domid,
- libxl_device_p9 *p9)
+static int libxl__set_xenstore_p9(libxl__gc *gc, uint32_t domid,
+ libxl_device_p9 *p9,
+ flexarray_t *back, flexarray_t *front,
+ flexarray_t *ro_front)
{
- flexarray_t *front;
- flexarray_t *back;
- libxl__device device;
- int rc;
-
- rc = libxl__device_p9_setdefault(gc, p9);
- if (rc) goto out;
-
- front = flexarray_make(gc, 16, 1);
- back = flexarray_make(gc, 16, 1);
-
- rc = libxl__device_p9_update_devid(gc, domid, p9);
- if (rc) goto out;
-
- rc = libxl__device_from_p9(gc, domid, p9, &device);
- if (rc != 0) goto out;
-
- flexarray_append_pair(back, "frontend-id", libxl__sprintf(gc, "%d", domid));
- flexarray_append_pair(back, "online", "1");
- flexarray_append_pair(back, "state", GCSPRINTF("%d", XenbusStateInitialising));
- flexarray_append_pair(front, "backend-id",
- libxl__sprintf(gc, "%d", p9->backend_domid));
- flexarray_append_pair(front, "state", GCSPRINTF("%d", XenbusStateInitialising));
- flexarray_append_pair(front, "tag", p9->tag);
flexarray_append_pair(back, "path", p9->path);
flexarray_append_pair(back, "security_model", p9->security_model);
- 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;
+ flexarray_append_pair(front, "tag", p9->tag);
+
+ return 0;
}
+#define libxl__add_p9s NULL
+#define libxl_device_p9_list NULL
+#define libxl_device_p9_compare NULL
+
LIBXL_DEFINE_DEVICE_REMOVE(p9)
+DEFINE_DEVICE_TYPE_STRUCT(p9,
+ .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_p9
+);
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index f20bbf9..26aa2a4 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -1328,7 +1328,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev,
}
for (i = 0; i < d_config->num_p9s; i++)
- libxl__device_p9_add(gc, domid, &d_config->p9s[i]);
+ libxl__device_add(gc, domid, &libxl__p9_devtype, &d_config->p9s[i]);
switch (d_config->c_info.type) {
case LIBXL_DOMAIN_TYPE_HVM:
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index c6f5868..87f6d32 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1251,8 +1251,6 @@ _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 void libxl__rdm_setdefault(libxl__gc *gc,
libxl_domain_build_info *b_info);
-_hidden int libxl__device_p9_setdefault(libxl__gc *gc,
- libxl_device_p9 *p9);
_hidden const char *libxl__device_nic_devname(libxl__gc *gc,
uint32_t domid,
@@ -2667,10 +2665,6 @@ _hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid,
_hidden int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid,
libxl_device_vfb *vfb);
-/* Internal function to connect a 9pfs device */
-_hidden int libxl__device_p9_add(libxl__gc *gc, uint32_t domid,
- libxl_device_p9 *p9);
-
/* 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
@@ -3564,6 +3558,7 @@ extern const struct libxl_device_type libxl__usbctrl_devtype;
extern const struct libxl_device_type libxl__usbdev_devtype;
extern const struct libxl_device_type libxl__pcidev_devtype;
extern const struct libxl_device_type libxl__vdispl_devtype;
+extern const struct libxl_device_type libxl__p9_devtype;
extern const struct libxl_device_type *device_type_tbl[];
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-09-12 13:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-12 13:48 [PATCH v6 00/13] libxl: add PV display device driver interface Oleksandr Grytsov
2017-09-12 13:48 ` [PATCH v6 01/13] libxl: add generic function to add device Oleksandr Grytsov
2017-09-12 13:48 ` [PATCH v6 02/13] libxl: add generic functions to get and free device list Oleksandr Grytsov
2017-09-12 13:48 ` [PATCH v6 03/13] libxl: add vdispl device Oleksandr Grytsov
2017-09-12 13:48 ` [PATCH v6 04/13] xl: add PV display device commands Oleksandr Grytsov
2017-09-12 13:48 ` [PATCH v6 05/13] docs: add PV display driver information Oleksandr Grytsov
2017-09-12 13:48 ` Oleksandr Grytsov [this message]
2017-09-12 13:48 ` [PATCH v6 07/13] libxl: change vkb to use generec add function Oleksandr Grytsov
2017-09-12 13:48 ` [PATCH v6 08/13] libxl: change vfb " Oleksandr Grytsov
2017-09-12 13:48 ` [PATCH v6 09/13] libxl: change disk to use generic getting list functions Oleksandr Grytsov
2017-09-12 13:48 ` [PATCH v6 10/13] libxl: change nic to use generec add function Oleksandr Grytsov
2017-09-12 16:09 ` Wei Liu
2017-09-13 8:41 ` Wei Liu
2017-09-12 13:48 ` [PATCH v6 11/13] libxl: fix memory leak in libxl__colo_save_setup Oleksandr Grytsov
2017-09-12 16:10 ` Wei Liu
2017-09-12 13:48 ` [PATCH v6 12/13] libxl: change vtpm to use generec add function Oleksandr Grytsov
2017-09-12 13:48 ` [PATCH v6 13/13] libxl: remove unneeded DEVICE_ADD macro Oleksandr Grytsov
2017-09-12 16:22 ` [PATCH v6 00/13] libxl: add PV display device driver interface Wei Liu
2017-09-13 7:59 ` Oleksandr Grytsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1505224098-19330-7-git-send-email-al1img@gmail.com \
--to=al1img@gmail.com \
--cc=ian.jackson@eu.citrix.com \
--cc=oleksandr_grytsov@epam.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).