>From 31c995f6ee18ff2e2b45dbdcf1d57f777d1e0ef9 Mon Sep 17 00:00:00 2001

From: Alon Levy <alevy@redhat.com>

Date: Fri, 17 Jun 2011 14:42:09 +0200

Subject: [PATCH 16/28] qxl: add io_port_to_string

Signed-off-by: Alon Levy <alevy@redhat.com>

---

 hw/qxl.c |   40 +++++++++++++++++++++++++++++++++++++++-

 1 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/hw/qxl.c b/hw/qxl.c

index 416bd48..6e66021 100644

--- a/hw/qxl.c

+++ b/hw/qxl.c

@@ -409,6 +409,43 @@ static const char *qxl_mode_to_string(int mode)

     return "INVALID";

 }

+static const char *io_port_to_string(uint32_t io_port)

+{

+    if (io_port >= QXL_IO_RANGE_SIZE) {

+        return "out of range";

+    }

+    static const char *io_port_to_string[QXL_IO_RANGE_SIZE + 1] = {

+        [QXL_IO_NOTIFY_CMD]             = "QXL_IO_NOTIFY_CMD",

+        [QXL_IO_NOTIFY_CURSOR]          = "QXL_IO_NOTIFY_CURSOR",

+        [QXL_IO_UPDATE_AREA]            = "QXL_IO_UPDATE_AREA",

+        [QXL_IO_UPDATE_IRQ]             = "QXL_IO_UPDATE_IRQ",

+        [QXL_IO_NOTIFY_OOM]             = "QXL_IO_NOTIFY_OOM",

+        [QXL_IO_RESET]                  = "QXL_IO_RESET",

+        [QXL_IO_SET_MODE]               = "QXL_IO_SET_MODE",

+        [QXL_IO_LOG]                    = "QXL_IO_LOG",

+        [QXL_IO_MEMSLOT_ADD]            = "QXL_IO_MEMSLOT_ADD",

+        [QXL_IO_MEMSLOT_DEL]            = "QXL_IO_MEMSLOT_DEL",

+        [QXL_IO_DETACH_PRIMARY]         = "QXL_IO_DETACH_PRIMARY",

+        [QXL_IO_ATTACH_PRIMARY]         = "QXL_IO_ATTACH_PRIMARY",

+        [QXL_IO_CREATE_PRIMARY]         = "QXL_IO_CREATE_PRIMARY",

+        [QXL_IO_DESTROY_PRIMARY]        = "QXL_IO_DESTROY_PRIMARY",

+        [QXL_IO_DESTROY_SURFACE_WAIT]   = "QXL_IO_DESTROY_SURFACE_WAIT",

+        [QXL_IO_DESTROY_ALL_SURFACES]   = "QXL_IO_DESTROY_ALL_SURFACES",

+#if SPICE_INTERFACE_QXL_MINOR >= 1

+        [QXL_IO_UPDATE_AREA_ASYNC]      = "QXL_IO_UPDATE_AREA_ASYNC",

+        [QXL_IO_MEMSLOT_ADD_ASYNC]      = "QXL_IO_MEMSLOT_ADD_ASYNC",

+        [QXL_IO_CREATE_PRIMARY_ASYNC]   = "QXL_IO_CREATE_PRIMARY_ASYNC",

+        [QXL_IO_DESTROY_PRIMARY_ASYNC]  = "QXL_IO_DESTROY_PRIMARY_ASYNC",

+        [QXL_IO_DESTROY_SURFACE_ASYNC]  = "QXL_IO_DESTROY_SURFACE_ASYNC",

+        [QXL_IO_DESTROY_ALL_SURFACES_ASYNC]

+                                        = "QXL_IO_DESTROY_ALL_SURFACES_ASYNC",

+        [QXL_IO_FLUSH_SURFACES_ASYNC]   = "QXL_IO_FLUSH_SURFACES_ASYNC",

+        [QXL_IO_FLUSH_RELEASE]          = "QXL_IO_FLUSH_RELEASE",

+#endif

+    };

+    return io_port_to_string[io_port];

+}

+

 /* called from spice server thread context only */

 static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext)

 {

@@ -1005,7 +1042,8 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val)

     default:

         if (d->mode == QXL_MODE_NATIVE || d->mode == QXL_MODE_COMPAT)

             break;

-        dprint(d, 1, "%s: unexpected port 0x%x in vga mode\n", __FUNCTION__, io_port);

+        dprint(d, 1, "%s: unexpected port 0x%x (%s) in vga mode\n",

+            __func__, io_port, io_port_to_string(io_port));

         return;

     }

-- 

1.7.5.1