diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-09-26 17:45:30 -0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-10-09 12:57:10 +0200 |
| commit | f6a1ef64408a5f7f52601589fef2a850b93d817e (patch) | |
| tree | 1a272c6f0d4ed248572bb2835b17318ef8c9daa0 /accel.c | |
| parent | 0d15da8e6fc3cbcd088476c561dcc88b9aae493a (diff) | |
accel: Pass MachineState object to accel init functions
Most of the machine options and machine state information is in the
MachineState object, not on the MachineClass. This will allow init
functions to use the MachineState object directly instead of
qemu_get_machine_opts() or the current_machine global.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'accel.c')
| -rw-r--r-- | accel.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -24,6 +24,7 @@ */ #include "sysemu/accel.h" +#include "hw/boards.h" #include "qemu-common.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" @@ -35,7 +36,7 @@ int tcg_tb_size; static bool tcg_allowed = true; -static int tcg_init(MachineClass *mc) +static int tcg_init(MachineState *ms) { tcg_exec_init(tcg_tb_size * 1024 * 1024); return 0; @@ -57,18 +58,18 @@ static AccelClass *accel_find(const char *opt_name) return ac; } -static int accel_init_machine(AccelClass *acc, MachineClass *mc) +static int accel_init_machine(AccelClass *acc, MachineState *ms) { int ret; *(acc->allowed) = true; - ret = acc->init_machine(mc); + ret = acc->init_machine(ms); if (ret < 0) { *(acc->allowed) = false; } return ret; } -int configure_accelerator(MachineClass *mc) +int configure_accelerator(MachineState *ms) { const char *p; char buf[10]; @@ -98,7 +99,7 @@ int configure_accelerator(MachineClass *mc) acc->name); continue; } - ret = accel_init_machine(acc, mc); + ret = accel_init_machine(acc, ms); if (ret < 0) { init_failed = true; fprintf(stderr, "failed to initialize %s: %s\n", |