From patchwork Tue Apr 15 23:57:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 339402 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E1149140093 for ; Wed, 16 Apr 2014 09:58:23 +1000 (EST) Received: from localhost ([::1]:52142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WaDF8-0005H5-21 for incoming@patchwork.ozlabs.org; Tue, 15 Apr 2014 19:58:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WaDEk-0004z8-K0 for qemu-devel@nongnu.org; Tue, 15 Apr 2014 19:58:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WaDEb-0006Zi-JY for qemu-devel@nongnu.org; Tue, 15 Apr 2014 19:57:58 -0400 Received: from mail-pd0-x231.google.com ([2607:f8b0:400e:c02::231]:33628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WaDEb-0006Za-CW; Tue, 15 Apr 2014 19:57:49 -0400 Received: by mail-pd0-f177.google.com with SMTP id y10so9905642pdj.8 for ; Tue, 15 Apr 2014 16:57:48 -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:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=aIxD6mj3wbf4Pui+gxN/RXKa0fj0BTZ6IMCwydA2Rp4=; b=OryDR1exT5bx8CXtKiiMMG0sUj6Mmi+p9youcyQONn3+x69eLkcDDC5F5Q6Gcmamf4 d7orfKJ9nDOz0bxwa+5wAPrdoe1INkNDYFQUmQgIYdD5N0vNpM12OBf/vdUXxuK6YtJI 4djXyWnO/ptrgFe3Ne4+Ae4zg5zz8vdm9l9qZU7dn9hGwwJBdcdl+9NjKKTPChSx+ctX F8zEKvmRgA3gkq0+9A+iUghkCY1YRJEg82RS6m+fwPZLVew1ngFr8rdu6fk+cOOlooYF QH18xSH0f+Rk9WvyNOgpauuHJ9i6mf9q8p8xYX2oxAb7F2qY6/5EkcN2F5M4fiJdNYj+ c78g== X-Received: by 10.68.136.226 with SMTP id qd2mr5123060pbb.72.1397606268209; Tue, 15 Apr 2014 16:57:48 -0700 (PDT) Received: from [192.168.1.104] ([124.126.238.172]) by mx.google.com with ESMTPSA id gj9sm42903454pbc.7.2014.04.15.16.57.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Apr 2014 16:57:47 -0700 (PDT) Message-ID: <534DC775.9000006@gmail.com> Date: Wed, 16 Apr 2014 07:57:41 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Markus Armbruster , Peter Maydell , Michael Tokarev , Anthony Liguori References: <534DC6EA.6050203@gmail.com> In-Reply-To: <534DC6EA.6050203@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::231 Cc: QEMU Trivial , QEMU Developers Subject: [Qemu-devel] [PATCH trivial v2 2/2] vl: Eliminate a superfluous local variable 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 CODING_STYLE frowns upon mixing declarations and statements. main() has such a declaration. Clean up by eliminating the variable. Signed-off-by: Chen Gang --- 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(¤t_machine->init_args); audio_init();