From patchwork Fri Sep 11 05:33:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 516571 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 78401140271 for ; Fri, 11 Sep 2015 15:47:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=yzmg7GcL; dkim-atps=neutral Received: from localhost ([::1]:54048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaHBX-0004Bo-9I for incoming@patchwork.ozlabs.org; Fri, 11 Sep 2015 01:47:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaGyi-0005gN-AN for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaGyd-0001x7-Ch for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:28 -0400 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]:33098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaGyd-0001x2-3x for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:23 -0400 Received: by pacex6 with SMTP id ex6so64836575pac.0 for ; Thu, 10 Sep 2015 22:34:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A3u0T3MlJjztUexuJVlwv7jXzsUNF9g7S56wxSHaqXk=; b=yzmg7GcLioyrPfmhv06BRMMtNgKWso6m9xEavsZ841FtYJT3qGTzioyy0ssjbQeSkn 4AzXKQ0/UXQUAMwnhsju6jdQrK0wpTuy9oWuBQL7db3qvMWdjFdNBGA6zzucwHbf9ZPL Y2PJvB8JEaN8nQthiqp8hQ9THY7PbVxK6XTSyytpHifboUmpUgIWVP+REG2aJ0XQ3O/7 hyR6hQnVulzNXp+dT59Kzequ2fpYdP78oeo43FGkNr9viPL39LXhKlP+J0jqsKDYwTS/ hNQKiGvl16gsLBIKJh8g+WkIX3hc6XUy0S+9Zj+DL/7Rj+oaFMwHtSkuYjqIyDLe9ovL gJsg== X-Received: by 10.66.141.199 with SMTP id rq7mr83202873pab.140.1441949662464; Thu, 10 Sep 2015 22:34:22 -0700 (PDT) Received: from localhost.localdomain (mobile-166-171-248-052.mycingular.net. [166.171.248.52]) by smtp.gmail.com with ESMTPSA id si1sm15282624pbc.72.2015.09.10.22.34.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Sep 2015 22:34:21 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2015 22:33:26 -0700 Message-Id: <2d677ee56098222da6a90871efd14aa70e7bf63b.1441667360.git.crosthwaite.peter@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::231 Cc: peter.maydell@linaro.org, armbru@redhat.com Subject: [Qemu-devel] [RFC PATCH v1 16/25] ppc: Update error API usages 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 Use error_prefix() and error_report_err() as appropriate. Cc: Alexander Graf Cc: qemu-ppc@nongnu.org Signed-off-by: Peter Crosthwaite --- hw/ppc/e500.c | 4 ++-- hw/ppc/spapr.c | 4 ++-- hw/ppc/spapr_drc.c | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index d300846..798e03d 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -751,8 +751,8 @@ static qemu_irq *ppce500_init_mpic(MachineState *machine, PPCE500Params *params, dev = ppce500_init_mpic_kvm(params, irqs, &err); } if (machine_kernel_irqchip_required(machine) && !dev) { - error_report("kernel_irqchip requested but unavailable: %s", - error_get_pretty(err)); + error_prefix(err, "kernel_irqchip requested but unavailable: "); + error_report_err(err); exit(1); } } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index bf0c64f..0cbca9f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -121,8 +121,8 @@ static XICSState *xics_system_init(MachineState *machine, icp = try_create_xics(TYPE_KVM_XICS, nr_servers, nr_irqs, &err); } if (machine_kernel_irqchip_required(machine) && !icp) { - error_report("kernel_irqchip requested but unavailable: %s", - error_get_pretty(err)); + error_prefix(err, "kernel_irqchip requested but unavailable: "); + error_report_err(err); } } diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index ee87432..9837ef2 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -418,8 +418,7 @@ static void realize(DeviceState *d, Error **errp) object_property_add_alias(root_container, link_name, drc->owner, child_name, &err); if (err) { - error_report("%s", error_get_pretty(err)); - error_free(err); + error_report_err(err); object_unref(OBJECT(drc)); } g_free(child_name); @@ -439,8 +438,7 @@ static void unrealize(DeviceState *d, Error **errp) snprintf(name, sizeof(name), "%x", drck->get_index(drc)); object_property_del(root_container, name, &err); if (err) { - error_report("%s", error_get_pretty(err)); - error_free(err); + error_report_err(err); object_unref(OBJECT(drc)); } }