From: Bharata B Rao <bharata@linux.vnet.ibm.com>
Date: Mon, 29 Jun 2015 08:20:24 +0000 (+0530)
Subject: pc: Abort if HotplugHandlerClass::plug() fails
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8e23184b6b2f8426041854b18fb56a3ff197d5a0;p=qemu.git

pc: Abort if HotplugHandlerClass::plug() fails

HotplugHandlerClass::plug() shouldn't fail and hence use error_abort
to abort if it fails.

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 8df1f3e033..a66416d188 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);
 }