|
 |
fc5c27b |
>From 31c995f6ee18ff2e2b45dbdcf1d57f777d1e0ef9 Mon Sep 17 00:00:00 2001
|
|
|
13f703f |
From: Alon Levy <alevy@redhat.com>
|
|
|
13f703f |
Date: Fri, 17 Jun 2011 14:42:09 +0200
|
|
|
fc5c27b |
Subject: [PATCH 16/28] qxl: add io_port_to_string
|
|
|
13f703f |
|
|
|
13f703f |
Signed-off-by: Alon Levy <alevy@redhat.com>
|
|
|
13f703f |
---
|
|
|
13f703f |
hw/qxl.c | 40 +++++++++++++++++++++++++++++++++++++++-
|
|
|
13f703f |
1 files changed, 39 insertions(+), 1 deletions(-)
|
|
|
13f703f |
|
|
|
13f703f |
diff --git a/hw/qxl.c b/hw/qxl.c
|
|
|
13f703f |
index 416bd48..6e66021 100644
|
|
|
13f703f |
--- a/hw/qxl.c
|
|
|
13f703f |
+++ b/hw/qxl.c
|
|
|
13f703f |
@@ -409,6 +409,43 @@ static const char *qxl_mode_to_string(int mode)
|
|
|
13f703f |
return "INVALID";
|
|
|
13f703f |
}
|
|
|
13f703f |
|
|
|
13f703f |
+static const char *io_port_to_string(uint32_t io_port)
|
|
|
13f703f |
+{
|
|
|
13f703f |
+ if (io_port >= QXL_IO_RANGE_SIZE) {
|
|
|
13f703f |
+ return "out of range";
|
|
|
13f703f |
+ }
|
|
|
13f703f |
+ static const char *io_port_to_string[QXL_IO_RANGE_SIZE + 1] = {
|
|
|
13f703f |
+ [QXL_IO_NOTIFY_CMD] = "QXL_IO_NOTIFY_CMD",
|
|
|
13f703f |
+ [QXL_IO_NOTIFY_CURSOR] = "QXL_IO_NOTIFY_CURSOR",
|
|
|
13f703f |
+ [QXL_IO_UPDATE_AREA] = "QXL_IO_UPDATE_AREA",
|
|
|
13f703f |
+ [QXL_IO_UPDATE_IRQ] = "QXL_IO_UPDATE_IRQ",
|
|
|
13f703f |
+ [QXL_IO_NOTIFY_OOM] = "QXL_IO_NOTIFY_OOM",
|
|
|
13f703f |
+ [QXL_IO_RESET] = "QXL_IO_RESET",
|
|
|
13f703f |
+ [QXL_IO_SET_MODE] = "QXL_IO_SET_MODE",
|
|
|
13f703f |
+ [QXL_IO_LOG] = "QXL_IO_LOG",
|
|
|
13f703f |
+ [QXL_IO_MEMSLOT_ADD] = "QXL_IO_MEMSLOT_ADD",
|
|
|
13f703f |
+ [QXL_IO_MEMSLOT_DEL] = "QXL_IO_MEMSLOT_DEL",
|
|
|
13f703f |
+ [QXL_IO_DETACH_PRIMARY] = "QXL_IO_DETACH_PRIMARY",
|
|
|
13f703f |
+ [QXL_IO_ATTACH_PRIMARY] = "QXL_IO_ATTACH_PRIMARY",
|
|
|
13f703f |
+ [QXL_IO_CREATE_PRIMARY] = "QXL_IO_CREATE_PRIMARY",
|
|
|
13f703f |
+ [QXL_IO_DESTROY_PRIMARY] = "QXL_IO_DESTROY_PRIMARY",
|
|
|
13f703f |
+ [QXL_IO_DESTROY_SURFACE_WAIT] = "QXL_IO_DESTROY_SURFACE_WAIT",
|
|
|
13f703f |
+ [QXL_IO_DESTROY_ALL_SURFACES] = "QXL_IO_DESTROY_ALL_SURFACES",
|
|
|
13f703f |
+#if SPICE_INTERFACE_QXL_MINOR >= 1
|
|
|
13f703f |
+ [QXL_IO_UPDATE_AREA_ASYNC] = "QXL_IO_UPDATE_AREA_ASYNC",
|
|
|
13f703f |
+ [QXL_IO_MEMSLOT_ADD_ASYNC] = "QXL_IO_MEMSLOT_ADD_ASYNC",
|
|
|
13f703f |
+ [QXL_IO_CREATE_PRIMARY_ASYNC] = "QXL_IO_CREATE_PRIMARY_ASYNC",
|
|
|
13f703f |
+ [QXL_IO_DESTROY_PRIMARY_ASYNC] = "QXL_IO_DESTROY_PRIMARY_ASYNC",
|
|
|
13f703f |
+ [QXL_IO_DESTROY_SURFACE_ASYNC] = "QXL_IO_DESTROY_SURFACE_ASYNC",
|
|
|
13f703f |
+ [QXL_IO_DESTROY_ALL_SURFACES_ASYNC]
|
|
|
13f703f |
+ = "QXL_IO_DESTROY_ALL_SURFACES_ASYNC",
|
|
|
13f703f |
+ [QXL_IO_FLUSH_SURFACES_ASYNC] = "QXL_IO_FLUSH_SURFACES_ASYNC",
|
|
|
13f703f |
+ [QXL_IO_FLUSH_RELEASE] = "QXL_IO_FLUSH_RELEASE",
|
|
|
13f703f |
+#endif
|
|
|
13f703f |
+ };
|
|
|
13f703f |
+ return io_port_to_string[io_port];
|
|
|
13f703f |
+}
|
|
|
13f703f |
+
|
|
|
13f703f |
/* called from spice server thread context only */
|
|
|
13f703f |
static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext)
|
|
|
13f703f |
{
|
|
|
13f703f |
@@ -1005,7 +1042,8 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val)
|
|
|
13f703f |
default:
|
|
|
13f703f |
if (d->mode == QXL_MODE_NATIVE || d->mode == QXL_MODE_COMPAT)
|
|
|
13f703f |
break;
|
|
|
13f703f |
- dprint(d, 1, "%s: unexpected port 0x%x in vga mode\n", __FUNCTION__, io_port);
|
|
|
13f703f |
+ dprint(d, 1, "%s: unexpected port 0x%x (%s) in vga mode\n",
|
|
|
13f703f |
+ __func__, io_port, io_port_to_string(io_port));
|
|
|
13f703f |
return;
|
|
|
13f703f |
}
|
|
|
13f703f |
|
|
|
13f703f |
--
|
|
|
13f703f |
1.7.5.1
|
|
|
13f703f |
|