0a122b
From e0a3caa2206a851a3311bf42ddfb1558314868b1 Mon Sep 17 00:00:00 2001
0a122b
Message-Id: <e0a3caa2206a851a3311bf42ddfb1558314868b1.1387276076.git.minovotn@redhat.com>
0a122b
In-Reply-To: <e610718166120379517e80d1a7aa12d60294209b.1387276076.git.minovotn@redhat.com>
0a122b
References: <e610718166120379517e80d1a7aa12d60294209b.1387276076.git.minovotn@redhat.com>
0a122b
From: Markus Armbruster <armbru@redhat.com>
0a122b
Date: Tue, 10 Dec 2013 15:12:55 +0100
0a122b
Subject: [PATCH 14/16] trace-events: Clean up with
0a122b
 scripts/cleanup-trace-events.pl again
0a122b
0a122b
RH-Author: Markus Armbruster <armbru@redhat.com>
0a122b
Message-id: <1386688376-29521-7-git-send-email-armbru@redhat.com>
0a122b
Patchwork-id: 56116
0a122b
O-Subject: [PATCH 7.0 qemu-kvm 6/7] trace-events: Clean up with scripts/cleanup-trace-events.pl again
0a122b
Bugzilla: 997832
0a122b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
0a122b
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
0a122b
From: Markus Armbruster <armbru@redhat.com>
0a122b
0a122b
Event qxl_render_blit_guest_primary_initialized is unused since commit
0a122b
c58c7b9, drop it.
0a122b
0a122b
Commit 42e5b4c moved hw/ppc/xics.c to hw/intc/xics.c without updating
0a122b
the comment in trace-events.
0a122b
0a122b
"scripts/cleanup-trace-events.pl trace-events | diff trace-events" is
0a122b
now clean again.
0a122b
0a122b
Signed-off-by: Markus Armbruster <armbru@redhat.com>
0a122b
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
0a122b
(cherry picked from commit ddd0bd480fc07cc45f9cc7e3d113f23cb58b6082)
0a122b
0a122b
Second hunk dropped, because we don't have commit 42e5b4c.
0a122b
---
0a122b
 trace-events | 1 -
0a122b
 1 file changed, 1 deletion(-)
0a122b
0a122b
Signed-off-by: Michal Novotny <minovotn@redhat.com>
0a122b
---
0a122b
 trace-events | 1 -
0a122b
 1 file changed, 1 deletion(-)
0a122b
0a122b
diff --git a/trace-events b/trace-events
0a122b
index 2a034cb..2336943 100644
0a122b
--- a/trace-events
0a122b
+++ b/trace-events
0a122b
@@ -1102,7 +1102,6 @@ qemu_spice_wakeup(uint32_t qid) "%d"
0a122b
 qemu_spice_create_update(uint32_t left, uint32_t right, uint32_t top, uint32_t bottom) "lr %d -> %d,  tb -> %d -> %d"
0a122b
 
0a122b
 # hw/display/qxl-render.c
0a122b
-qxl_render_blit_guest_primary_initialized(void) ""
0a122b
 qxl_render_blit(int32_t stride, int32_t left, int32_t right, int32_t top, int32_t bottom) "stride=%d [%d, %d, %d, %d]"
0a122b
 qxl_render_guest_primary_resized(int32_t width, int32_t height, int32_t stride, int32_t bytes_pp, int32_t bits_pp) "%dx%d, stride %d, bpp %d, depth %d"
0a122b
 qxl_render_update_area_done(void *cookie) "%p"
0a122b
-- 
0a122b
1.7.11.7
0a122b