[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/13] xen: Prepare xendev qtail to be shared wit
From: |
Emil Condrea |
Subject: |
[Qemu-devel] [PATCH v2 06/13] xen: Prepare xendev qtail to be shared with frontends |
Date: |
Thu, 13 Oct 2016 09:01:47 +0300 |
* move xendevs qtail to xen_pvdev.c
* change xen_be_get_xendev to use a new function: xen_pv_insert_xendev
Signed-off-by: Emil Condrea <address@hidden>
---
hw/xen/xen_backend.c | 51 +--------------------------------------
hw/xen/xen_pvdev.c | 57 ++++++++++++++++++++++++++++++++++++++++++++
include/hw/xen/xen_backend.h | 1 -
include/hw/xen/xen_pvdev.h | 4 ++++
4 files changed, 62 insertions(+), 51 deletions(-)
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index 1487db2..2875e7c 100644
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -54,8 +54,6 @@ struct xs_dirs {
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 int debug;
static void xenstore_cleanup_dir(char *dir)
@@ -157,27 +155,6 @@ int xen_be_set_state(struct XenDevice *xendev, enum
xenbus_state state)
return 0;
}
-/* ------------------------------------------------------------- */
-
-struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev)
-{
- struct XenDevice *xendev;
-
- QTAILQ_FOREACH(xendev, &xendevs, next) {
- if (xendev->dom != dom) {
- continue;
- }
- if (xendev->dev != dev) {
- continue;
- }
- if (strcmp(xendev->type, type) != 0) {
- continue;
- }
- return xendev;
- }
- return NULL;
-}
-
/*
* get xen backend device, allocate a new one if it doesn't exist.
*/
@@ -226,7 +203,7 @@ static struct XenDevice *xen_be_get_xendev(const char
*type, int dom, int dev,
xendev->gnttabdev = NULL;
}
- QTAILQ_INSERT_TAIL(&xendevs, xendev, next);
+ xen_pv_insert_xendev(xendev);
if (xendev->ops->alloc) {
xendev->ops->alloc(xendev);
@@ -235,32 +212,6 @@ static struct XenDevice *xen_be_get_xendev(const char
*type, int dom, int dev,
return xendev;
}
-/*
- * release xen backend device.
- */
-static void xen_be_del_xendev(struct XenDevice *xendev)
-{
- if (xendev->ops->free) {
- xendev->ops->free(xendev);
- }
-
- if (xendev->fe) {
- char token[XEN_BUFSIZE];
- snprintf(token, sizeof(token), "fe:%p", xendev);
- xs_unwatch(xenstore, xendev->fe, token);
- g_free(xendev->fe);
- }
-
- if (xendev->evtchndev != NULL) {
- xenevtchn_close(xendev->evtchndev);
- }
- if (xendev->gnttabdev != NULL) {
- xengnttab_close(xendev->gnttabdev);
- }
-
- QTAILQ_REMOVE(&xendevs, xendev, next);
- g_free(xendev);
-}
/*
* Sync internal data structures on xenstore updates.
diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c
index 7607e44..96ed2a3 100644
--- a/hw/xen/xen_pvdev.c
+++ b/hw/xen/xen_pvdev.c
@@ -22,7 +22,11 @@
#include "hw/xen/xen_backend.h"
#include "hw/xen/xen_pvdev.h"
+/* private */
static int debug;
+static QTAILQ_HEAD(XenDeviceHead, XenDevice) xendevs =
+ QTAILQ_HEAD_INITIALIZER(xendevs);
+
/* ------------------------------------------------------------- */
int xenstore_write_str(const char *base, const char *node, const char *val)
@@ -206,3 +210,56 @@ int xen_be_send_notify(struct XenDevice *xendev)
{
return xenevtchn_notify(xendev->evtchndev, xendev->local_port);
}
+
+/* ------------------------------------------------------------- */
+
+struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev)
+{
+ struct XenDevice *xendev;
+
+ QTAILQ_FOREACH(xendev, &xendevs, next) {
+ if (xendev->dom != dom) {
+ continue;
+ }
+ if (xendev->dev != dev) {
+ continue;
+ }
+ if (strcmp(xendev->type, type) != 0) {
+ continue;
+ }
+ return xendev;
+ }
+ return NULL;
+}
+
+/*
+ * release xen backend device.
+ */
+void xen_be_del_xendev(struct XenDevice *xendev)
+{
+ if (xendev->ops->free) {
+ xendev->ops->free(xendev);
+ }
+
+ if (xendev->fe) {
+ char token[XEN_BUFSIZE];
+ snprintf(token, sizeof(token), "fe:%p", xendev);
+ xs_unwatch(xenstore, xendev->fe, token);
+ g_free(xendev->fe);
+ }
+
+ if (xendev->evtchndev != NULL) {
+ xenevtchn_close(xendev->evtchndev);
+ }
+ if (xendev->gnttabdev != NULL) {
+ xengnttab_close(xendev->gnttabdev);
+ }
+
+ QTAILQ_REMOVE(&xendevs, xendev, next);
+ g_free(xendev);
+}
+
+void xen_pv_insert_xendev(struct XenDevice *xendev)
+{
+ QTAILQ_INSERT_TAIL(&xendevs, xendev, next);
+}
diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h
index 6c617d9..cbda40e 100644
--- a/include/hw/xen/xen_backend.h
+++ b/include/hw/xen/xen_backend.h
@@ -27,7 +27,6 @@ int xenstore_read_fe_int(struct XenDevice *xendev, const char
*node, int *ival);
int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node,
uint64_t *uval);
-struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev);
void xen_be_check_state(struct XenDevice *xendev);
/* xen backend driver bits */
diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h
index a8da3da..517537a 100644
--- a/include/hw/xen/xen_pvdev.h
+++ b/include/hw/xen/xen_pvdev.h
@@ -65,6 +65,10 @@ void xenstore_update(void *unused);
const char *xenbus_strstate(enum xenbus_state state);
void xen_be_evtchn_event(void *opaque);
+void xen_pv_insert_xendev(struct XenDevice *xendev);
+void xen_be_del_xendev(struct XenDevice *xendev);
+struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev);
+
void xen_be_unbind_evtchn(struct XenDevice *xendev);
int xen_be_send_notify(struct XenDevice *xendev);
--
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, 2016/10/13
- [Qemu-devel] [PATCH v2 06/13] xen: Prepare xendev qtail to be shared with frontends,
Emil Condrea <=
- [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