[PULL,09/25] kvm: add machine state to kvm_arch_init

Commit Message

Michael S. Tsirkin March 11, 2015, 7:51 p.m. UTC

From: Marcel Apfelbaum <[e-mail]>

Needed to query machine's properties.

Signed-off-by: Marcel Apfelbaum <[e-mail]>
Acked-by: Michael S. Tsirkin <[e-mail]>
Signed-off-by: Michael S. Tsirkin <[e-mail]>
Reviewed-by: Paolo Bonzini <[e-mail]>
---
 include/sysemu/kvm.h | 2 +-
 kvm-all.c            | 2 +-
 target-arm/kvm.c     | 2 +-
 target-i386/kvm.c    | 2 +-
 target-mips/kvm.c    | 2 +-
 target-ppc/kvm.c     | 2 +-
 target-s390x/kvm.c   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

Patch

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 30cb84d..3792463 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -259,7 +259,7 @@  int kvm_arch_get_registers(CPUState *cpu);
 
 int kvm_arch_put_registers(CPUState *cpu, int level);
 
-int kvm_arch_init(KVMState *s);
+int kvm_arch_init(MachineState *ms, KVMState *s);
 
 int kvm_arch_init_vcpu(CPUState *cpu);
 
diff --git a/kvm-all.c b/kvm-all.c
index 729f334..cbedc25 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1598,7 +1598,7 @@  static int kvm_init(MachineState *ms)
     kvm_resamplefds_allowed =
         (kvm_check_extension(s, KVM_CAP_IRQFD_RESAMPLE) > 0);
 
-    ret = kvm_arch_init(s);
+    ret = kvm_arch_init(ms, s);
     if (ret < 0) {
         goto err;
     }
diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index 23cefe9..72c1fa1 100644
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -150,7 +150,7 @@  static const TypeInfo host_arm_cpu_type_info = {
     .class_size = sizeof(ARMHostCPUClass),
 };
 
-int kvm_arch_init(KVMState *s)
+int kvm_arch_init(MachineState *ms, KVMState *s)
 {
     /* For ARM interrupt delivery is always asynchronous,
      * whether we are using an in-kernel VGIC or not.
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 40d6a14..ce554e4 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -840,7 +840,7 @@  static int kvm_get_supported_msrs(KVMState *s)
     return ret;
 }
 
-int kvm_arch_init(KVMState *s)
+int kvm_arch_init(MachineState *ms, KVMState *s)
 {
     uint64_t identity_base = 0xfffbc000;
     uint64_t shadow_mem;
diff --git a/target-mips/kvm.c b/target-mips/kvm.c
index b68191c..4d1f7ea 100644
--- a/target-mips/kvm.c
+++ b/target-mips/kvm.c
@@ -40,7 +40,7 @@  unsigned long kvm_arch_vcpu_id(CPUState *cs)
     return cs->cpu_index;
 }
 
-int kvm_arch_init(KVMState *s)
+int kvm_arch_init(MachineState *ms, KVMState *s)
 {
     /* MIPS has 128 signals */
     kvm_set_sigmask_len(s, 16);
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 1edf2b5..12328a4 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -95,7 +95,7 @@  static void kvm_kick_cpu(void *opaque)
 
 static int kvm_ppc_register_host_cpu_type(void);
 
-int kvm_arch_init(KVMState *s)
+int kvm_arch_init(MachineState *ms, KVMState *s)
 {
     cap_interrupt_unset = kvm_check_extension(s, KVM_CAP_PPC_UNSET_IRQ);
     cap_interrupt_level = kvm_check_extension(s, KVM_CAP_PPC_IRQ_LEVEL);
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 508cc0a..b1369d5 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -173,7 +173,7 @@  static void kvm_s390_enable_cmma(KVMState *s)
     trace_kvm_enable_cmma(rc);
 }
 
-int kvm_arch_init(KVMState *s)
+int kvm_arch_init(MachineState *ms, KVMState *s)
 {
     cap_sync_regs = kvm_check_extension(s, KVM_CAP_SYNC_REGS);
     cap_async_pf = kvm_check_extension(s, KVM_CAP_ASYNC_PF);