[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/13] xen: Move xenstore cleanup and mkdir funct
From: |
Emil Condrea |
Subject: |
[Qemu-devel] [PATCH v2 07/13] xen: Move xenstore cleanup and mkdir functions |
Date: |
Thu, 13 Oct 2016 09:01:48 +0300 |
The name of the functions moved to xen_pvdev.c:
* xenstore_cleanup_dir
* xen_config_cleanup
* xenstore_mkdir
Signed-off-by: Emil Condrea <address@hidden>
Acked-by: Anthony PERARD <address@hidden>
---
hw/xen/xen_backend.c | 49 -------------------------------------------------
hw/xen/xen_pvdev.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index 2875e7c..216072d 100644
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -47,57 +47,8 @@ struct xs_handle *xenstore = NULL;
const char *xen_protocol;
/* private */
-struct xs_dirs {
- char *xs_dir;
- QTAILQ_ENTRY(xs_dirs) list;
-};
-static QTAILQ_HEAD(xs_dirs_head, xs_dirs) xs_cleanup =
- QTAILQ_HEAD_INITIALIZER(xs_cleanup);
-
static int debug;
-static void xenstore_cleanup_dir(char *dir)
-{
- struct xs_dirs *d;
-
- d = g_malloc(sizeof(*d));
- d->xs_dir = dir;
- QTAILQ_INSERT_TAIL(&xs_cleanup, d, list);
-}
-
-void xen_config_cleanup(void)
-{
- struct xs_dirs *d;
-
- QTAILQ_FOREACH(d, &xs_cleanup, list) {
- xs_rm(xenstore, 0, d->xs_dir);
- }
-}
-
-int xenstore_mkdir(char *path, int p)
-{
- struct xs_permissions perms[2] = {
- {
- .id = 0, /* set owner: dom0 */
- }, {
- .id = xen_domid,
- .perms = p,
- }
- };
-
- if (!xs_mkdir(xenstore, 0, path)) {
- xen_be_printf(NULL, 0, "xs_mkdir %s: failed\n", path);
- return -1;
- }
- xenstore_cleanup_dir(g_strdup(path));
-
- if (!xs_set_permissions(xenstore, 0, path, perms, 2)) {
- xen_be_printf(NULL, 0, "xs_set_permissions %s: failed\n", path);
- return -1;
- }
- return 0;
-}
-
int xenstore_write_be_str(struct XenDevice *xendev, const char *node, const
char *val)
{
return xenstore_write_str(xendev->be, node, val);
diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c
index 96ed2a3..e432d30 100644
--- a/hw/xen/xen_pvdev.c
+++ b/hw/xen/xen_pvdev.c
@@ -24,11 +24,62 @@
/* private */
static int debug;
+
+struct xs_dirs {
+ char *xs_dir;
+ QTAILQ_ENTRY(xs_dirs) list;
+};
+
+static QTAILQ_HEAD(xs_dirs_head, xs_dirs) xs_cleanup =
+ QTAILQ_HEAD_INITIALIZER(xs_cleanup);
+
static QTAILQ_HEAD(XenDeviceHead, XenDevice) xendevs =
QTAILQ_HEAD_INITIALIZER(xendevs);
/* ------------------------------------------------------------- */
+static void xenstore_cleanup_dir(char *dir)
+{
+ struct xs_dirs *d;
+
+ d = g_malloc(sizeof(*d));
+ d->xs_dir = dir;
+ QTAILQ_INSERT_TAIL(&xs_cleanup, d, list);
+}
+
+void xen_config_cleanup(void)
+{
+ struct xs_dirs *d;
+
+ QTAILQ_FOREACH(d, &xs_cleanup, list) {
+ xs_rm(xenstore, 0, d->xs_dir);
+ }
+}
+
+int xenstore_mkdir(char *path, int p)
+{
+ struct xs_permissions perms[2] = {
+ {
+ .id = 0, /* set owner: dom0 */
+ }, {
+ .id = xen_domid,
+ .perms = p,
+ }
+ };
+
+ if (!xs_mkdir(xenstore, 0, path)) {
+ xen_be_printf(NULL, 0, "xs_mkdir %s: failed\n", path);
+ return -1;
+ }
+ xenstore_cleanup_dir(g_strdup(path));
+
+ if (!xs_set_permissions(xenstore, 0, path, perms, 2)) {
+ xen_be_printf(NULL, 0, "xs_set_permissions %s: failed\n", path);
+ return -1;
+ }
+ return 0;
+}
+
int xenstore_write_str(const char *base, const char *node, const char *val)
{
char abspath[XEN_BUFSIZE];
--
1.9.1
- [Qemu-devel] [PATCH v2 00/13] Refactor common part of xen backend and frontend, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 01/13] xen: Fix coding style errors, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 04/13] xen: Move xenstore_update to xen_pvdev.c, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 02/13] xen: Fix coding style warnings, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 03/13] xen: Create a new file xen_pvdev.c, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 05/13] xen: Move evtchn functions to xen_pvdev.c, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 07/13] xen: Move xenstore cleanup and mkdir functions,
Emil Condrea <=
- [Qemu-devel] [PATCH v2 06/13] xen: Prepare xendev qtail to be shared with frontends, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 09/13] xen: Rename xen_be_unbind_evtchn, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 10/13] xen: Rename xen_be_send_notify, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 12/13] xen: Rename xen_be_find_xendev, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 08/13] xen: Rename xen_be_printf to xen_pv_printf, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 11/13] xen: Rename xen_be_evtchn_event, Emil Condrea, 2016/10/13
- [Qemu-devel] [PATCH v2 13/13] xen: Rename xen_be_del_xendev, Emil Condrea, 2016/10/13
- Re: [Qemu-devel] [PATCH v2 00/13] Refactor common part of xen backend and frontend, Emil Condrea, 2016/10/13
- Re: [Qemu-devel] [PATCH v2 00/13] Refactor common part of xen backend and frontend, Xuquan (Quan Xu), 2016/10/25