---
src/qxl.h | 13 ++++++++-----
src/spiceqxl_io_port.c | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/qxl.h b/src/qxl.h
index 06cd76c..df2d368 100644
--- a/src/qxl.h
+++ b/src/qxl.h
@@ -425,14 +425,17 @@ void qxl_create_primary(qxl_screen_t *qxl);
void qxl_notify_oom(qxl_screen_t *qxl);
#ifdef XSPICE
-/* device to spice-server, now xspice to spice-server */
-void ioport_write(qxl_screen_t *qxl, uint32_t io_port, uint32_t val);
-#else
-static inline void ioport_write(qxl_screen_t *qxl, int port, int val)
+void xspice_ioport_write(qxl_screen_t *qxl, uint32_t io_port, uint32_t val);
+#endif
+
+static inline void ioport_write(qxl_screen_t *qxl, uint32_t port, uint32_t val)
{
+#ifdef XSPICE
+ xspice_ioport_write(qxl, port, val);
+#else
outb(qxl->io_base + port, val);
-}
#endif
+}
#ifdef XSPICE
diff --git a/src/spiceqxl_io_port.c b/src/spiceqxl_io_port.c
index f599b4e..edd73dd 100644
--- a/src/spiceqxl_io_port.c
+++ b/src/spiceqxl_io_port.c
@@ -204,7 +204,7 @@ static void qxl_set_mode(qxl_screen_t *qxl, int modenr)
}
/* called from Xorg thread - not worker thread! */
-void ioport_write(qxl_screen_t *qxl, uint32_t io_port, uint32_t val)
+void xspice_ioport_write(qxl_screen_t *qxl, uint32_t io_port, uint32_t val)
{
QXLRam *header = get_ram_header(qxl);
--
1.7.9.3
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
