mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kvm: add machine state to kvm_arch_init

Browse Source 
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>
This commit is contained in:
Marcel Apfelbaum 2015-02-04 17:43:51 +02:00 committed by Michael S. Tsirkin
parent 446f16a690
commit b16565b396
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sysemu/kvm.h
View File

@ -259,7 +259,7 @@ int kvm_arch_get_registers(CPUState *cpu);
int kvm_arch_put_registers(CPUState *cpu, int level); 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); int kvm_arch_init_vcpu(CPUState *cpu);

2
kvm-all.c
View File

@ -1598,7 +1598,7 @@ static int kvm_init(MachineState *ms)
kvm_resamplefds_allowed = kvm_resamplefds_allowed =
(kvm_check_extension(s, KVM_CAP_IRQFD_RESAMPLE) > 0); (kvm_check_extension(s, KVM_CAP_IRQFD_RESAMPLE) > 0);
ret = kvm_arch_init(s); ret = kvm_arch_init(ms, s);
if (ret < 0) { if (ret < 0) {
goto err; goto err;
} }

2
target-arm/kvm.c
View File

@ -150,7 +150,7 @@ static const TypeInfo host_arm_cpu_type_info = {
.class_size = sizeof(ARMHostCPUClass), .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, /* For ARM interrupt delivery is always asynchronous,
* whether we are using an in-kernel VGIC or not. * whether we are using an in-kernel VGIC or not.

2
target-i386/kvm.c
View File

@ -840,7 +840,7 @@ static int kvm_get_supported_msrs(KVMState *s)
return ret; return ret;
} }
int kvm_arch_init(KVMState *s) int kvm_arch_init(MachineState *ms, KVMState *s)
{ {
uint64_t identity_base = 0xfffbc000; uint64_t identity_base = 0xfffbc000;
uint64_t shadow_mem; uint64_t shadow_mem;

2
target-mips/kvm.c
View File

@ -40,7 +40,7 @@ unsigned long kvm_arch_vcpu_id(CPUState *cs)
return cs->cpu_index; return cs->cpu_index;
} }
int kvm_arch_init(KVMState *s) int kvm_arch_init(MachineState *ms, KVMState *s)
{ {
/* MIPS has 128 signals */ /* MIPS has 128 signals */
kvm_set_sigmask_len(s, 16); kvm_set_sigmask_len(s, 16);

2
target-ppc/kvm.c
View File

@ -95,7 +95,7 @@ static void kvm_kick_cpu(void *opaque)
static int kvm_ppc_register_host_cpu_type(void); 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_unset = kvm_check_extension(s, KVM_CAP_PPC_UNSET_IRQ);
cap_interrupt_level = kvm_check_extension(s, KVM_CAP_PPC_IRQ_LEVEL); cap_interrupt_level = kvm_check_extension(s, KVM_CAP_PPC_IRQ_LEVEL);

2
target-s390x/kvm.c
View File

@ -173,7 +173,7 @@ static void kvm_s390_enable_cmma(KVMState *s)
trace_kvm_enable_cmma(rc); 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_sync_regs = kvm_check_extension(s, KVM_CAP_SYNC_REGS);
cap_async_pf = kvm_check_extension(s, KVM_CAP_ASYNC_PF); cap_async_pf = kvm_check_extension(s, KVM_CAP_ASYNC_PF);