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

xen: Move xenstore_update to xen_pvdev.c 



 * xenstore_update -> xen_pvdev.c

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 f0021dba

hw/xen/xen_backend.c

+3 −27
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ static int xenstore_scan(const char *type, int dom, struct XenDevOps *ops) 
    return 0;

}



static void xenstore_update_be(char *watch, char *type, int dom,

void xenstore_update_be(char *watch, char *type, int dom,

                        struct XenDevOps *ops)

{

    struct XenDevice *xendev;
@@ -590,7 +590,7 @@ static void xenstore_update_be(char *watch, char *type, int dom, 
    }

}



static void xenstore_update_fe(char *watch, struct XenDevice *xendev)

void xenstore_update_fe(char *watch, struct XenDevice *xendev)

{

    char *node;

    unsigned int len;
@@ -607,30 +607,6 @@ static void xenstore_update_fe(char *watch, struct XenDevice *xendev) 
    xen_be_frontend_changed(xendev, node);

    xen_be_check_state(xendev);

}



static void xenstore_update(void *unused)

{

    char **vec = NULL;

    intptr_t type, ops, ptr;

    unsigned int dom, count;



    vec = xs_read_watch(xenstore, &count);

    if (vec == NULL) {

        goto cleanup;

    }



    if (sscanf(vec[XS_WATCH_TOKEN], "be:%" PRIxPTR ":%d:%" PRIxPTR,

               &type, &dom, &ops) == 3) {

        xenstore_update_be(vec[XS_WATCH_PATH], (void *)type, dom, (void*)ops);

    }

    if (sscanf(vec[XS_WATCH_TOKEN], "fe:%" PRIxPTR, &ptr) == 1) {

        xenstore_update_fe(vec[XS_WATCH_PATH], (void *)ptr);

    }



cleanup:

    free(vec);

}



static void xen_be_evtchn_event(void *opaque)

{

    struct XenDevice *xendev = opaque;

hw/xen/xen_pvdev.c

+23 −0
Original line number Diff line number Diff line
@@ -95,6 +95,29 @@ int xenstore_read_uint64(const char *base, const char *node, uint64_t *uval) 
    return rc;

}



void xenstore_update(void *unused)

{

    char **vec = NULL;

    intptr_t type, ops, ptr;

    unsigned int dom, count;



    vec = xs_read_watch(xenstore, &count);

    if (vec == NULL) {

        goto cleanup;

    }



    if (sscanf(vec[XS_WATCH_TOKEN], "be:%" PRIxPTR ":%d:%" PRIxPTR,

               &type, &dom, &ops) == 3) {

        xenstore_update_be(vec[XS_WATCH_PATH], (void *)type, dom, (void*)ops);

    }

    if (sscanf(vec[XS_WATCH_TOKEN], "fe:%" PRIxPTR, &ptr) == 1) {

        xenstore_update_fe(vec[XS_WATCH_PATH], (void *)ptr);

    }



cleanup:

    free(vec);

}



const char *xenbus_strstate(enum xenbus_state state)

{

    static const char *const name[] = {

include/hw/xen/xen_backend.h

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ int xenstore_write_be_int(struct XenDevice *xendev, const char *node, int ival); 
int xenstore_write_be_int64(struct XenDevice *xendev, const char *node, int64_t ival);

char *xenstore_read_be_str(struct XenDevice *xendev, const char *node);

int xenstore_read_be_int(struct XenDevice *xendev, const char *node, int *ival);

void xenstore_update_fe(char *watch, struct XenDevice *xendev);

void xenstore_update_be(char *watch, char *type, int dom,

                        struct XenDevOps *ops);

char *xenstore_read_fe_str(struct XenDevice *xendev, const char *node);

int xenstore_read_fe_int(struct XenDevice *xendev, const char *node, int *ival);

int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node,

include/hw/xen/xen_pvdev.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ int xenstore_write_int64(const char *base, const char *node, int64_t ival); 
char *xenstore_read_str(const char *base, const char *node);

int xenstore_read_int(const char *base, const char *node, int *ival);

int xenstore_read_uint64(const char *base, const char *node, uint64_t *uval);

void xenstore_update(void *unused);



const char *xenbus_strstate(enum xenbus_state state);