From patchwork Sun Mar 30 14:34:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 335119 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 180571400C2 for ; Mon, 31 Mar 2014 01:35:43 +1100 (EST) Received: from localhost ([::1]:44583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUGpn-0005pJ-0V for incoming@patchwork.ozlabs.org; Sun, 30 Mar 2014 10:35:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUGpG-0005CK-B8 for qemu-devel@nongnu.org; Sun, 30 Mar 2014 10:35:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUGp4-0005Y0-Ky for qemu-devel@nongnu.org; Sun, 30 Mar 2014 10:35:06 -0400 Received: from mail-pb0-x229.google.com ([2607:f8b0:400e:c01::229]:37826) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUGp4-0005Xm-AX for qemu-devel@nongnu.org; Sun, 30 Mar 2014 10:34:54 -0400 Received: by mail-pb0-f41.google.com with SMTP id jt11so7089509pbb.0 for ; Sun, 30 Mar 2014 07:34:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=MNFshjm2G1MCXf8eVw3tZCfwSAtd32sCHV//h9XCNso=; b=egQGCPIX6fdkgoywUpBZka3Qy2tEoTzbvicfPnktWYo4jQ4R+6W3ZnOMnBvi0PnNNC +fTHm6Y1fw9AIhO7c2K++ChaEG8fPauI1mQmuXrJ9u8bN5rS9JmvB5enqbqgh002twLY BTDOS3ptkBktRBF1xidXyoT4iBnG5ayGFQjdtn+2WbHUukjCeb7K7cdFR6HKE23se5Yb f2ffpbYa53nW/nIXo+WqzLViczPkJAJxv8JRsrC3NJwHuG0U4pPfVgjNBLhwhUaeeye6 8I5Lm4RqSQLOgqmAkh7XSVZftTAxntR0u/Z/ppnXkzUuJGVSLgc7Gtcy66S/QbKSFi9Q xcXQ== X-Received: by 10.68.164.229 with SMTP id yt5mr19723251pbb.28.1396190092821; Sun, 30 Mar 2014 07:34:52 -0700 (PDT) Received: from [192.168.1.103] ([223.72.65.42]) by mx.google.com with ESMTPSA id qq5sm37513228pbb.24.2014.03.30.07.34.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 30 Mar 2014 07:34:52 -0700 (PDT) Message-ID: <53382B89.9030301@gmail.com> Date: Sun, 30 Mar 2014 22:34:49 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: aliguori@amazon.com, QEMU Developers X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::229 Subject: [Qemu-devel] [PATCH trival] vl.c: clean up code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org in get_boot_device() - remove 'res' to simplify code in main(): - remove useless 'continue'. - in main switch(): - remove or adjust all useless 'break'. - remove useless '{' and '}'. - use assignment directly to replace useless 'args' (which is defined in the middle of code block). Signed-off-by: Chen Gang --- vl.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/vl.c b/vl.c index 9975e5a..9c733cb 100644 --- a/vl.c +++ b/vl.c @@ -1188,18 +1188,16 @@ DeviceState *get_boot_device(uint32_t position) { uint32_t counter = 0; FWBootEntry *i = NULL; - DeviceState *res = NULL; if (!QTAILQ_EMPTY(&fw_boot_order)) { QTAILQ_FOREACH(i, &fw_boot_order, link) { if (counter == position) { - res = i->dev; - break; + return i->dev; } counter++; } } - return res; + return NULL; } /* @@ -3034,7 +3032,6 @@ int main(int argc, char **argv, char **envp) if (argv[optind][0] != '-') { /* disk image */ optind++; - continue; } else { const QEMUOption *popt; @@ -3204,11 +3201,11 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_curses: #ifdef CONFIG_CURSES display_type = DT_CURSES; + break; #else fprintf(stderr, "Curses support is disabled\n"); exit(1); #endif - break; case QEMU_OPTION_portrait: graphic_rotate = 90; break; @@ -3286,7 +3283,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_audio_help: AUD_help (); exit (0); - break; case QEMU_OPTION_soundhw: select_soundhw (optarg); break; @@ -3296,7 +3292,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_version: version(); exit(0); - break; case QEMU_OPTION_m: { int64_t value; uint64_t sz; @@ -3638,11 +3633,10 @@ int main(int argc, char **argv, char **envp) olist = qemu_find_opts("machine"); qemu_opts_parse(olist, "accel=tcg", 0); break; - case QEMU_OPTION_no_kvm_pit: { + case QEMU_OPTION_no_kvm_pit: fprintf(stderr, "Warning: KVM PIT can no longer be disabled " "separately.\n"); break; - } case QEMU_OPTION_no_kvm_pit_reinjection: { static GlobalProperty kvm_pit_lost_tick_policy[] = { { @@ -3681,11 +3675,11 @@ int main(int argc, char **argv, char **envp) #ifdef CONFIG_VNC display_remote++; vnc_display = optarg; + break; #else fprintf(stderr, "VNC support is disabled\n"); exit(1); #endif - break; case QEMU_OPTION_no_acpi: acpi_enabled = 0; break; @@ -3811,7 +3805,6 @@ int main(int argc, char **argv, char **envp) xen_mode = XEN_ATTACH; break; case QEMU_OPTION_trace: - { opts = qemu_opts_parse(qemu_find_opts("trace"), optarg, 0); if (!opts) { exit(1); @@ -3819,7 +3812,6 @@ int main(int argc, char **argv, char **envp) trace_events = qemu_opt_get(opts, "events"); trace_file = qemu_opt_get(opts, "file"); break; - } case QEMU_OPTION_readconfig: { int ret = qemu_read_config_file(optarg); @@ -3876,12 +3868,12 @@ int main(int argc, char **argv, char **envp) if (!opts) { exit(1); } + break; #else error_report("File descriptor passing is disabled on this " "platform"); exit(1); #endif - break; case QEMU_OPTION_object: opts = qemu_opts_parse(qemu_find_opts("object"), optarg, 1); if (!opts) { @@ -4371,15 +4363,13 @@ 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.machine = machine; + current_machine->init_args.ram_size = ram_size; + current_machine->init_args.boot_order = boot_order; + current_machine->init_args.kernel_filename = kernel_filename; + current_machine->init_args.kernel_cmdline = kernel_cmdline; + current_machine->init_args.initrd_filename = initrd_filename; + current_machine->init_args.cpu_model = cpu_model; machine->init(¤t_machine->init_args); audio_init();