diff options
| author | Greg Kurz | 2020-10-19 10:48:04 +0200 |
|---|---|---|
| committer | David Gibson | 2020-10-27 15:08:53 +0100 |
| commit | 84fd54961933a324e99bb52d0cc1de0ac9b7780e (patch) | |
| tree | ab251111d0c036daff797cc94df0abf7527b160e /hw/i386 | |
| parent | spapr: Simplify spapr_cpu_core_realize() and spapr_cpu_core_unrealize() (diff) | |
| download | qemu-84fd54961933a324e99bb52d0cc1de0ac9b7780e.tar.gz qemu-84fd54961933a324e99bb52d0cc1de0ac9b7780e.tar.xz qemu-84fd54961933a324e99bb52d0cc1de0ac9b7780e.zip | |
pc-dimm: Drop @errp argument of pc_dimm_plug()
pc_dimm_plug() doesn't use it. It only aborts on error.
Drop @errp and adapt the callers accordingly.
[dwg: Removed unused label to fix compile]
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <160309728447.2739814.12831204841251148202.stgit@bahia.lan>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4e323755d0..0d9bd7d635 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1265,24 +1265,18 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, static void pc_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - Error *local_err = NULL; PCMachineState *pcms = PC_MACHINE(hotplug_dev); X86MachineState *x86ms = X86_MACHINE(hotplug_dev); MachineState *ms = MACHINE(hotplug_dev); bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); - pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err); - if (local_err) { - goto out; - } + pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms)); if (is_nvdimm) { nvdimm_plug(ms->nvdimms_state); } hotplug_handler_plug(x86ms->acpi_dev, dev, &error_abort); -out: - error_propagate(errp, local_err); } static void pc_memory_unplug_request(HotplugHandler *hotplug_dev, |