aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel@redhat.com>2015-02-04 17:43:51 +0200
committerMichael S. Tsirkin <mst@redhat.com>2015-03-11 18:16:17 +0100
commitb16565b396dbbb4c99899dbea599b22f4e0658d6 (patch)
treeb56656a9f350799aae7ac0edf3f04fb88cfa8383
parent446f16a6906e9d05aa9ce0dde727d4f731a89298 (diff)
kvm: add machine state to kvm_arch_init
Needed to query machine's properties. Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--include/sysemu/kvm.h2
-rw-r--r--kvm-all.c2
-rw-r--r--target-arm/kvm.c2
-rw-r--r--target-i386/kvm.c2
-rw-r--r--target-mips/kvm.c2
-rw-r--r--target-ppc/kvm.c2
-rw-r--r--target-s390x/kvm.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 30cb84d2b8..3792463080 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 729f3345ac..cbedc2564e 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 23cefe98b4..72c1fa1e64 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 40d6a14c85..ce554e4665 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 b68191c88e..4d1f7ead81 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 1edf2b5aeb..12328a4027 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 508cc0a082..b1369d584f 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);