From patchwork Fri Jul 3 20:50:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 491144 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id ACFCA140775 for ; Sat, 4 Jul 2015 06:51:20 +1000 (AEST) Received: from localhost ([::1]:42530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB7va-0002sR-Uj for incoming@patchwork.ozlabs.org; Fri, 03 Jul 2015 16:51:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB7v1-00022Z-GW for qemu-devel@nongnu.org; Fri, 03 Jul 2015 16:50:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZB7v0-0005pw-2K for qemu-devel@nongnu.org; Fri, 03 Jul 2015 16:50:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60674) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB7uz-0005pm-Sy for qemu-devel@nongnu.org; Fri, 03 Jul 2015 16:50:41 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 7939E2C7710; Fri, 3 Jul 2015 20:50:41 +0000 (UTC) Received: from localhost ([10.3.113.8]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t63KoeCM005279; Fri, 3 Jul 2015 16:50:41 -0400 From: Eduardo Habkost To: Peter Maydell Date: Fri, 3 Jul 2015 17:50:21 -0300 Message-Id: <1435956624-21609-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1435956624-21609-1-git-send-email-ehabkost@redhat.com> References: <1435956624-21609-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Bharata B Rao , qemu-devel@nongnu.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [PULL 3/6] pc: Abort if HotplugHandlerClass::plug() fails 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 From: Bharata B Rao HotplugHandlerClass::plug() shouldn't fail and hence use error_abort to abort if it fails. Signed-off-by: Bharata B Rao Reviewed-by: David Gibson Reviewed-by: Igor Mammedov Tested-by: Igor Mammedov Signed-off-by: Eduardo Habkost --- hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8df1f3e..a66416d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1577,7 +1577,7 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, } hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); - hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err); + hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &error_abort); out: error_propagate(errp, local_err); }