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@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: John Floren <john@jfloren.net>
Cc: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/framebuffer.c b/tools/kvm/framebuffer.c
index eae0a92972cdcf014d2978e1b0fc85f1b06cb765..1e354962e0560a4e49be271d3068835e46da64d7 100644 (file)
--- 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 6a9fb37be00b89ff0b8022ebac3586318ae2268c..d28dadb9f055a10cce5d55a1aa79064f67eedad3 100644 (file)
--- 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 878df1dd105ce4535ef37bfab6820111a4a29115..2e7c395eb59f6a1aaa7e15254da09952b3a38285 100644 (file)
--- 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 518e7f1e4b803cc11a5469b8eefc5d45a84e5ac8..d7604921257b4ea0f2a2257ebc1e28cf4c196129 100644 (file)
--- 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)