From 832a59e43b5d8b8a9c2b2565008ebea1059d539d Mon Sep 17 00:00:00 2001 From: Klaus Jensen Date: Thu, 11 Feb 2021 14:03:59 +0100 Subject: hw/block/nvme: fix error handling in nvme_ns_realize nvme_ns_realize passes errp to nvme_register_namespaces, but then try to prepend errp with local_err. Just remove the local_err and use errp directly. Fixes: 15d024d4aa9b ("hw/block/nvme: split setup and register for namespace") Cc: Minwoo Im Reviewed-by: Minwoo Im Signed-off-by: Klaus Jensen --- hw/block/nvme-ns.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'hw') diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c index dfed71a950..93ac6e107a 100644 --- a/hw/block/nvme-ns.c +++ b/hw/block/nvme-ns.c @@ -358,17 +358,12 @@ static void nvme_ns_realize(DeviceState *dev, Error **errp) NvmeNamespace *ns = NVME_NS(dev); BusState *s = qdev_get_parent_bus(dev); NvmeCtrl *n = NVME(s->parent); - Error *local_err = NULL; - if (nvme_ns_setup(ns, &local_err)) { - error_propagate_prepend(errp, local_err, - "could not setup namespace: "); + if (nvme_ns_setup(ns, errp)) { return; } if (nvme_register_namespace(n, ns, errp)) { - error_propagate_prepend(errp, local_err, - "could not register namespace: "); return; } -- cgit v1.2.3