From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeMMq-0002ud-8I for qemu-devel@nongnu.org; Wed, 15 Oct 2014 07:03:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XeMMh-00020g-7j for qemu-devel@nongnu.org; Wed, 15 Oct 2014 07:03:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50729) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeMMh-00020B-0w for qemu-devel@nongnu.org; Wed, 15 Oct 2014 07:03:35 -0400 From: Igor Mammedov Date: Wed, 15 Oct 2014 13:03:22 +0200 Message-Id: <1413371003-43597-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1413371003-43597-1-git-send-email-imammedo@redhat.com> References: <1413371003-43597-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] vl.c: use single local_err throughout main() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@amazon.com Signed-off-by: Igor Mammedov --- vl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 964d634..f563da1 100644 --- a/vl.c +++ b/vl.c @@ -2887,6 +2887,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; @@ -4188,7 +4189,6 @@ int main(int argc, char **argv, char **envp) configure_accelerator(current_machine); 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)); @@ -4432,7 +4432,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) { @@ -4487,7 +4486,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.9.3 (Apple Git-50)