[Qemu-trivial] [PATCH trivial v2 0/2] vl: simplify code for main()

[Qemu-trivial] [PATCH trivial v2 0/2] vl: simplify code for main()

[Chen Gang]

In "vl.c", at least, we can simplify the code below, so can let readers
read professional C code (especially for new readers, which often start
reading code at main function).

 - Remove useless 'continue' in main().

 - Eliminate a superfluous local variable in main().

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
---
 vl.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

[Qemu-trivial] [PATCH trivial v2 1/2] vl: Remove useless 'continue'

[Chen Gang]

"This if else has no code between it and the end of the enclosing
while loop. This makes this continue redundant."

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
---
 vl.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/vl.c b/vl.c
index 9975e5a..7505002 100644
--- a/vl.c
+++ b/vl.c
@@ -3034,7 +3034,6 @@ int main(int argc, char **argv, char **envp)
         if (argv[optind][0] != '-') {
             /* disk image */
             optind++;
-            continue;
         } else {
             const QEMUOption *popt;
 
-- 
1.7.9.5

[Qemu-trivial] [PATCH trivial v2 2/2] vl: Eliminate a superfluous local variable

[Chen Gang]

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>
---
 vl.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/vl.c b/vl.c
index 377f962..d381443 100644
--- a/vl.c
+++ b/vl.c
@@ -4368,15 +4368,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();
-- 
1.7.9.5

Re: [Qemu-trivial] [Qemu-devel] [PATCH trivial v2 0/2] vl: simplify code for main()

[Markus Armbruster]

Chen Gang <gang.chen.5i5j@gmail.com> writes:

> In "vl.c", at least, we can simplify the code below, so can let readers
> read professional C code (especially for new readers, which often start
> reading code at main function).
>
>  - Remove useless 'continue' in main().
>
>  - Eliminate a superfluous local variable in main().
>
> Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-trivial] [PATCH trivial v2 0/2] vl: simplify code for main()

[Michael Tokarev]

16.04.2014 03:55, Chen Gang wrote:
> In "vl.c", at least, we can simplify the code below, so can let readers
> read professional C code (especially for new readers, which often start
> reading code at main function).
> 
>  - Remove useless 'continue' in main().
> 
>  - Eliminate a superfluous local variable in main().

Applied to -trivial, thank you!

/mjt