From 21a79d9dab61df3942c13df2a2472182abdb8a7f Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Mon, 15 Sep 2014 13:08:22 +0200

Subject: [PATCH 5/6] spice-display: add display channel id to the debug messages.

Message-id: <1410786503-19794-4-git-send-email-kraxel@redhat.com>

Patchwork-id: 61138

O-Subject: [RHEL-7.1 qemu-kvm PATCH 3/4] spice-display: add display channel id to the debug messages.

Bugzilla: 1139117

RH-Acked-by: Markus Armbruster <armbru@redhat.com>

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

And s/__FUNCTION__/__func__/ while being at it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

(cherry picked from commit 35b2122db446a03be9b88f540e865930efd01d6a)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 ui/spice-display.c |   27 ++++++++++++++-------------

 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ui/spice-display.c b/ui/spice-display.c

index 82d8b9f..da45282 100644

--- a/ui/spice-display.c

+++ b/ui/spice-display.c

@@ -297,7 +297,7 @@ void qemu_spice_create_host_memslot(SimpleSpiceDisplay *ssd)

 {

     QXLDevMemSlot memslot;

-    dprint(1, "%s:\n", __FUNCTION__);

+    dprint(1, "%s/%d:\n", __func__, ssd->qxl.id);

     memset(&memslot, 0, sizeof(memslot));

     memslot.slot_group_id = MEMSLOT_GROUP_HOST;

@@ -311,7 +311,7 @@ void qemu_spice_create_host_primary(SimpleSpiceDisplay *ssd)

     memset(&surface, 0, sizeof(surface));

-    dprint(1, "%s: %dx%d\n", __FUNCTION__,

+    dprint(1, "%s/%d: %dx%d\n", __func__, ssd->qxl.id,

            surface_width(ssd->ds), surface_height(ssd->ds));

     surface.format     = SPICE_SURFACE_FMT_32_xRGB;

@@ -329,7 +329,7 @@ void qemu_spice_create_host_primary(SimpleSpiceDisplay *ssd)

 void qemu_spice_destroy_host_primary(SimpleSpiceDisplay *ssd)

 {

-    dprint(1, "%s:\n", __FUNCTION__);

+    dprint(1, "%s/%d:\n", __func__, ssd->qxl.id);

     qemu_spice_destroy_primary_surface(ssd, 0, QXL_SYNC);

 }

@@ -354,7 +354,8 @@ void qemu_spice_display_update(SimpleSpiceDisplay *ssd,

 {

     QXLRect update_area;

-    dprint(2, "%s: x %d y %d w %d h %d\n", __FUNCTION__, x, y, w, h);

+    dprint(2, "%s/%d: x %d y %d w %d h %d\n", __func__,

+           ssd->qxl.id, x, y, w, h);

     update_area.left = x,

     update_area.right = x + w;

     update_area.top = y;

@@ -371,7 +372,7 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd,

 {

     SimpleSpiceUpdate *update;

-    dprint(1, "%s:\n", __FUNCTION__);

+    dprint(1, "%s/%d:\n", __func__, ssd->qxl.id);

     memset(&ssd->dirty, 0, sizeof(ssd->dirty));

     if (ssd->surface) {

@@ -413,7 +414,7 @@ void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd)

 void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd)

 {

-    dprint(3, "%s:\n", __func__);

+    dprint(3, "%s/%d:\n", __func__, ssd->qxl.id);

     graphic_hw_update(ssd->dcl.con);

     qemu_mutex_lock(&ssd->lock);

@@ -427,7 +428,7 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd)

     if (ssd->notify) {

         ssd->notify = 0;

         qemu_spice_wakeup(ssd);

-        dprint(2, "%s: notify\n", __FUNCTION__);

+        dprint(2, "%s/%d: notify\n", __func__, ssd->qxl.id);

     }

 }

@@ -437,19 +438,19 @@ static void interface_attach_worker(QXLInstance *sin, QXLWorker *qxl_worker)

 {

     SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl);

-    dprint(1, "%s:\n", __FUNCTION__);

+    dprint(1, "%s/%d:\n", __func__, ssd->qxl.id);

     ssd->worker = qxl_worker;

 }

 static void interface_set_compression_level(QXLInstance *sin, int level)

 {

-    dprint(1, "%s:\n", __FUNCTION__);

+    dprint(1, "%s/%d:\n", __func__, sin->id);

     /* nothing to do */

 }

 static void interface_set_mm_time(QXLInstance *sin, uint32_t mm_time)

 {

-    dprint(3, "%s:\n", __FUNCTION__);

+    dprint(3, "%s/%d:\n", __func__, sin->id);

     /* nothing to do */

 }

@@ -472,7 +473,7 @@ static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext)

     SimpleSpiceUpdate *update;

     int ret = false;

-    dprint(3, "%s:\n", __FUNCTION__);

+    dprint(3, "%s/%d:\n", __func__, ssd->qxl.id);

     qemu_mutex_lock(&ssd->lock);

     update = QTAILQ_FIRST(&ssd->updates);

@@ -488,7 +489,7 @@ static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext)

 static int interface_req_cmd_notification(QXLInstance *sin)

 {

-    dprint(1, "%s:\n", __FUNCTION__);

+    dprint(1, "%s/%d:\n", __func__, sin->id);

     return 1;

 }

@@ -498,7 +499,7 @@ static void interface_release_resource(QXLInstance *sin,

     SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl);

     uintptr_t id;

-    dprint(2, "%s:\n", __FUNCTION__);

+    dprint(2, "%s/%d:\n", __func__, ssd->qxl.id);

     id = ext.info->id;

     qemu_spice_destroy_update(ssd, (void*)id);

 }

-- 

1.7.1