[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 05/13] xen: Move evtchn functions to xen_pvdev.c
From: |
Emil Condrea |
Subject: |
[Qemu-devel] [PATCH v3 05/13] xen: Move evtchn functions to xen_pvdev.c |
Date: |
Tue, 25 Oct 2016 08:50:11 +0300 |
The name of the functions moved:
* xen_be_evtchn_event
* xen_be_unbind_evtchn
* xen_be_send_notify
Signed-off-by: Emil Condrea <address@hidden>
---
hw/xen/xen_backend.c | 35 -----------------------------------
hw/xen/xen_pvdev.c | 35 +++++++++++++++++++++++++++++++++++
include/hw/xen/xen_backend.h | 2 --
include/hw/xen/xen_pvdev.h | 4 ++++
4 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index e3a7d95..1487db2 100644
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -607,25 +607,6 @@ void xenstore_update_fe(char *watch, struct XenDevice
*xendev)
xen_be_frontend_changed(xendev, node);
xen_be_check_state(xendev);
}
-static void xen_be_evtchn_event(void *opaque)
-{
- struct XenDevice *xendev = opaque;
- evtchn_port_t port;
-
- port = xenevtchn_pending(xendev->evtchndev);
- if (port != xendev->local_port) {
- xen_be_printf(xendev, 0,
- "xenevtchn_pending returned %d (expected %d)\n",
- port, xendev->local_port);
- return;
- }
- xenevtchn_unmask(xendev->evtchndev, port);
-
- if (xendev->ops->event) {
- xendev->ops->event(xendev);
- }
-}
-
/* -------------------------------------------------------------------- */
int xen_be_init(void)
@@ -702,22 +683,6 @@ int xen_be_bind_evtchn(struct XenDevice *xendev)
return 0;
}
-void xen_be_unbind_evtchn(struct XenDevice *xendev)
-{
- if (xendev->local_port == -1) {
- return;
- }
- qemu_set_fd_handler(xenevtchn_fd(xendev->evtchndev), NULL, NULL, NULL);
- xenevtchn_unbind(xendev->evtchndev, xendev->local_port);
- xen_be_printf(xendev, 2, "unbind evtchn port %d\n", xendev->local_port);
- xendev->local_port = -1;
-}
-
-int xen_be_send_notify(struct XenDevice *xendev)
-{
- return xenevtchn_notify(xendev->evtchndev, xendev->local_port);
-}
-
static int xen_sysdev_init(SysBusDevice *dev)
{
diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c
index 22a1abe..7607e44 100644
--- a/hw/xen/xen_pvdev.c
+++ b/hw/xen/xen_pvdev.c
@@ -171,3 +171,38 @@ void xen_be_printf(struct XenDevice *xendev, int msg_level,
}
qemu_log_flush();
}
+
+void xen_be_evtchn_event(void *opaque)
+{
+ struct XenDevice *xendev = opaque;
+ evtchn_port_t port;
+
+ port = xenevtchn_pending(xendev->evtchndev);
+ if (port != xendev->local_port) {
+ xen_be_printf(xendev, 0,
+ "xenevtchn_pending returned %d (expected %d)\n",
+ port, xendev->local_port);
+ return;
+ }
+ xenevtchn_unmask(xendev->evtchndev, port);
+
+ if (xendev->ops->event) {
+ xendev->ops->event(xendev);
+ }
+}
+
+void xen_be_unbind_evtchn(struct XenDevice *xendev)
+{
+ if (xendev->local_port == -1) {
+ return;
+ }
+ qemu_set_fd_handler(xenevtchn_fd(xendev->evtchndev), NULL, NULL, NULL);
+ xenevtchn_unbind(xendev->evtchndev, xendev->local_port);
+ xen_be_printf(xendev, 2, "unbind evtchn port %d\n", xendev->local_port);
+ xendev->local_port = -1;
+}
+
+int xen_be_send_notify(struct XenDevice *xendev)
+{
+ return xenevtchn_notify(xendev->evtchndev, xendev->local_port);
+}
diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h
index 2e54150..6c617d9 100644
--- a/include/hw/xen/xen_backend.h
+++ b/include/hw/xen/xen_backend.h
@@ -36,8 +36,6 @@ void xen_be_register_common(void);
int xen_be_register(const char *type, struct XenDevOps *ops);
int xen_be_set_state(struct XenDevice *xendev, enum xenbus_state state);
int xen_be_bind_evtchn(struct XenDevice *xendev);
-void xen_be_unbind_evtchn(struct XenDevice *xendev);
-int xen_be_send_notify(struct XenDevice *xendev);
/* actual backend drivers */
extern struct XenDevOps xen_console_ops; /* xen_console.c */
diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h
index 3c4cc01..a8da3da 100644
--- a/include/hw/xen/xen_pvdev.h
+++ b/include/hw/xen/xen_pvdev.h
@@ -64,6 +64,10 @@ void xenstore_update(void *unused);
const char *xenbus_strstate(enum xenbus_state state);
+void xen_be_evtchn_event(void *opaque);
+void xen_be_unbind_evtchn(struct XenDevice *xendev);
+int xen_be_send_notify(struct XenDevice *xendev);
+
void xen_be_printf(struct XenDevice *xendev, int msg_level,
const char *fmt, ...) GCC_FMT_ATTR(3, 4);
--
1.9.1
- [Qemu-devel] [PATCH v3 00/13] Refactor common part of xen backend and frontend, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 01/13] xen: Fix coding style errors, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 02/13] xen: Fix coding style warnings, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 04/13] xen: Move xenstore_update to xen_pvdev.c, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 03/13] xen: Create a new file xen_pvdev.c, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 05/13] xen: Move evtchn functions to xen_pvdev.c,
Emil Condrea <=
- [Qemu-devel] [PATCH v3 07/13] xen: Move xenstore cleanup and mkdir functions, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 06/13] xen: Prepare xendev qtail to be shared with frontends, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 09/13] xen: Rename xen_be_unbind_evtchn, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 10/13] xen: Rename xen_be_send_notify, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 11/13] xen: Rename xen_be_evtchn_event, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 08/13] xen: Rename xen_be_printf to xen_pv_printf, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 12/13] xen: Rename xen_be_find_xendev, Emil Condrea, 2016/10/25
- [Qemu-devel] [PATCH v3 13/13] xen: Rename xen_be_del_xendev, Emil Condrea, 2016/10/25
- Re: [Qemu-devel] [PATCH v3 00/13] Refactor common part of xen backend and frontend, Anthony PERARD, 2016/10/26