Blame qemu-fix-arm-framebuffer-build.patch
|
Mark McLoughlin |
92dcc1 |
From: Mark McLoughlin <markmc@redhat.com>
|
|
Mark McLoughlin |
92dcc1 |
Date: Mon, 27 Apr 2009 10:18:14 +0100
|
|
Mark McLoughlin |
92dcc1 |
Subject: [PATCH] kvm: qemu: framebuffer: build fix for target-arm
|
|
Mark McLoughlin |
92dcc1 |
|
|
Mark McLoughlin |
92dcc1 |
Include qemu-kvm.h for non-KVM_UPSTREAM building and surround the
|
|
Mark McLoughlin |
92dcc1 |
kvm code with USE_KVM guards.
|
|
Mark McLoughlin |
92dcc1 |
|
|
Mark McLoughlin |
92dcc1 |
Fixes target-arm:
|
|
Mark McLoughlin |
92dcc1 |
|
|
Mark McLoughlin |
92dcc1 |
qemu/hw/framebuffer.c: In function 'framebuffer_update_display':
|
|
Mark McLoughlin |
92dcc1 |
qemu/hw/framebuffer.c:53: warning: implicit declaration of function 'kvm_enabled'
|
|
Mark McLoughlin |
92dcc1 |
qemu/hw/framebuffer.c:54: warning: implicit declaration of function 'kvm_physical_sync_dirty_bitmap'
|
|
Mark McLoughlin |
92dcc1 |
|
|
Mark McLoughlin |
92dcc1 |
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
|
|
Mark McLoughlin |
92dcc1 |
---
|
|
Mark McLoughlin |
92dcc1 |
qemu/hw/framebuffer.c | 3 +++
|
|
Mark McLoughlin |
92dcc1 |
1 files changed, 3 insertions(+), 0 deletions(-)
|
|
Mark McLoughlin |
92dcc1 |
|
|
Mark McLoughlin |
92dcc1 |
diff --git a/qemu/hw/framebuffer.c b/qemu/hw/framebuffer.c
|
|
Mark McLoughlin |
92dcc1 |
index 1086ba9..e2d7604 100644
|
|
Mark McLoughlin |
92dcc1 |
--- a/qemu/hw/framebuffer.c
|
|
Mark McLoughlin |
92dcc1 |
+++ b/qemu/hw/framebuffer.c
|
|
Mark McLoughlin |
92dcc1 |
@@ -18,6 +18,7 @@
|
|
Mark McLoughlin |
92dcc1 |
#include "console.h"
|
|
Mark McLoughlin |
92dcc1 |
#include "framebuffer.h"
|
|
Mark McLoughlin |
92dcc1 |
#include "kvm.h"
|
|
Mark McLoughlin |
92dcc1 |
+#include "qemu-kvm.h"
|
|
Mark McLoughlin |
92dcc1 |
|
|
Mark McLoughlin |
92dcc1 |
/* Render an image from a shared memory framebuffer. */
|
|
Mark McLoughlin |
92dcc1 |
|
|
Mark McLoughlin |
92dcc1 |
@@ -50,9 +51,11 @@ void framebuffer_update_display(
|
|
Mark McLoughlin |
92dcc1 |
*first_row = -1;
|
|
Mark McLoughlin |
92dcc1 |
src_len = src_width * rows;
|
|
Mark McLoughlin |
92dcc1 |
|
|
Mark McLoughlin |
92dcc1 |
+#ifdef USE_KVM
|
|
Mark McLoughlin |
92dcc1 |
if (kvm_enabled()) {
|
|
Mark McLoughlin |
92dcc1 |
kvm_physical_sync_dirty_bitmap(base, src_len);
|
|
Mark McLoughlin |
92dcc1 |
}
|
|
Mark McLoughlin |
92dcc1 |
+#endif
|
|
Mark McLoughlin |
92dcc1 |
pd = cpu_get_physical_page_desc(base);
|
|
Mark McLoughlin |
92dcc1 |
pd2 = cpu_get_physical_page_desc(base + src_len - 1);
|
|
Mark McLoughlin |
92dcc1 |
/* We should reall check that this is a continuous ram region.
|
|
Mark McLoughlin |
92dcc1 |
--
|
|
Mark McLoughlin |
92dcc1 |
1.6.0.6
|
|
Mark McLoughlin |
92dcc1 |
|