summaryrefslogtreecommitdiff
path: root/kvm-all.c
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel.a@redhat.com>2014-04-09 20:34:52 +0300
committerAndreas Färber <afaerber@suse.de>2014-05-05 19:08:49 +0200
commitf1e298794daea46e7f52995887c865ac6ada10b9 (patch)
tree0acc7bde4cf0c0fee40299c4b09e3c5552de5d26 /kvm-all.c
parentaaa663916d78aeb51a97842735052e7c8859dc9e (diff)
downloadqemu-f1e298794daea46e7f52995887c865ac6ada10b9.tar.gz
qemu-f1e298794daea46e7f52995887c865ac6ada10b9.tar.bz2
qemu-f1e298794daea46e7f52995887c865ac6ada10b9.zip
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 'kvm-all.c')
-rw-r--r--kvm-all.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kvm-all.c b/kvm-all.c
index 82a91199e1..5cb7f26f4f 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1341,7 +1341,7 @@ static int kvm_max_vcpus(KVMState *s)
return (ret) ? ret : kvm_recommended_vcpus(s);
}
-int kvm_init(QEMUMachine *machine)
+int kvm_init(MachineClass *mc)
{
static const char upgrade_note[] =
"Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n"
@@ -1433,8 +1433,8 @@ int kvm_init(QEMUMachine *machine)
}
kvm_type = qemu_opt_get(qemu_get_machine_opts(), "kvm-type");
- if (machine->kvm_type) {
- type = machine->kvm_type(kvm_type);
+ if (mc->kvm_type) {
+ type = mc->kvm_type(kvm_type);
} else if (kvm_type) {
fprintf(stderr, "Invalid argument kvm-type=%s\n", kvm_type);
goto err;