Commit-ID: 838ada754b898700b87f3b2f90ed73e2063bdac6
Gitweb: http://git.kernel.org/tip/838ada754b898700b87f3b2f90ed73e2063bdac6
Author: Pekka Enberg <penberg@xxxxxxxxxx>
AuthorDate: Tue, 7 Jun 2011 22:48:32 +0300
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Tue, 7 Jun 2011 22:48:32 +0300
kvm, ui: Kill fb_write() function
This patch kills fb_write() and related functions because they're no longer
called as of commit 6768f73 ("kvm tools, vesa: Use guest-mapped memory for
framebuffer").
Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: John Floren <john@xxxxxxxxxxx>
Cc: Sasha Levin <levinsasha928@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/framebuffer.c | 20 --------------------
tools/kvm/include/kvm/framebuffer.h | 2 --
tools/kvm/ui/sdl.c | 6 ------
tools/kvm/ui/vnc.c | 6 ------
4 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/tools/kvm/framebuffer.c b/tools/kvm/framebuffer.c
index eae0a92..1e35496 100644
--- a/tools/kvm/framebuffer.c
+++ b/tools/kvm/framebuffer.c
@@ -65,23 +65,3 @@ void fb__stop(void)
free(fb->mem);
}
}
-
-static void write_to_targets(struct framebuffer *fb, u64 addr, u8 *data, u32 len)
-{
- unsigned long i;
-
- for (i = 0; i < fb->nr_targets; i++) {
- struct fb_target_operations *ops = fb->targets[i];
-
- ops->write(fb, addr, data, len);
- }
-}
-
-void fb__write(u64 addr, u8 *data, u32 len)
-{
- struct framebuffer *fb;
-
- list_for_each_entry(fb, &framebuffers, node) {
- write_to_targets(fb, addr, data, len);
- }
-}
diff --git a/tools/kvm/include/kvm/framebuffer.h b/tools/kvm/include/kvm/framebuffer.h
index 6a9fb37..d28dadb 100644
--- a/tools/kvm/include/kvm/framebuffer.h
+++ b/tools/kvm/include/kvm/framebuffer.h
@@ -8,7 +8,6 @@ struct framebuffer;
struct fb_target_operations {
int (*start)(struct framebuffer *fb);
- void (*write)(struct framebuffer *fb, u64 addr, u8 *data, u32 len);
};
#define FB_MAX_TARGETS 2
@@ -30,6 +29,5 @@ struct framebuffer *fb__register(struct framebuffer *fb);
int fb__attach(struct framebuffer *fb, struct fb_target_operations *ops);
int fb__start(void);
void fb__stop(void);
-void fb__write(u64 addr, u8 *data, u32 len);
#endif /* KVM__FRAMEBUFFER_H */
diff --git a/tools/kvm/ui/sdl.c b/tools/kvm/ui/sdl.c
index 878df1d..2e7c395 100644
--- a/tools/kvm/ui/sdl.c
+++ b/tools/kvm/ui/sdl.c
@@ -9,11 +9,6 @@
#define FRAME_RATE 25
-static void sdl__write(struct framebuffer *fb, u64 addr, u8 *data, u32 len)
-{
- memcpy(&fb->mem[addr - fb->mem_addr], data, len);
-}
-
static u8 keymap[255] = {
[10] = 0x16, /* 1 */
[11] = 0x1e, /* 2 */
@@ -143,7 +138,6 @@ static int sdl__start(struct framebuffer *fb)
static struct fb_target_operations sdl_ops = {
.start = sdl__start,
- .write = sdl__write,
};
void sdl__init(struct framebuffer *fb)
diff --git a/tools/kvm/ui/vnc.c b/tools/kvm/ui/vnc.c
index 518e7f1..d760492 100644
--- a/tools/kvm/ui/vnc.c
+++ b/tools/kvm/ui/vnc.c
@@ -172,11 +172,6 @@ static void kbd_handle_ptr(int buttonMask, int x, int y, rfbClientPtr cl)
rfbDefaultPtrAddEvent(buttonMask, x, y, cl);
}
-static void vnc__write(struct framebuffer *fb, u64 addr, u8 *data, u32 len)
-{
- memcpy(&fb->mem[addr - fb->mem_addr], data, len);
-}
-
static void *vnc__thread(void *p)
{
struct framebuffer *fb = p;
@@ -215,7 +210,6 @@ static int vnc__start(struct framebuffer *fb)
static struct fb_target_operations vnc_ops = {
.start = vnc__start,
- .write = vnc__write,
};
void vnc__init(struct framebuffer *fb)
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|