]> git.proxmox.com Git - mirror_qemu.git/commitdiff
pc: Abort if HotplugHandlerClass::plug() fails
authorBharata B Rao <bharata@linux.vnet.ibm.com>
Mon, 29 Jun 2015 08:20:24 +0000 (13:50 +0530)
committerEduardo Habkost <ehabkost@redhat.com>
Fri, 3 Jul 2015 20:47:58 +0000 (17:47 -0300)
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>
hw/i386/pc.c

index 8df1f3e03379fdccc65470baedc98583f623c853..a66416d18822af14b591b2857f2276d247de1a91 100644 (file)
@@ -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);
 }