tree b46b345ab6a1f6644b4b044a684760b8ec45b145
parent 5b5c7bf8e5c0f1ba2ac15954a9d151f1c2e408ef
author Marcel Apfelbaum <marcel@redhat.com> 1420632698 +0200
committer Michael Roth <mdroth@linux.vnet.ibm.com> 1421276924 -0600

vl.c: fix regression when reading machine type from config file

After 'Machine as QOM' series the machine type input triggers
the creation of the machine class.
If the machine type is set in the configuration file, the machine
class is not updated accordingly and remains the default.

Fixed that by querying the machine options after the configuration
file is loaded.

Cc: qemu-stable@nongnu.org
Reported-by: William Dauchy <william@gandi.net>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 364c3e6b8dd7912e01d19122d791b8c8f6df4f6c)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>