diff options
author | Marcel Apfelbaum <marcel.a@redhat.com> | 2014-04-09 20:34:52 +0300 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2014-05-05 19:08:49 +0200 |
commit | f1e298794daea46e7f52995887c865ac6ada10b9 (patch) | |
tree | 0acc7bde4cf0c0fee40299c4b09e3c5552de5d26 /vl.c | |
parent | aaa663916d78aeb51a97842735052e7c8859dc9e (diff) | |
download | qemu-f1e298794daea46e7f52995887c865ac6ada10b9.zip qemu-f1e298794daea46e7f52995887c865ac6ada10b9.tar.gz qemu-f1e298794daea46e7f52995887c865ac6ada10b9.tar.bz2 |
machine: Replace QEMUMachine by MachineClass in accelerator configuration
This minimizes QEMUMachine usage, as part of machine QOM-ification.
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -2725,7 +2725,7 @@ static MachineClass *machine_parse(const char *name) exit(!name || !is_help_option(name)); } -static int tcg_init(QEMUMachine *machine) +static int tcg_init(MachineClass *mc) { tcg_exec_init(tcg_tb_size * 1024 * 1024); return 0; @@ -2735,7 +2735,7 @@ static struct { const char *opt_name; const char *name; int (*available)(void); - int (*init)(QEMUMachine *); + int (*init)(MachineClass *mc); bool *allowed; } accel_list[] = { { "tcg", "tcg", tcg_available, tcg_init, &tcg_allowed }, @@ -2744,7 +2744,7 @@ static struct { { "qtest", "QTest", qtest_available, qtest_init_accel, &qtest_allowed }, }; -static int configure_accelerator(QEMUMachine *machine) +static int configure_accelerator(MachineClass *mc) { const char *p; char buf[10]; @@ -2771,7 +2771,7 @@ static int configure_accelerator(QEMUMachine *machine) break; } *(accel_list[i].allowed) = true; - ret = accel_list[i].init(machine); + ret = accel_list[i].init(mc); if (ret < 0) { init_failed = true; fprintf(stderr, "failed to initialize %s: %s\n", @@ -4222,7 +4222,7 @@ int main(int argc, char **argv, char **envp) exit(0); } - configure_accelerator(machine); + configure_accelerator(machine_class); if (qtest_chrdev) { Error *local_err = NULL; |