From nobody Mon Feb 9 20:34:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579793409; cv=none; d=zohomail.com; s=zohoarc; b=hJx1O5oxLo8QaPY5KsHTjiSRucyvIk6uiBdwxb6AjZoMQlR8hAMx63JPmjMOzbhtQzCPAyyN3xfSgllIO+8bf1CibaBAtSs9XGtPIazcwudk9w4x4FFO9tRVG67cxrWDAh9IQcfO0IAnvwCQIaJHr0R/2gg14jsYYvLrLlmkJ94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579793409; h=Content-Type: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=wOZKXE7AorDry02zwCbHQd2VJJlOO0auii3FGQwWC48=; b=JVbLBaM/3mz5hKtOti2qVhyLSkJdhNuYwh5sYSefgvfJs0DxS0mo54Q8X8O9Q7eI3GDu6ni5OQivdVVHzyjtL5Z8fg6CLTJr9SSR76s1ZtTyGmNfqYVd798Cl25g9YCY4fDmVxXOjbtV9AEa/8ZW5XoxOeGAIngOvxK0a0ow4ig= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1579793409161278.2731251444545; Thu, 23 Jan 2020 07:30:09 -0800 (PST) Received: from localhost ([::1]:59336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iueQo-0006l0-73 for importer@patchew.org; Thu, 23 Jan 2020 10:30:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51639) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iucra-0005Hm-Sp for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:49:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iucrZ-0003xq-Ce for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:49:38 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:55789) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iucrZ-0003tm-55 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:49:37 -0500 Received: by mail-wm1-x335.google.com with SMTP id q9so2636076wmj.5 for ; Thu, 23 Jan 2020 05:49:37 -0800 (PST) Received: from 640k.localdomain.com ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s15sm3073171wrp.4.2020.01.23.05.49.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jan 2020 05:49:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wOZKXE7AorDry02zwCbHQd2VJJlOO0auii3FGQwWC48=; b=VjAs6WXMmqWPkBZfM9WJdJ39aEbu49bbcM0h9eMYw/J4uuzLZMsUAkq4MOVDHAZ4tD zH1VJIq6IezJmfkpSumT1rzpeYtBjftzreYHBCrVcI3d/qKmQPEDdQcGgKWpPW0mrNm8 FSpEDPftoXZfhWnEwL9GVClekbi78tSWDrIR2amWzYjWZVl8AIlCCdHpVp/HrdkGZIc2 Loq5wl55EG3nsf5BF9xfKIL6zKXoZLOwcv7oVElSf5pQF15vbpNzl4SGNEuWiFVqW4Fc tQI5hwUsstpzZXolhTFTAPuwATB+oymgOWiIng6iA5j7eZjB5LAXtn7ZRsZ7xdz0FkI4 0Hqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wOZKXE7AorDry02zwCbHQd2VJJlOO0auii3FGQwWC48=; b=L9ge6CIVLs6yyiBMJ0bg5vKGEKBrarPfrEmNZhdOlyCHz572OyrDyf0fdQebCHJMzO m46sTAFMvYz9HwfBwSzrMlrqvGv4kq45eWIcRBnLottY7NoDEpb96zrMQzRvp23IQdv2 oP4qb4qrnVEMGHcjRLDaMP/EsjDUr3DKaca7l8viv7t2nl0cvYyKuoKKYqQWblJ460pI ltSHy8X7MXIBwmeOCVgJDz2PCYBKyFLv1GyQnva1dDiVvRUHRbIrqmtCgWTCFye4pkW6 r1nyhxnTuBVVfy3DjGMt5C64nmdo3xJW3vmFeL9PDuBnWoCyVnN8mm0pkTShY8H/IPZo aPiQ== X-Gm-Message-State: APjAAAV9vjYT4rEhsq8egTdpfVg5mU6V3+decP2kPz4W/96+zA6h4UjO ncpQc5QjCYAz8SOgcn07Cz+OLqfJ X-Google-Smtp-Source: APXvYqx5BGq6bmGTmqnu+hlYgoACuIcZqwp4NMRg6le4qfa50fLZwbJuLCnrT5ojRRVk1OFzwq1nxg== X-Received: by 2002:a1c:5f41:: with SMTP id t62mr4429316wmb.42.1579787376018; Thu, 23 Jan 2020 05:49:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 33/59] qdev: remove extraneous error Date: Thu, 23 Jan 2020 14:48:36 +0100 Message-Id: <1579787342-27146-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1579787342-27146-1-git-send-email-pbonzini@redhat.com> References: <1579787342-27146-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau All callers use error_abort, and even the function itself calls with error_abort. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200110153039.1379601-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- hw/core/qdev.c | 15 ++++----------- include/hw/qdev-properties.h | 3 +-- target/arm/cpu.c | 36 ++++++++++++------------------------ 3 files changed, 17 insertions(+), 37 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index b47dc07..60aec8b 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -717,24 +717,17 @@ static void qdev_property_add_legacy(DeviceState *dev= , Property *prop, g_free(name); } =20 -void qdev_property_add_static(DeviceState *dev, Property *prop, - Error **errp) +void qdev_property_add_static(DeviceState *dev, Property *prop) { - Error *local_err =3D NULL; Object *obj =3D OBJECT(dev); =20 if (prop->info->create) { - prop->info->create(obj, prop, &local_err); + prop->info->create(obj, prop, &error_abort); } else { object_property_add(obj, prop->name, prop->info->name, prop->info->get, prop->info->set, prop->info->release, - prop, &local_err); - } - - if (local_err) { - error_propagate(errp, local_err); - return; + prop, &error_abort); } =20 object_property_set_description(obj, prop->name, @@ -989,7 +982,7 @@ static void device_initfn(Object *obj) do { for (prop =3D DEVICE_CLASS(class)->props; prop && prop->name; prop= ++) { qdev_property_add_legacy(dev, prop, &error_abort); - qdev_property_add_static(dev, prop, &error_abort); + qdev_property_add_static(dev, prop); } class =3D object_class_get_parent(class); } while (class !=3D object_class_by_name(TYPE_DEVICE)); diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index a90a9ce..906e697 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -253,13 +253,12 @@ void error_set_from_qdev_prop_error(Error **errp, int= ret, DeviceState *dev, * qdev_property_add_static: * @dev: Device to add the property to. * @prop: The qdev property definition. - * @errp: location to store error information. * * Add a static QOM property to @dev for qdev property @prop. * On error, store error in @errp. Static properties access data in a str= uct. * The type of the QOM property is derived from prop->info. */ -void qdev_property_add_static(DeviceState *dev, Property *prop, Error **er= rp); +void qdev_property_add_static(DeviceState *dev, Property *prop); =20 void qdev_alias_all_properties(DeviceState *target, Object *source); =20 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 411faaa..d161da8 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1104,26 +1104,22 @@ void arm_cpu_post_init(Object *obj) =20 if (arm_feature(&cpu->env, ARM_FEATURE_CBAR) || arm_feature(&cpu->env, ARM_FEATURE_CBAR_RO)) { - qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_cbar_property, - &error_abort); + qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_cbar_property= ); } =20 if (!arm_feature(&cpu->env, ARM_FEATURE_M)) { - qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_hivecs_proper= ty, - &error_abort); + qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_hivecs_proper= ty); } =20 if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { - qdev_property_add_static(DEVICE(obj), &arm_cpu_rvbar_property, - &error_abort); + qdev_property_add_static(DEVICE(obj), &arm_cpu_rvbar_property); } =20 if (arm_feature(&cpu->env, ARM_FEATURE_EL3)) { /* Add the has_el3 state CPU property only if EL3 is allowed. Thi= s will * prevent "has_el3" from existing on CPUs which cannot support EL= 3. */ - qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el3_property, - &error_abort); + qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el3_property); =20 #ifndef CONFIG_USER_ONLY object_property_add_link(obj, "secure-memory", @@ -1136,8 +1132,7 @@ void arm_cpu_post_init(Object *obj) } =20 if (arm_feature(&cpu->env, ARM_FEATURE_EL2)) { - qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el2_property, - &error_abort); + qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el2_property); } =20 if (arm_feature(&cpu->env, ARM_FEATURE_PMU)) { @@ -1154,32 +1149,27 @@ void arm_cpu_post_init(Object *obj) if (arm_feature(&cpu->env, ARM_FEATURE_VFP)) { cpu->has_vfp =3D true; if (!kvm_enabled()) { - qdev_property_add_static(DEVICE(obj), &arm_cpu_has_vfp_propert= y, - &error_abort); + qdev_property_add_static(DEVICE(obj), &arm_cpu_has_vfp_propert= y); } } =20 if (arm_feature(&cpu->env, ARM_FEATURE_NEON)) { cpu->has_neon =3D true; if (!kvm_enabled()) { - qdev_property_add_static(DEVICE(obj), &arm_cpu_has_neon_proper= ty, - &error_abort); + qdev_property_add_static(DEVICE(obj), &arm_cpu_has_neon_proper= ty); } } =20 if (arm_feature(&cpu->env, ARM_FEATURE_M) && arm_feature(&cpu->env, ARM_FEATURE_THUMB_DSP)) { - qdev_property_add_static(DEVICE(obj), &arm_cpu_has_dsp_property, - &error_abort); + qdev_property_add_static(DEVICE(obj), &arm_cpu_has_dsp_property); } =20 if (arm_feature(&cpu->env, ARM_FEATURE_PMSA)) { - qdev_property_add_static(DEVICE(obj), &arm_cpu_has_mpu_property, - &error_abort); + qdev_property_add_static(DEVICE(obj), &arm_cpu_has_mpu_property); if (arm_feature(&cpu->env, ARM_FEATURE_V7)) { qdev_property_add_static(DEVICE(obj), - &arm_cpu_pmsav7_dregion_property, - &error_abort); + &arm_cpu_pmsav7_dregion_property); } } =20 @@ -1198,12 +1188,10 @@ void arm_cpu_post_init(Object *obj) NULL, NULL, &error_abort); } =20 - qdev_property_add_static(DEVICE(obj), &arm_cpu_cfgend_property, - &error_abort); + qdev_property_add_static(DEVICE(obj), &arm_cpu_cfgend_property); =20 if (arm_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER)) { - qdev_property_add_static(DEVICE(cpu), &arm_cpu_gt_cntfrq_property, - &error_abort); + qdev_property_add_static(DEVICE(cpu), &arm_cpu_gt_cntfrq_property); } } =20 --=20 1.8.3.1