Commit ecf79818 authored by Emil Condrea's avatar Emil Condrea Committed by Stefano Stabellini
Browse files

xen: Move xenstore cleanup and mkdir functions 



The name of the functions moved to xen_pvdev.c:
 * xenstore_cleanup_dir
 * xen_config_cleanup
 * xenstore_mkdir

Signed-off-by: default avatarEmil Condrea <emilcondrea@gmail.com>
Signed-off-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Signed-off-by: default avatarQuan Xu <xuquan8@huawei.com>
Acked-by: default avatarAnthony PERARD <anthony.perard@citrix.com>
parent 148512e0

hw/xen/xen_backend.c

+0 −49
Original line number Diff line number Diff line
@@ -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);

hw/xen/xen_pvdev.c

+51 −0
Original line number Diff line number Diff line
@@ -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];