qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH v2 2/4] vl: Reset location after handling command-li


From: Eduardo Habkost
Subject: [Qemu-devel] [PATCH v2 2/4] vl: Reset location after handling command-line arguments
Date: Fri, 12 Feb 2016 17:02:25 -0200

After looping through all command-line arguments, error location
info becomes obsolete, and any function calling error_report()
will print misleading information. This breaks error reporting
for some option handling, like:

  $ qemu-system-x86_64 -icount rr=x -vnc :0
  qemu-system-x86_64: -vnc :0: Invalid icount rr option: x

  $ qemu-system-x86_64 -m size= -vnc :0
  qemu-system-x86_64: -vnc :0: missing 'size' option value

Fix this by resetting location info as soon as we exit the
command-line handling loop.

With this, replay_configure() and set_memory_options() won't
print any location info yet, but at least they won't print
incorrect information.

Signed-off-by: Eduardo Habkost <address@hidden>
---
 vl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vl.c b/vl.c
index afbf13f..50cd018 100644
--- a/vl.c
+++ b/vl.c
@@ -4053,14 +4053,14 @@ int main(int argc, char **argv, char **envp)
         }
     }
 
+    loc_set_none();
+
     replay_configure(icount_opts);
 
     set_machine_options(&machine_class);
 
     set_memory_options(&ram_slots, &maxram_size, machine_class);
 
-    loc_set_none();
-
     os_daemonize();
 
     if (qemu_init_main_loop(&main_loop_err)) {
-- 
2.1.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]