From patchwork Fri Apr 18 13:41:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Batuzov X-Patchwork-Id: 340309 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 4C3BE1400F7 for ; Fri, 18 Apr 2014 23:42:30 +1000 (EST) Received: from localhost ([::1]:37988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wb93k-0002S2-0p for incoming@patchwork.ozlabs.org; Fri, 18 Apr 2014 09:42:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wb93E-0001ka-Eh for qemu-devel@nongnu.org; Fri, 18 Apr 2014 09:42:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wb938-0003UZ-AQ for qemu-devel@nongnu.org; Fri, 18 Apr 2014 09:41:56 -0400 Received: from smtp.ispras.ru ([83.149.199.79]:44890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wb938-0003QF-2W for qemu-devel@nongnu.org; Fri, 18 Apr 2014 09:41:50 -0400 Received: from bulbul.intra.ispras.ru (unknown [83.149.199.91]) by smtp.ispras.ru (Postfix) with ESMTP id 75EFB224C3; Thu, 17 Apr 2014 09:21:33 +0400 (MSK) From: Kirill Batuzov To: qemu-devel@nongnu.org Date: Fri, 18 Apr 2014 17:41:23 +0400 Message-Id: <1397828484-21771-4-git-send-email-batuzovk@ispras.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1397828484-21771-1-git-send-email-batuzovk@ispras.ru> References: <1397828484-21771-1-git-send-email-batuzovk@ispras.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.79 Cc: Kirill Batuzov Subject: [Qemu-devel] [PATCH 3/4] graphic_console_init: do not receive unneeded error descriptions 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 Error set by error_set is dynamically allocated and needs to be cleared properly later. graphic_console_init neither needs error descriptions nor frees them. Pass NULL instead of actual pointers to avoid unnecessary memory allocations. Signed-off-by: Kirill Batuzov --- ui/console.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ui/console.c b/ui/console.c index e057755..438b6bd 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1590,7 +1590,6 @@ QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head, const GraphicHwOps *hw_ops, void *opaque) { - Error *local_err = NULL; int width = 640; int height = 480; QemuConsole *s; @@ -1602,10 +1601,8 @@ QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head, s->hw_ops = hw_ops; s->hw = opaque; if (dev) { - object_property_set_link(OBJECT(s), OBJECT(dev), - "device", &local_err); - object_property_set_int(OBJECT(s), head, - "head", &local_err); + object_property_set_link(OBJECT(s), OBJECT(dev), "device", NULL); + object_property_set_int(OBJECT(s), head, "head", NULL); } s->surface = qemu_create_displaysurface(width, height);