[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/13] xen: Move xenstore_update to xen_pvdev.c
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PULL 04/13] xen: Move xenstore_update to xen_pvdev.c |
Date: |
Fri, 28 Oct 2016 18:10:04 -0700 |
From: Emil Condrea <address@hidden>
* xenstore_update -> xen_pvdev.c
Signed-off-by: Emil Condrea <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>
Signed-off-by: Quan Xu <address@hidden>
Acked-by: Anthony PERARD <address@hidden>
---
hw/xen/xen_backend.c | 30 +++---------------------------
hw/xen/xen_pvdev.c | 23 +++++++++++++++++++++++
include/hw/xen/xen_backend.h | 3 +++
include/hw/xen/xen_pvdev.h | 1 +
4 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index b32b0dd..e3a7d95 100644
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -556,8 +556,8 @@ 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,
- struct XenDevOps *ops)
+void xenstore_update_be(char *watch, char *type, int dom,
+ struct XenDevOps *ops)
{
struct XenDevice *xendev;
char path[XEN_BUFSIZE], *bepath;
@@ -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;
diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c
index a1dc2be..22a1abe 100644
--- a/hw/xen/xen_pvdev.c
+++ b/hw/xen/xen_pvdev.c
@@ -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[] = {
diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h
index 973cb4b..2e54150 100644
--- a/include/hw/xen/xen_backend.h
+++ b/include/hw/xen/xen_backend.h
@@ -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,
diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h
index cd3d6bc..3c4cc01 100644
--- a/include/hw/xen/xen_pvdev.h
+++ b/include/hw/xen/xen_pvdev.h
@@ -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);
--
1.9.1
- [Qemu-devel] [PULL 00/13] xen-20161028-tag, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 01/13] xen: Fix coding style errors, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 02/13] xen: Fix coding style warnings, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 04/13] xen: Move xenstore_update to xen_pvdev.c,
Stefano Stabellini <=
- [Qemu-devel] [PULL 05/13] xen: Move evtchn functions to xen_pvdev.c, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 03/13] xen: Create a new file xen_pvdev.c, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 06/13] xen: Prepare xendev qtail to be shared with frontends, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 07/13] xen: Move xenstore cleanup and mkdir functions, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 09/13] xen: Rename xen_be_unbind_evtchn, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 10/13] xen: Rename xen_be_send_notify, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 08/13] xen: Rename xen_be_printf to xen_pv_printf, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 11/13] xen: Rename xen_be_evtchn_event, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 12/13] xen: Rename xen_be_find_xendev, Stefano Stabellini, 2016/10/28
- [Qemu-devel] [PULL 13/13] xen: Rename xen_be_del_xendev, Stefano Stabellini, 2016/10/28