From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVHj8-0005ev-V8 for qemu-devel@nongnu.org; Mon, 15 Feb 2016 06:54:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVHj5-0001wp-Oe for qemu-devel@nongnu.org; Mon, 15 Feb 2016 06:54:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVHj5-0001wj-HE for qemu-devel@nongnu.org; Mon, 15 Feb 2016 06:53:59 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 7F2395A7F for ; Mon, 15 Feb 2016 11:53:58 +0000 (UTC) References: <1455303747-19776-1-git-send-email-ehabkost@redhat.com> <1455303747-19776-2-git-send-email-ehabkost@redhat.com> <87lh6m5l71.fsf@blackfin.pond.sub.org> <56C1AE49.9080700@redhat.com> From: Laszlo Ersek Message-ID: <56C1BC53.8070109@redhat.com> Date: Mon, 15 Feb 2016 12:53:55 +0100 MIME-Version: 1.0 In-Reply-To: <56C1AE49.9080700@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/4] vl.c: Fix regression in machine error message List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum , Markus Armbruster , Eduardo Habkost Cc: Paolo Bonzini , qemu-devel@nongnu.org On 02/15/16 11:54, Marcel Apfelbaum wrote: > On 02/15/2016 12:20 PM, Markus Armbruster wrote: >> Eduardo Habkost writes: >> >>> From: Marcel Apfelbaum >>> >>> Commit e1ce0c3cb (vl.c: fix regression when reading machine type >>> from config file) fixed the error message when the machine type >>> was supplied inside the config file. However now the option name >>> is not displayed correctly if the error happens when the machine >>> is specified at command line. >>> >>> Running >>> ./x86_64-softmmu/qemu-system-x86_64 -M q35-1.5 -redir tcp:8022::22 >>> will result in the error message: >>> qemu-system-x86_64: -redir tcp:8022::22: unsupported machine type >>> Use -machine help to list supported machines >>> >>> Fixed it by restoring the error location and also extracted the code >>> dealing with machine options into a separate function. >>> >>> Reported-by: Michael S. Tsirkin >>> Reviewed-by: Laszlo Ersek >>> Signed-off-by: Marcel Apfelbaum >>> Reviewed-by: Eduardo Habkost >>> Signed-off-by: Eduardo Habkost >>> --- >>> vl.c | 37 ++++++++++++++++++++++++++----------- >>> 1 file changed, 26 insertions(+), 11 deletions(-) >>> >>> diff --git a/vl.c b/vl.c >>> index 175ebcc..afbf13f 100644 >>> --- a/vl.c >>> +++ b/vl.c >>> @@ -2748,6 +2748,31 @@ static const QEMUOption *lookup_opt(int argc, >>> char **argv, >>> return popt; >>> } >>> >>> +static void set_machine_options(MachineClass **machine_class) >>> +{ >>> + const char *optarg; >>> + QemuOpts *opts; >>> + Location loc; >>> + >>> + loc_push_none(&loc); >>> + >>> + opts = qemu_get_machine_opts(); >>> + qemu_opts_loc_restore(opts); >>> + >>> + optarg = qemu_opt_get(opts, "type"); >>> + if (optarg) { >>> + *machine_class = machine_parse(optarg); >>> + } >>> + >>> + if (*machine_class == NULL) { >>> + error_report("No machine specified, and there is no default"); >>> + error_printf("Use -machine help to list supported machines\n"); >>> + exit(1); >>> + } >>> + >>> + loc_pop(&loc); >>> +} >>> + >>> static int machine_set_property(void *opaque, >>> const char *name, const char *value, >>> Error **errp) >>> @@ -4030,17 +4055,7 @@ int main(int argc, char **argv, char **envp) >>> >>> replay_configure(icount_opts); >>> >>> - opts = qemu_get_machine_opts(); >>> - optarg = qemu_opt_get(opts, "type"); >>> - if (optarg) { >>> - machine_class = machine_parse(optarg); >>> - } >>> - >>> - if (machine_class == NULL) { >>> - error_report("No machine specified, and there is no default"); >>> - error_printf("Use -machine help to list supported machines\n"); >>> - exit(1); >>> - } >>> + set_machine_options(&machine_class); >> >> Style nit: I'd prefer >> >> machine_class = parse_machine_options(); >> >> Can convert to that when I apply to error-next. > > Hi Markus, > > Sure, please do that. > It was suggested by Laszlo - I think - to match "set_memory_options" below. Yes, I suggested that. I do defer to Markus though. Thanks Laszlo > We can add a trivial patch to rename it too, of course. > > Thanks, > Marcel > >> >>> >>> set_memory_options(&ram_slots, &maxram_size, machine_class); >