Skip to contentSkip to conversation

kvm: qemu: framebuffer: build fix for target-arm

PATCH In review Mark McLoughlin 2 participants 2 messages Apr 27, 2009 – Apr 28, 2009 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kvm: qemu: framebuffer: build fix for target-arm

Include qemu-kvm.h for non-KVM_UPSTREAM building and surround the kvm code with USE_KVM guards.

Fixes target-arm:

qemu/hw/framebuffer.c: In function 'framebuffer_update_display':
qemu/hw/framebuffer.c:53: warning: implicit declaration of function 'kvm_enabled' qemu/hw/framebuffer.c:54: warning: implicit declaration of function 'kvm_physical_sync_dirty_bitmap'

---
 hw/framebuffer.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
hw/framebuffer.c +3 -0
index 1086ba9..e2d7604 100644
@@ -18,6 +18,7 @@
 #include "console.h"
 #include "framebuffer.h"
 #include "kvm.h"
+#include "qemu-kvm.h"
 
 /* Render an image from a shared memory framebuffer.  */
    
@@ -50,9 +51,11 @@ void framebuffer_update_display(
     *first_row = -1;
     src_len = src_width * rows;
 
+#ifdef USE_KVM
     if (kvm_enabled()) {
         kvm_physical_sync_dirty_bitmap(base, src_len);
     }
+#endif
     pd = cpu_get_physical_page_desc(base);
     pd2 = cpu_get_physical_page_desc(base + src_len - 1);
     /* We should reall check that this is a continuous ram region.
Signature · 1 line
1.6.0.6
#1 lore raw
Quoted 14 lines · Mark McLoughlin

Include qemu-kvm.h for non-KVM_UPSTREAM building and surround the kvm code with USE_KVM guards.

Fixes target-arm:

qemu/hw/framebuffer.c: In function 'framebuffer_update_display':
qemu/hw/framebuffer.c:53: warning: implicit declaration of function 'kvm_enabled' qemu/hw/framebuffer.c:54: warning: implicit declaration of function 'kvm_physical_sync_dirty_bitmap'

hw/framebuffer.c +0 -0
index 1086ba9..e2d7604 100644

hw/framebuffer.c line 22

Quoted 5 lines
hw/framebuffer.c +1 -0
@@ -18,6 +18,7 @@
 #include "console.h"
 #include "framebuffer.h"
 #include "kvm.h"
+#include "qemu-kvm.h"
 

Maybe we should have kvm.h include qemu-kvm.h, to avoid more divergence (even if it is trivial).

hw/framebuffer.c void framebuffer_update_display( · line 58

Quoted 12 lines
hw/framebuffer.c +2 -0
 /* Render an image from a shared memory framebuffer.  */
 
@@ -50,9 +51,11 @@ void framebuffer_update_display(
     *first_row = -1;
     src_len = src_width * rows;
 
+#ifdef USE_KVM
     if (kvm_enabled()) {
         kvm_physical_sync_dirty_bitmap(base, src_len);
     }
+#endif

Similarly, provide null definitions for kvm_enabled() and kvm_physical_blah() to avoid the ifdefs.

Signature · 1 line
Do not meddle in the internals of kernels, for they are subtle and quick to panic.