From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wzm7w-0007hz-Jr for qemu-devel@nongnu.org; Wed, 25 Jun 2014 08:16:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wzm7o-0005m4-DJ for qemu-devel@nongnu.org; Wed, 25 Jun 2014 08:16:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37635) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wzm7o-0005lp-4Q for qemu-devel@nongnu.org; Wed, 25 Jun 2014 08:16:28 -0400 Date: Wed, 25 Jun 2014 14:16:20 +0200 From: Igor Mammedov Message-ID: <20140625141620.2832891e@nial.usersys.redhat.com> In-Reply-To: <20140625115152.GB13690@redhat.com> References: <1403696543-2458-1-git-send-email-imammedo@redhat.com> <1403696543-2458-3-git-send-email-imammedo@redhat.com> <20140625115152.GB13690@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/4] vl.c: use single local_err throughout main() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: stefano.stabellini@eu.citrix.com, marcel.a@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, pbonzini@redhat.com, afaerber@suse.de On Wed, 25 Jun 2014 14:51:52 +0300 "Michael S. Tsirkin" wrote: > On Wed, Jun 25, 2014 at 01:42:21PM +0200, Igor Mammedov wrote: > > Signed-off-by: Igor Mammedov > > Fixes any bugs? Nope, it's to reduce code duplication, which would be increased in following patch. > > > --- > > vl.c | 4 +--- > > 1 files changed, 1 insertions(+), 3 deletions(-) > > > > diff --git a/vl.c b/vl.c > > index 6b09220..0a39c93 100644 > > --- a/vl.c > > +++ b/vl.c > > @@ -2927,6 +2927,7 @@ int main(int argc, char **argv, char **envp) > > }; > > const char *trace_events = NULL; > > const char *trace_file = NULL; > > + Error *local_err = NULL; > > const ram_addr_t default_ram_size = (ram_addr_t)DEFAULT_RAM_SIZE * > > 1024 * 1024; > > ram_addr_t maxram_size = default_ram_size; > > @@ -4220,7 +4221,6 @@ int main(int argc, char **argv, char **envp) > > configure_accelerator(machine_class); > > > > if (qtest_chrdev) { > > - Error *local_err = NULL; > > qtest_init(qtest_chrdev, qtest_log, &local_err); > > if (local_err) { > > error_report("%s", error_get_pretty(local_err)); > > @@ -4448,7 +4448,6 @@ int main(int argc, char **argv, char **envp) > > #ifdef CONFIG_VNC > > /* init remote displays */ > > if (vnc_display) { > > - Error *local_err = NULL; > > vnc_display_init(ds); > > vnc_display_open(ds, vnc_display, &local_err); > > if (local_err != NULL) { > > @@ -4503,7 +4502,6 @@ int main(int argc, char **argv, char **envp) > > } > > > > if (incoming) { > > - Error *local_err = NULL; > > qemu_start_incoming_migration(incoming, &local_err); > > if (local_err) { > > error_report("-incoming %s: %s", incoming, > > -- > > 1.7.1 >