From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8rPT-0007ID-5s for qemu-devel@nongnu.org; Wed, 07 Jan 2015 09:16:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y8rPO-000274-7X for qemu-devel@nongnu.org; Wed, 07 Jan 2015 09:16:31 -0500 Message-ID: <54AD0F40.5060406@redhat.com> Date: Wed, 07 Jan 2015 12:49:36 +0200 From: Marcel Apfelbaum MIME-Version: 1.0 References: <1420566078-27649-1-git-send-email-marcel@redhat.com> <54AC3B1A.3070806@redhat.com> In-Reply-To: <54AC3B1A.3070806@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [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: Paolo Bonzini , qemu-devel@nongnu.org Cc: armbru@redhat.com, qemu-stable@nongnu.org On 01/06/2015 09:44 PM, Paolo Bonzini wrote: > > > On 06/01/2015 18:41, Marcel Apfelbaum wrote: >> 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: >> > > This suggests that these five lines should be moved after the switch, > and "-M" should become simply a synonym of "-machine" (that's the other > place where we invoke machine_parse). Hi Paolo, Thanks for the review. It makes sense. I will change this and submit again. Thanks, Marcel > > Paolo >