qemu-kvm: Fix kvm-disabled build

Commit Message

Jan Kiszka June 3, 2011, 2:38 p.m. UTC

Minor fallout from recent refactorings.

Signed-off-by: Jan Kiszka <[e-mail]>
---
 kvm-stub.c |   11 +++--------
 qemu-kvm.h |    4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

Comments

Marcelo Tosatti June 20, 2011, 2:56 p.m. UTC | #1

On Fri, Jun 03, 2011 at 04:38:40PM +0200, Jan Kiszka wrote:
> Minor fallout from recent refactorings.
> 
> Signed-off-by: Jan Kiszka <[e-mail]>
> ---
>  kvm-stub.c |   11 +++--------
>  qemu-kvm.h |    4 ++--
>  2 files changed, 5 insertions(+), 10 deletions(-)

Applied, thanks.

--
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/kvm-stub.c b/kvm-stub.c
index 90fed66..aa2238f 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -156,22 +156,17 @@  int kvm_get_irq_route_gsi(void)
     return -ENOSYS;
 }
 
-int kvm_add_msix(uint32_t gsi, uint32_t addr_lo,
-                 uint32_t addr_hi, uint32_t data)
+int kvm_msi_message_add(KVMMsiMessage *msg)
 {
     return -ENOSYS;
 }
 
-int kvm_del_msix(uint32_t gsi, uint32_t addr_lo,
-                 uint32_t addr_hi, uint32_t data)
+int kvm_msi_message_del(KVMMsiMessage *msg)
 {
     return -ENOSYS;
 }
 
-int kvm_update_msix(uint32_t old_gsi, uint32_t old_addr_lo,
-                    uint32_t old_addr_hi, uint32_t old_data,
-                    uint32_t new_gsi, uint32_t new_addr_lo,
-                    uint32_t new_addr_hi, uint32_t new_data)
+int kvm_msi_message_update(KVMMsiMessage *old, KVMMsiMessage *new)
 {
     return -ENOSYS;
 }
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 0f833f1..942baf2 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -271,8 +271,6 @@  void kvm_load_lapic(CPUState *env);
 void kvm_hpet_enable_kpit(void);
 void kvm_hpet_disable_kpit(void);
 
-int kvm_set_boot_cpu_id(KVMState *s, uint32_t id);
-
 void kvm_tpr_access_report(CPUState *env, uint64_t rip, int is_write);
 
 int kvm_arch_init_irq_routing(void);
@@ -293,6 +291,8 @@  extern unsigned int kvm_shadow_memory;
 
 int kvm_handle_tpr_access(CPUState *env);
 
+int kvm_set_boot_cpu_id(KVMState *s, uint32_t id);
+
 #else
 #define kvm_nested 0
 #endif