From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8Y8K-0000tO-Gc for qemu-devel@nongnu.org; Tue, 06 Jan 2015 12:41:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y8Y8G-0003gd-5R for qemu-devel@nongnu.org; Tue, 06 Jan 2015 12:41:32 -0500 From: Marcel Apfelbaum Date: Tue, 6 Jan 2015 19:41:18 +0200 Message-Id: <1420566078-27649-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH] vl.c: fix regression when reading machine type from config file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, armbru@redhat.com, qemu-stable@nongnu.org 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 Signed-off-by: Marcel Apfelbaum --- vl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vl.c b/vl.c index 7786b2f..ecd8c93 100644 --- a/vl.c +++ b/vl.c @@ -3659,6 +3659,11 @@ int main(int argc, char **argv, char **envp) strerror(-ret)); exit(1); } + opts = qemu_get_machine_opts(); + optarg = qemu_opt_get(opts, "type"); + if (optarg) { + machine_class = machine_parse(optarg); + } break; } case QEMU_OPTION_spice: -- 2.1.0