From nobody Sun Feb 8 21:47:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1570814257; cv=none; d=zoho.com; s=zohoarc; b=luH8zdxZWx2CdPEOLRdoP/4z6pHrgTuO7AQweWp2Clipw0GUYpRKqbGMfVxbFxyQ3GS5w4lf7Y+sBgFlOkAn5s3Dhu8Uaa++Tp+WcgnRPIjcmOyPdEBvDfEYzg/1mzjS9hw1ggfeHh5QRPymKJ21XQyXqzmqdlhkhg8MoMHzUJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570814257; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fRxO9Xw1uJHY+PmO1c1962WRfs76Zh3M8+S9xEdTfig=; b=TWerazwlj/NyeC9aWctY1i1D1EFwWaCCJgMjIXVt8u4PtSZJxnSoD1viCDQgWs+K3cIp6VUxQJ0NbMmxYCSjZFObnbq0g5ING4cklTNl2qceExya62i2htc2d3XnJV0V+ioQTxfKcethvCmHXwTKqVY/+BRCmKUPffI5uMWG7yE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570814257943236.5892568462466; Fri, 11 Oct 2019 10:17:37 -0700 (PDT) Received: from localhost ([::1]:54512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyXo-0008U3-8L for importer@patchew.org; Fri, 11 Oct 2019 13:17:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36284) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxQt-0006Ao-DX for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxQr-0004NW-9M for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:23 -0400 Received: from relay.sw.ru ([185.231.240.75]:47972) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxQq-0004Av-Tg for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:21 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iIxQf-0003XG-Gj; Fri, 11 Oct 2019 19:06:09 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 038/126] X86 Machines: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:24 +0300 Message-Id: <20191011160552.22907-39-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191011160552.22907-1-vsementsov@virtuozzo.com> References: <20191011160552.22907-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , vsementsov@virtuozzo.com, Eduardo Habkost , "Michael S. Tsirkin" , armbru@redhat.com, Greg Kurz , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If we want to add some info to errp (by error_prepend() or error_append_hint()), we must use the ERRP_AUTO_PROPAGATE macro. Otherwise, this info will not be added when errp =3D=3D &fatal_err (the program will exit prior to the error_append_hint() or error_prepend() call). Fix such cases. If we want to check error after errp-function call, we need to introduce local_err and than propagate it to errp. Instead, use ERRP_AUTO_PROPAGATE macro, benefits are: 1. No need of explicit error_propagate call 2. No need of explicit local_err variable: use errp directly 3. ERRP_AUTO_PROPAGATE leaves errp as is if it's not NULL or &error_fatel, this means that we don't break error_abort (we'll abort on error_set, not on error_propagate) This commit (together with its neighbors) was generated by for f in $(git grep -l errp \*.[ch]); do \ spatch --sp-file scripts/coccinelle/auto-propagated-errp.cocci \ --macro-file scripts/cocci-macro-file.h --in-place --no-show-diff $f; \ done; then fix a bit of compilation problems: coccinelle for some reason leaves several f() { ... goto out; ... out: } patterns, with "out:" at function end. then ./python/commit-per-subsystem.py MAINTAINERS "$(< auto-msg)" (auto-msg was a file with this commit message) Still, for backporting it may be more comfortable to use only the first command and then do one huge commit. Reported-by: Kevin Wolf Reported-by: Greg Kurz Signed-off-by: Vladimir Sementsov-Ogievskiy --- hw/acpi/ich9.c | 30 +++++++++------------- hw/char/debugcon.c | 7 +++--- hw/char/serial-pci-multi.c | 7 +++--- hw/char/serial-pci.c | 7 +++--- hw/core/machine.c | 21 +++++++--------- hw/core/numa.c | 51 +++++++++++++++++--------------------- hw/intc/apic_common.c | 7 +++--- hw/pci-host/piix.c | 7 +++--- 8 files changed, 59 insertions(+), 78 deletions(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 2034dd749e..686b7cdf3a 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -369,17 +369,15 @@ static void ich9_pm_get_disable_s3(Object *obj, Visit= or *v, const char *name, static void ich9_pm_set_disable_s3(Object *obj, Visitor *v, const char *na= me, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); ICH9LPCPMRegs *pm =3D opaque; - Error *local_err =3D NULL; uint8_t value; =20 - visit_type_uint8(v, name, &value, &local_err); - if (local_err) { - goto out; + visit_type_uint8(v, name, &value, errp); + if (*errp) { + return; } pm->disable_s3 =3D value; -out: - error_propagate(errp, local_err); } =20 static void ich9_pm_get_disable_s4(Object *obj, Visitor *v, const char *na= me, @@ -394,17 +392,15 @@ static void ich9_pm_get_disable_s4(Object *obj, Visit= or *v, const char *name, static void ich9_pm_set_disable_s4(Object *obj, Visitor *v, const char *na= me, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); ICH9LPCPMRegs *pm =3D opaque; - Error *local_err =3D NULL; uint8_t value; =20 - visit_type_uint8(v, name, &value, &local_err); - if (local_err) { - goto out; + visit_type_uint8(v, name, &value, errp); + if (*errp) { + return; } pm->disable_s4 =3D value; -out: - error_propagate(errp, local_err); } =20 static void ich9_pm_get_s4_val(Object *obj, Visitor *v, const char *name, @@ -419,17 +415,15 @@ static void ich9_pm_get_s4_val(Object *obj, Visitor *= v, const char *name, static void ich9_pm_set_s4_val(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); ICH9LPCPMRegs *pm =3D opaque; - Error *local_err =3D NULL; uint8_t value; =20 - visit_type_uint8(v, name, &value, &local_err); - if (local_err) { - goto out; + visit_type_uint8(v, name, &value, errp); + if (*errp) { + return; } pm->s4_val =3D value; -out: - error_propagate(errp, local_err); } =20 static bool ich9_pm_get_enable_tco(Object *obj, Error **errp) diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c index 5c592e091b..0a6d0870bb 100644 --- a/hw/char/debugcon.c +++ b/hw/char/debugcon.c @@ -97,14 +97,13 @@ static void debugcon_realize_core(DebugconState *s, Err= or **errp) =20 static void debugcon_isa_realizefn(DeviceState *dev, Error **errp) { + ERRP_AUTO_PROPAGATE(); ISADevice *d =3D ISA_DEVICE(dev); ISADebugconState *isa =3D ISA_DEBUGCON_DEVICE(dev); DebugconState *s =3D &isa->state; - Error *err =3D NULL; =20 - debugcon_realize_core(s, &err); - if (err !=3D NULL) { - error_propagate(errp, err); + debugcon_realize_core(s, errp); + if (*errp) { return; } memory_region_init_io(&s->io, OBJECT(dev), &debugcon_ops, s, diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index 5f13b5663b..fa7e348870 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -79,10 +79,10 @@ static void multi_serial_irq_mux(void *opaque, int n, i= nt level) =20 static void multi_serial_pci_realize(PCIDevice *dev, Error **errp) { + ERRP_AUTO_PROPAGATE(); PCIDeviceClass *pc =3D PCI_DEVICE_GET_CLASS(dev); PCIMultiSerialState *pci =3D DO_UPCAST(PCIMultiSerialState, dev, dev); SerialState *s; - Error *err =3D NULL; int i, nr_ports =3D 0; =20 switch (pc->device_id) { @@ -106,9 +106,8 @@ static void multi_serial_pci_realize(PCIDevice *dev, Er= ror **errp) for (i =3D 0; i < nr_ports; i++) { s =3D pci->state + i; s->baudbase =3D 115200; - serial_realize_core(s, &err); - if (err !=3D NULL) { - error_propagate(errp, err); + serial_realize_core(s, errp); + if (*errp) { multi_serial_pci_exit(dev); return; } diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index cb9b76e22b..7d31f7066c 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -43,14 +43,13 @@ typedef struct PCISerialState { =20 static void serial_pci_realize(PCIDevice *dev, Error **errp) { + ERRP_AUTO_PROPAGATE(); PCISerialState *pci =3D DO_UPCAST(PCISerialState, dev, dev); SerialState *s =3D &pci->state; - Error *err =3D NULL; =20 s->baudbase =3D 115200; - serial_realize_core(s, &err); - if (err !=3D NULL) { - error_propagate(errp, err); + serial_realize_core(s, errp); + if (*errp) { return; } =20 diff --git a/hw/core/machine.c b/hw/core/machine.c index 1689ad3bf8..89ba1845dc 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -192,13 +192,12 @@ static void machine_set_kernel_irqchip(Object *obj, V= isitor *v, const char *name, void *opaque, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); MachineState *ms =3D MACHINE(obj); OnOffSplit mode; =20 - visit_type_OnOffSplit(v, name, &mode, &err); - if (err) { - error_propagate(errp, err); + visit_type_OnOffSplit(v, name, &mode, errp); + if (*errp) { return; } else { switch (mode) { @@ -240,13 +239,12 @@ static void machine_set_kvm_shadow_mem(Object *obj, V= isitor *v, const char *name, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); MachineState *ms =3D MACHINE(obj); - Error *error =3D NULL; int64_t value; =20 - visit_type_int(v, name, &value, &error); - if (error) { - error_propagate(errp, error); + visit_type_int(v, name, &value, errp); + if (*errp) { return; } =20 @@ -342,13 +340,12 @@ static void machine_set_phandle_start(Object *obj, Vi= sitor *v, const char *name, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); MachineState *ms =3D MACHINE(obj); - Error *error =3D NULL; int64_t value; =20 - visit_type_int(v, name, &value, &error); - if (error) { - error_propagate(errp, error); + visit_type_int(v, name, &value, errp); + if (*errp) { return; } =20 diff --git a/hw/core/numa.c b/hw/core/numa.c index 4dfec5c95b..fa3b392e5c 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -59,7 +59,7 @@ static int max_numa_nodeid; /* Highest specified NUMA nod= e ID, plus one. static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); uint16_t nodenr; uint16List *cpus =3D NULL; MachineClass *mc =3D MACHINE_GET_CLASS(ms); @@ -99,9 +99,8 @@ static void parse_numa_node(MachineState *ms, NumaNodeOpt= ions *node, props =3D mc->cpu_index_to_instance_props(ms, cpus->value); props.node_id =3D nodenr; props.has_node_id =3D true; - machine_set_cpu_numa_node(ms, &props, &err); - if (err) { - error_propagate(errp, err); + machine_set_cpu_numa_node(ms, &props, errp); + if (*errp) { return; } } @@ -177,60 +176,57 @@ void parse_numa_distance(MachineState *ms, NumaDistOp= tions *dist, Error **errp) =20 void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); MachineClass *mc =3D MACHINE_GET_CLASS(ms); =20 if (!mc->numa_mem_supported) { error_setg(errp, "NUMA is not supported by this machine-type"); - goto end; + return; } =20 switch (object->type) { case NUMA_OPTIONS_TYPE_NODE: - parse_numa_node(ms, &object->u.node, &err); - if (err) { - goto end; + parse_numa_node(ms, &object->u.node, errp); + if (*errp) { + return; } break; case NUMA_OPTIONS_TYPE_DIST: - parse_numa_distance(ms, &object->u.dist, &err); - if (err) { - goto end; + parse_numa_distance(ms, &object->u.dist, errp); + if (*errp) { + return; } break; case NUMA_OPTIONS_TYPE_CPU: if (!object->u.cpu.has_node_id) { - error_setg(&err, "Missing mandatory node-id property"); - goto end; + error_setg(errp, "Missing mandatory node-id property"); + return; } if (!ms->numa_state->nodes[object->u.cpu.node_id].present) { - error_setg(&err, "Invalid node-id=3D%" PRId64 ", NUMA node mus= t be " - "defined with -numa node,nodeid=3DID before it's used with= " - "-numa cpu,node-id=3DID", object->u.cpu.node_id); - goto end; + error_setg(errp, "Invalid node-id=3D%" PRId64 ", NUMA node mus= t be " + "defined with -numa node,nodeid=3DID before it's us= ed with " + "-numa cpu,node-id=3DID", object->u.cpu.node_id); + return; } =20 machine_set_cpu_numa_node(ms, qapi_NumaCpuOptions_base(&object->u.= cpu), - &err); + errp); break; default: abort(); } - -end: - error_propagate(errp, err); } =20 static int parse_numa(void *opaque, QemuOpts *opts, Error **errp) { + ERRP_AUTO_PROPAGATE(); NumaOptions *object =3D NULL; MachineState *ms =3D MACHINE(opaque); - Error *err =3D NULL; Visitor *v =3D opts_visitor_new(opts); =20 - visit_type_NumaOptions(v, NULL, &object, &err); + visit_type_NumaOptions(v, NULL, &object, errp); visit_free(v); - if (err) { + if (*errp) { goto end; } =20 @@ -240,12 +236,11 @@ static int parse_numa(void *opaque, QemuOpts *opts, E= rror **errp) qemu_strtosz_MiB(mem_str, NULL, &object->u.node.mem); } =20 - set_numa_options(ms, object, &err); + set_numa_options(ms, object, errp); =20 end: qapi_free_NumaOptions(object); - if (err) { - error_propagate(errp, err); + if (*errp) { return -1; } =20 diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index aafd8e0e33..81ed4b4ea8 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -464,9 +464,9 @@ static void apic_common_get_id(Object *obj, Visitor *v,= const char *name, static void apic_common_set_id(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); APICCommonState *s =3D APIC_COMMON(obj); DeviceState *dev =3D DEVICE(obj); - Error *local_err =3D NULL; uint32_t value; =20 if (dev->realized) { @@ -474,9 +474,8 @@ static void apic_common_set_id(Object *obj, Visitor *v,= const char *name, return; } =20 - visit_type_uint32(v, name, &value, &local_err); - if (local_err) { - error_propagate(errp, local_err); + visit_type_uint32(v, name, &value, errp); + if (*errp) { return; } =20 diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 135c645535..24b32aa33b 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -855,18 +855,17 @@ out: =20 static void igd_pt_i440fx_realize(PCIDevice *pci_dev, Error **errp) { + ERRP_AUTO_PROPAGATE(); uint32_t val =3D 0; int i, num; int pos, len; - Error *local_err =3D NULL; =20 num =3D ARRAY_SIZE(igd_host_bridge_infos); for (i =3D 0; i < num; i++) { pos =3D igd_host_bridge_infos[i].offset; len =3D igd_host_bridge_infos[i].len; - host_pci_config_read(pos, len, &val, &local_err); - if (local_err) { - error_propagate(errp, local_err); + host_pci_config_read(pos, len, &val, errp); + if (*errp) { return; } pci_default_write_config(pci_dev, pos, val, len); --=20 2.21.0