From patchwork Mon Jan 28 14:14:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fei X-Patchwork-Id: 1031949 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="Jj7EP8dv"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43pBcc6198z9s3l for ; Tue, 29 Jan 2019 01:20:48 +1100 (AEDT) Received: from localhost ([127.0.0.1]:60960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go7mI-0002XL-Hs for incoming@patchwork.ozlabs.org; Mon, 28 Jan 2019 09:20:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go7hb-0007SF-Oz for qemu-devel@nongnu.org; Mon, 28 Jan 2019 09:16:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1go7hY-0007F9-NJ for qemu-devel@nongnu.org; Mon, 28 Jan 2019 09:15:55 -0500 Received: from m15-113.126.com ([220.181.15.113]:49506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go7hT-00075J-6E for qemu-devel@nongnu.org; Mon, 28 Jan 2019 09:15:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Qq9OlGYFtaNkk5toGu sdABdKSrt4/TkTMQP7sPy6J7k=; b=Jj7EP8dvClCb+keBy74CPC/V5LwAEWcUVY NqftL96BRsCB3mD8qrYqs0WELB4lvLumke7HbKrLOHJqDE8WQKcdx0oMvAeQNH+i IAYzPOVelqkS/3HFDCfsnR5/3k9GYWFBg/hyl43b3ZYEOyPd1bQCFP1QIxwyZ8tH UnFGk/Nyc= Received: from localhost.bytedance.net (unknown [220.243.134.156]) by smtp3 (Coremail) with SMTP id DcmowAC3b2NsDk9cbAzfBQ--.20895S7; Mon, 28 Jan 2019 22:15:11 +0800 (CST) From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Mon, 28 Jan 2019 22:14:48 +0800 Message-Id: <20190128141506.12731-6-lifei1214@126.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20190128141506.12731-1-lifei1214@126.com> References: <20190128141506.12731-1-lifei1214@126.com> X-CM-TRANSID: DcmowAC3b2NsDk9cbAzfBQ--.20895S7 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF4fuw4DAw4UCF43ZFWkZwb_yoW8Wr1xpr Wakr98tr4xG3Zay39Iya1kZ3W5XrnIgay3ArZ3Zw1fGw43Gwsxury5JF909ryrCF1fXw43 ZrZY9F1UCanxtFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6hFcUUUUU= X-Originating-IP: [220.243.134.156] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbiEw9KIVpD4ir9IQAAs6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.15.113 Subject: [Qemu-devel] [PATCH for-4.0 05/11] qemu_thread: supplement error handling for h_resize_hpt_prepare X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Peter Xu , "Dr . David Alan Gilbert" , Fei Li , Gerd Hoffmann , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fei Li Add a local_err to hold the error, and return the corresponding error code to replace the temporary &error_abort. Cc: Markus Armbruster Cc: David Gibson Signed-off-by: Fei Li Acked-by: David Gibson --- hw/ppc/spapr_hcall.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index bee2895b94..5ef73bef0e 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -478,6 +478,7 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, sPAPRPendingHPT *pending = spapr->pending_hpt; uint64_t current_ram_size; int rc; + Error *local_err = NULL; if (spapr->resize_hpt == SPAPR_RESIZE_HPT_DISABLED) { return H_AUTHORITY; @@ -538,10 +539,13 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, pending->shift = shift; pending->ret = H_HARDWARE; - /* TODO: let the further caller handle the error instead of abort() here */ - qemu_thread_create(&pending->thread, "sPAPR HPT prepare", - hpt_prepare_thread, pending, - QEMU_THREAD_DETACHED, &error_abort); + if (qemu_thread_create(&pending->thread, "sPAPR HPT prepare", + hpt_prepare_thread, pending, + QEMU_THREAD_DETACHED, &local_err) < 0) { + error_reportf_err(local_err, "failed to create hpt_prepare_thread: "); + g_free(pending); + return H_HARDWARE; + } spapr->pending_hpt = pending;