[kvm-Bugs-2848498] COMPILATION ERRORS

Commit Message

SourceForge.net Sept. 1, 2009, 2:53 p.m. UTC

Bugs item #2848498, was opened at 2009-09-01 18:51
Message generated for change (Comment added) made by pavlinux
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=893831&aid=2848498&group_id=180599

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: qemu
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Pavel Vasilyev (pavlinux)
Assigned to: Nobody/Anonymous (nobody)
Summary: COMPILATION ERRORS

Initial Comment:
CPU:          Dual Core AMD Opteron(tm) Processor 265
KVM:          kvm-88-905-g6025b2d (git)
KERNEL:       2.6.30.5
ARCH:         x86_64
Guest OS:     Windows XP SP3
qemu command: many


Unused variables, redefinition, etc. 

----------------------------------------------------------------------

>Comment By: Pavel Vasilyev (pavlinux)
Date: 2009-09-01 18:52

Message:

@@ -1072,6 +1075,7 @@ void kvm_arch_do_ioperm(void *_data);
 #define ALIGN(x, y)  (((x)+(y)-1) & ~((y)-1))
 #define BITMAP_SIZE(m) (ALIGN(((m)>>TARGET_PAGE_BITS), HOST_LONG_BITS) /
8)

+
 #ifdef CONFIG_KVM
 #include "sys-queue.h"

@@ -1124,10 +1128,6 @@ static inline void kvm_init_vcpu(CPUState *env)
 static inline void kvm_load_tsc(CPUState *env)
 {
 }
-#endif
-
-void kvm_mutex_unlock(void);
-void kvm_mutex_lock(void);

 static inline void qemu_mutex_unlock_iothread(void)
 {
@@ -1140,6 +1140,9 @@ static inline void qemu_mutex_lock_iothread(void)
     if (kvm_enabled())
         kvm_mutex_lock();
 }
+#endif
+
+void kvm_arch_do_ioperm(void *data);

 int kvm_physical_sync_dirty_bitmap(target_phys_addr_t start_addr,
                                    target_phys_addr_t end_addr);


----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=893831&aid=2848498&group_id=180599
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/qemu-kvm.c b/qemu-kvm.c
index d554749..245c4c7 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -1815,7 +1815,6 @@  static void *ap_main_loop(void *_env)
 {
     CPUState *env = _env;
     sigset_t signals;
-    struct ioperm_data *data = NULL;

     current_env = env;
     env->thread_id = kvm_get_thread_id();
@@ -1824,6 +1823,9 @@  static void *ap_main_loop(void *_env)
     env->kvm_cpu_state.vcpu_ctx = kvm_create_vcpu(env, env->cpu_index);

 #ifdef USE_KVM_DEVICE_ASSIGNMENT
+
+    struct ioperm_data *data = NULL;
+
     /* do ioperm for io ports of assigned devices */
     LIST_FOREACH(data, &ioperm_head, entries)
         on_vcpu(env, kvm_arch_do_ioperm, data);
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 2c1730b..2ffc600 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -1060,6 +1060,9 @@  int kvm_arch_init_irq_routing(void);
 int kvm_mmio_read(void *opaque, uint64_t addr, uint8_t * data, int len);
 int kvm_mmio_write(void *opaque, uint64_t addr, uint8_t * data, int
len);

+void kvm_mutex_unlock(void);
+void kvm_mutex_lock(void);
+
 #ifdef USE_KVM_DEVICE_ASSIGNMENT
 struct ioperm_data;