cryptospore / rpms / qemu-kvm

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