From: Chen Gang <gang.chen.5i5j@gmail.com>
Date: Tue, 15 Apr 2014 23:57:41 +0000 (+0800)
Subject: vl: Eliminate a superfluous local variable
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6924bc1eef86170b7d5bee6c4aae8bb4a78350dd;p=qemu.git

vl: Eliminate a superfluous local variable

CODING_STYLE frowns upon mixing declarations and statements.  main()
has such a declaration.  Clean up by eliminating the variable.

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/vl.c b/vl.c
index 0b08a029c6..773649f023 100644
--- a/vl.c
+++ b/vl.c
@@ -4404,15 +4404,15 @@ int main(int argc, char **argv, char **envp)
 
     qdev_machine_init();
 
-    QEMUMachineInitArgs args = { .machine = machine,
-                                 .ram_size = ram_size,
-                                 .boot_order = boot_order,
-                                 .kernel_filename = kernel_filename,
-                                 .kernel_cmdline = kernel_cmdline,
-                                 .initrd_filename = initrd_filename,
-                                 .cpu_model = cpu_model };
-
-    current_machine->init_args = args;
+    current_machine->init_args = (QEMUMachineInitArgs) {
+        .machine = machine,
+        .ram_size = ram_size,
+        .boot_order = boot_order,
+        .kernel_filename = kernel_filename,
+        .kernel_cmdline = kernel_cmdline,
+        .initrd_filename = initrd_filename,
+        .cpu_model = cpu_model };
+
     machine->init(&current_machine->init_args);
 
     audio_init();