From nobody Sat May 4 11:59:20 2024 Delivered-To: importer@patchew.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=1600091843; cv=none; d=zohomail.com; s=zohoarc; b=R/zHUsHFnIvf9Ivq0mmaV55nbc2eIxGR4VxDFnjtPkVIOjgeSZkV3ykA4NZGPpWMxyjyUkT0OQsjski5N5eHGpX7fj+pNUGh8J3dozX9DZ2ZfKp+yryI4gfMyv10/YogQIshtR+zL5hMDGNtr03028CHXaJ8oyv5djECO55bIzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600091843; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=wOYjBh6hz+dfMD4p1j3ltf1jnxOSiFlciXJxXD4Qeyk=; b=Qfpy6yypfXwrpLOyNgCJBCI16vMjlvAnkZ8HBSOl9Owbg2Y2DFTBQokU5gSjQfk20QUcJmJ6I655eiXKVMhd95cp9NEzmYH8SBe1QTuGmSidSf75fGEu17eA03OSy5CyOrRJjCfgN3tR5DAHcwNfGvUcXx/G3G0JZaZFjPSWe14= 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 1600091843618117.50417487808386; Mon, 14 Sep 2020 06:57:23 -0700 (PDT) Received: from localhost ([::1]:41490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHoyv-00060n-Tk for importer@patchew.org; Mon, 14 Sep 2020 09:57:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHoyA-0005Y7-Ht for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:56:34 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23947 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kHoy6-0005aK-Ub for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:56:34 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-452-ZoVWxt8APVGMtrFgOgravw-1; Mon, 14 Sep 2020 09:56:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 631E1100559C for ; Mon, 14 Sep 2020 13:56:23 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-99.ams2.redhat.com [10.36.114.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id F289E6EE48; Mon, 14 Sep 2020 13:56:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600091789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wOYjBh6hz+dfMD4p1j3ltf1jnxOSiFlciXJxXD4Qeyk=; b=M//S3A+rtKgVuNKoXyWx9dFGbULoRFA1fi4KfDtyUhsQw9TpTtNF5pc8Tfrld6y3bc6n8r H1PIT8vDug82s2hIRyh654mXPij744E1E04Sr7ogMuwfYnOzUahSUKJjItrkpK7TDcAhYx VMZpnMfG6ujrEiNoi0PAMh8W5MPSAJ0= X-MC-Unique: ZoVWxt8APVGMtrFgOgravw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2] qom: simplify object_find_property / object_class_find_property Date: Mon, 14 Sep 2020 14:56:17 +0100 Message-Id: <20200914135617.1493072-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=berrange@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/14 01:39:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.792, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When debugging QEMU it is often useful to put a breakpoint on the error_setg_internal method impl. Unfortunately the object_property_add / object_class_property_add methods call object_property_find / object_class_property_find methods to check if a property exists already before adding the new property. As a result there are a huge number of calls to error_setg_internal on startup of most QEMU commands, making it very painful to set a breakpoint on this method. Most callers of object_find_property and object_class_find_property, however, pass in a NULL for the Error parameter. This simplifies the methods to remove the Error parameter entirely, and then adds some new wrapper methods that are able to raise an Error when needed. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v1: https://lists.gnu.org/archive/html/qemu-devel/2018-11/msg03621.html hw/arm/armv7m.c | 10 +++--- hw/arm/exynos4210.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/sbsa-ref.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 4 +-- hw/arm/virt.c | 10 +++--- hw/arm/xilinx_zynq.c | 2 +- hw/core/qdev-properties-system.c | 2 +- hw/core/sysbus.c | 2 +- hw/cpu/a15mpcore.c | 4 +-- hw/cpu/a9mpcore.c | 2 +- hw/misc/iotkit-sysctl.c | 2 +- hw/pci/pci.c | 2 +- hw/scsi/scsi-bus.c | 4 +-- include/qom/object.h | 48 ++++++++++++++++++++++--- qom/object.c | 60 +++++++++++++++++++------------- target/arm/monitor.c | 2 +- target/i386/cpu.c | 2 +- target/ppc/translate_init.c.inc | 2 +- 22 files changed, 109 insertions(+), 61 deletions(-) diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index aa831d6653..0e5997d333 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -169,28 +169,28 @@ static void armv7m_realize(DeviceState *dev, Error **= errp) =20 object_property_set_link(OBJECT(s->cpu), "memory", OBJECT(&s->containe= r), &error_abort); - if (object_property_find(OBJECT(s->cpu), "idau", NULL)) { + if (object_property_find(OBJECT(s->cpu), "idau")) { object_property_set_link(OBJECT(s->cpu), "idau", s->idau, &error_abort); } - if (object_property_find(OBJECT(s->cpu), "init-svtor", NULL)) { + if (object_property_find(OBJECT(s->cpu), "init-svtor")) { if (!object_property_set_uint(OBJECT(s->cpu), "init-svtor", s->init_svtor, errp)) { return; } } - if (object_property_find(OBJECT(s->cpu), "start-powered-off", NULL)) { + if (object_property_find(OBJECT(s->cpu), "start-powered-off")) { if (!object_property_set_bool(OBJECT(s->cpu), "start-powered-off", s->start_powered_off, errp)) { return; } } - if (object_property_find(OBJECT(s->cpu), "vfp", NULL)) { + if (object_property_find(OBJECT(s->cpu), "vfp")) { if (!object_property_set_bool(OBJECT(s->cpu), "vfp", s->vfp, errp)= ) { return; } } - if (object_property_find(OBJECT(s->cpu), "dsp", NULL)) { + if (object_property_find(OBJECT(s->cpu), "dsp")) { if (!object_property_set_bool(OBJECT(s->cpu), "dsp", s->dsp, errp)= ) { return; } diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 081bbff317..ced2769b10 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -214,7 +214,7 @@ static void exynos4210_realize(DeviceState *socdev, Err= or **errp) /* By default A9 CPUs have EL3 enabled. This board does not curre= ntly * support EL3 so the CPU EL3 property is disabled before realizat= ion. */ - if (object_property_find(cpuobj, "has_el3", NULL)) { + if (object_property_find(cpuobj, "has_el3")) { object_property_set_bool(cpuobj, "has_el3", false, &error_fata= l); } =20 diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index e2ace803ef..678ca7f5d8 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -278,7 +278,7 @@ static void calxeda_init(MachineState *machine, enum cx= machines machine_id) &error_abort); } =20 - if (object_property_find(cpuobj, "reset-cbar", NULL)) { + if (object_property_find(cpuobj, "reset-cbar")) { object_property_set_int(cpuobj, "reset-cbar", MPCORE_PERIPHBAS= E, &error_abort); } diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 19989b61b9..3f411a25ee 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -609,7 +609,7 @@ static void integratorcp_init(MachineState *machine) * currently support EL3 so the CPU EL3 property is disabled before * realization. */ - if (object_property_find(cpuobj, "has_el3", NULL)) { + if (object_property_find(cpuobj, "has_el3")) { object_property_set_bool(cpuobj, "has_el3", false, &error_fatal); } =20 diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 5f1f36b15c..0831159d15 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -108,7 +108,7 @@ static void realview_init(MachineState *machine, * does not currently support EL3 so the CPU EL3 property is disab= led * before realization. */ - if (object_property_find(cpuobj, "has_el3", NULL)) { + if (object_property_find(cpuobj, "has_el3")) { object_property_set_bool(cpuobj, "has_el3", false, &error_fata= l); } =20 diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index ac68b4640d..68f23e0188 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -705,7 +705,7 @@ static void sbsa_ref_init(MachineState *machine) numa_cpu_pre_plug(&possible_cpus->cpus[cs->cpu_index], DEVICE(cpuo= bj), &error_fatal); =20 - if (object_property_find(cpuobj, "reset-cbar", NULL)) { + if (object_property_find(cpuobj, "reset-cbar")) { object_property_set_int(cpuobj, "reset-cbar", sbsa_ref_memmap[SBSA_CPUPERIPHS].base, &error_abort); diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 2ba69f24b7..87bb92d769 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -215,7 +215,7 @@ static void versatile_init(MachineState *machine, int b= oard_id) * currently support EL3 so the CPU EL3 property is disabled before * realization. */ - if (object_property_find(cpuobj, "has_el3", NULL)) { + if (object_property_find(cpuobj, "has_el3")) { object_property_set_bool(cpuobj, "has_el3", false, &error_fatal); } =20 diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 01bb4bba1e..1a67f90042 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -221,12 +221,12 @@ static void init_cpus(MachineState *ms, const char *c= pu_type, object_property_set_bool(cpuobj, "has_el3", false, NULL); } if (!virt) { - if (object_property_find(cpuobj, "has_el2", NULL)) { + if (object_property_find(cpuobj, "has_el2")) { object_property_set_bool(cpuobj, "has_el2", false, NULL); } } =20 - if (object_property_find(cpuobj, "reset-cbar", NULL)) { + if (object_property_find(cpuobj, "reset-cbar")) { object_property_set_int(cpuobj, "reset-cbar", periphbase, &error_abort); } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index acf9bfbece..1231a197c8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1806,7 +1806,7 @@ static void machvirt_init(MachineState *machine) object_property_set_bool(cpuobj, "has_el3", false, NULL); } =20 - if (!vms->virt && object_property_find(cpuobj, "has_el2", NULL)) { + if (!vms->virt && object_property_find(cpuobj, "has_el2")) { object_property_set_bool(cpuobj, "has_el2", false, NULL); } =20 @@ -1822,15 +1822,15 @@ static void machvirt_init(MachineState *machine) } =20 if (vmc->kvm_no_adjvtime && - object_property_find(cpuobj, "kvm-no-adjvtime", NULL)) { + object_property_find(cpuobj, "kvm-no-adjvtime")) { object_property_set_bool(cpuobj, "kvm-no-adjvtime", true, NULL= ); } =20 - if (vmc->no_pmu && object_property_find(cpuobj, "pmu", NULL)) { + if (vmc->no_pmu && object_property_find(cpuobj, "pmu")) { object_property_set_bool(cpuobj, "pmu", false, NULL); } =20 - if (object_property_find(cpuobj, "reset-cbar", NULL)) { + if (object_property_find(cpuobj, "reset-cbar")) { object_property_set_int(cpuobj, "reset-cbar", vms->memmap[VIRT_CPUPERIPHS].base, &error_abort); @@ -1850,7 +1850,7 @@ static void machvirt_init(MachineState *machine) * The property exists only if MemTag is supported. * If it is, we must allocate the ram to back that up. */ - if (!object_property_find(cpuobj, "tag-memory", NULL)) { + if (!object_property_find(cpuobj, "tag-memory")) { error_report("MTE requested, but not supported " "by the guest CPU"); exit(1); diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index f45e71e89b..eab37f3832 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -198,7 +198,7 @@ static void zynq_init(MachineState *machine) * currently support EL3 so the CPU EL3 property is disabled before * realization. */ - if (object_property_find(OBJECT(cpu), "has_el3", NULL)) { + if (object_property_find(OBJECT(cpu), "has_el3")) { object_property_set_bool(OBJECT(cpu), "has_el3", false, &error_fat= al); } =20 diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 3e4f16fc21..b29daf4fb5 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -460,7 +460,7 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo = *nd) qdev_prop_set_netdev(dev, "netdev", nd->netdev); } if (nd->nvectors !=3D DEV_NVECTORS_UNSPECIFIED && - object_property_find(OBJECT(dev), "vectors", NULL)) { + object_property_find(OBJECT(dev), "vectors")) { qdev_prop_set_uint32(dev, "vectors", nd->nvectors); } nd->instantiated =3D 1; diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index 294f90b7de..68e8dc88c5 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -93,7 +93,7 @@ bool sysbus_has_irq(SysBusDevice *dev, int n) char *prop =3D g_strdup_printf("%s[%d]", SYSBUS_DEVICE_GPIO_IRQ, n); ObjectProperty *r; =20 - r =3D object_property_find(OBJECT(dev), prop, NULL); + r =3D object_property_find(OBJECT(dev), prop); g_free(prop); =20 return (r !=3D NULL); diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index c377be398d..774ca9987a 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -66,11 +66,11 @@ static void a15mp_priv_realize(DeviceState *dev, Error = **errp) * either all the CPUs have TZ, or none do. */ cpuobj =3D OBJECT(qemu_get_cpu(0)); - has_el3 =3D object_property_find(cpuobj, "has_el3", NULL) && + has_el3 =3D object_property_find(cpuobj, "has_el3") && object_property_get_bool(cpuobj, "has_el3", &error_abort); qdev_prop_set_bit(gicdev, "has-security-extensions", has_el3); /* Similarly for virtualization support */ - has_el2 =3D object_property_find(cpuobj, "has_el2", NULL) && + has_el2 =3D object_property_find(cpuobj, "has_el2") && object_property_get_bool(cpuobj, "has_el2", &error_abort); qdev_prop_set_bit(gicdev, "has-virtualization-extensions", has_el2= ); } diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index ec186d49ab..d03f57e579 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -81,7 +81,7 @@ static void a9mp_priv_realize(DeviceState *dev, Error **e= rrp) /* Make the GIC's TZ support match the CPUs. We assume that * either all the CPUs have TZ, or none do. */ - has_el3 =3D object_property_find(cpuobj, "has_el3", NULL) && + has_el3 =3D object_property_find(cpuobj, "has_el3") && object_property_get_bool(cpuobj, "has_el3", &error_abort); qdev_prop_set_bit(gicdev, "has-security-extensions", has_el3); =20 diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c index 269783366d..964b48c74d 100644 --- a/hw/misc/iotkit-sysctl.c +++ b/hw/misc/iotkit-sysctl.c @@ -83,7 +83,7 @@ static void set_init_vtor(uint64_t cpuid, uint32_t vtor) Object *cpuobj =3D OBJECT(arm_get_cpu_by_id(cpuid)); =20 if (cpuobj) { - if (object_property_find(cpuobj, "init-svtor", NULL)) { + if (object_property_find(cpuobj, "init-svtor")) { object_property_set_uint(cpuobj, "init-svtor", vtor, &error_ab= ort); } } diff --git a/hw/pci/pci.c b/hw/pci/pci.c index de0fae10ab..fce725474b 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1900,7 +1900,7 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *r= ootbus, * a temporary instance here to be able to check it. */ Object *obj =3D object_new_with_class(OBJECT_CLASS(dc)); - if (object_property_find(obj, "netdev", NULL)) { + if (object_property_find(obj, "netdev")) { g_ptr_array_add(pci_nic_models, (gpointer)name); } object_unref(obj); diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index df65cc2223..3284a5d1fb 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -270,10 +270,10 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, B= lockBackend *blk, object_property_set_int(OBJECT(dev), "bootindex", bootindex, &error_abort); } - if (object_property_find(OBJECT(dev), "removable", NULL)) { + if (object_property_find(OBJECT(dev), "removable")) { qdev_prop_set_bit(dev, "removable", removable); } - if (serial && object_property_find(OBJECT(dev), "serial", NULL)) { + if (serial && object_property_find(OBJECT(dev), "serial")) { qdev_prop_set_string(dev, "serial", serial); } if (!qdev_prop_set_drive_err(dev, "drive", blk, errp)) { diff --git a/include/qom/object.h b/include/qom/object.h index 056f67ab3b..fc4cd471ab 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1460,14 +1460,52 @@ void object_property_set_default_uint(ObjectPropert= y *prop, uint64_t value); * object_property_find: * @obj: the object * @name: the name of the property + * + * Look up a property for an object. + * + * Return its #ObjectProperty if found, or NULL. + */ +ObjectProperty *object_property_find(Object *obj, const char *name); + +/** + * object_property_find_err: + * @obj: the object + * @name: the name of the property * @errp: returns an error if this function fails * - * Look up a property for an object and return its #ObjectProperty if foun= d. + * Look up a property for an object. + * + * Return its #ObjectProperty if found, or NULL. */ -ObjectProperty *object_property_find(Object *obj, const char *name, - Error **errp); -ObjectProperty *object_class_property_find(ObjectClass *klass, const char = *name, - Error **errp); +ObjectProperty *object_property_find_err(Object *obj, + const char *name, + Error **errp); + +/** + * object_class_property_find: + * @klass: the object class + * @name: the name of the property + * + * Look up a property for an object class. + * + * Return its #ObjectProperty if found, or NULL. + */ +ObjectProperty *object_class_property_find(ObjectClass *klass, + const char *name); + +/** + * object_class_property_find_err: + * @klass: the object class + * @name: the name of the property + * @errp: returns an error if this function fails + * + * Look up a property for an object class. + * + * Return its #ObjectProperty if found, or NULL. + */ +ObjectProperty *object_class_property_find_err(ObjectClass *klass, + const char *name, + Error **errp); =20 typedef struct ObjectPropertyIterator { ObjectClass *nextclass; diff --git a/qom/object.c b/qom/object.c index b1822a2ef4..79e96e399e 100644 --- a/qom/object.c +++ b/qom/object.c @@ -401,7 +401,7 @@ bool object_apply_global_props(Object *obj, const GPtrA= rray *props, if (object_dynamic_cast(obj, p->driver) =3D=3D NULL) { continue; } - if (p->optional && !object_property_find(obj, p->property, NULL)) { + if (p->optional && !object_property_find(obj, p->property)) { continue; } p->used =3D true; @@ -1178,7 +1178,7 @@ object_property_try_add(Object *obj, const char *name= , const char *type, return ret; } =20 - if (object_property_find(obj, name, NULL) !=3D NULL) { + if (object_property_find(obj, name) !=3D NULL) { error_setg(errp, "attempt to add duplicate property '%s' to object= (type '%s')", name, object_get_typename(obj)); return NULL; @@ -1220,7 +1220,7 @@ object_class_property_add(ObjectClass *klass, { ObjectProperty *prop; =20 - assert(!object_class_property_find(klass, name, NULL)); + assert(!object_class_property_find(klass, name)); =20 prop =3D g_malloc0(sizeof(*prop)); =20 @@ -1237,24 +1237,27 @@ object_class_property_add(ObjectClass *klass, return prop; } =20 -ObjectProperty *object_property_find(Object *obj, const char *name, - Error **errp) +ObjectProperty *object_property_find(Object *obj, const char *name) { ObjectProperty *prop; ObjectClass *klass =3D object_get_class(obj); =20 - prop =3D object_class_property_find(klass, name, NULL); + prop =3D object_class_property_find(klass, name); if (prop) { return prop; } =20 - prop =3D g_hash_table_lookup(obj->properties, name); - if (prop) { - return prop; - } + return g_hash_table_lookup(obj->properties, name); +} =20 - error_setg(errp, "Property '.%s' not found", name); - return NULL; +ObjectProperty *object_property_find_err(Object *obj, const char *name, + Error **errp) +{ + ObjectProperty *prop =3D object_property_find(obj, name); + if (!prop) { + error_setg(errp, "Property '.%s' not found", name); + } + return prop; } =20 void object_property_iter_init(ObjectPropertyIterator *iter, @@ -1284,27 +1287,34 @@ void object_class_property_iter_init(ObjectProperty= Iterator *iter, iter->nextclass =3D object_class_get_parent(klass); } =20 -ObjectProperty *object_class_property_find(ObjectClass *klass, const char = *name, - Error **errp) +ObjectProperty *object_class_property_find(ObjectClass *klass, const char = *name) { - ObjectProperty *prop; ObjectClass *parent_klass; =20 parent_klass =3D object_class_get_parent(klass); if (parent_klass) { - prop =3D object_class_property_find(parent_klass, name, NULL); + ObjectProperty *prop =3D + object_class_property_find(parent_klass, name); if (prop) { return prop; } } =20 - prop =3D g_hash_table_lookup(klass->properties, name); + return g_hash_table_lookup(klass->properties, name); +} + +ObjectProperty *object_class_property_find_err(ObjectClass *klass, + const char *name, + Error **errp) +{ + ObjectProperty *prop =3D object_class_property_find(klass, name); if (!prop) { error_setg(errp, "Property '.%s' not found", name); } return prop; } =20 + void object_property_del(Object *obj, const char *name) { ObjectProperty *prop =3D g_hash_table_lookup(obj->properties, name); @@ -1319,7 +1329,7 @@ bool object_property_get(Object *obj, const char *nam= e, Visitor *v, Error **errp) { Error *err =3D NULL; - ObjectProperty *prop =3D object_property_find(obj, name, errp); + ObjectProperty *prop =3D object_property_find_err(obj, name, errp); =20 if (prop =3D=3D NULL) { return false; @@ -1338,7 +1348,7 @@ bool object_property_set(Object *obj, const char *nam= e, Visitor *v, Error **errp) { Error *err =3D NULL; - ObjectProperty *prop =3D object_property_find(obj, name, errp); + ObjectProperty *prop =3D object_property_find_err(obj, name, errp); =20 if (prop =3D=3D NULL) { return false; @@ -1554,7 +1564,7 @@ int object_property_get_enum(Object *obj, const char = *name, { char *str; int ret; - ObjectProperty *prop =3D object_property_find(obj, name, errp); + ObjectProperty *prop =3D object_property_find_err(obj, name, errp); EnumProperty *enumprop; =20 if (prop =3D=3D NULL) { @@ -1611,7 +1621,7 @@ out: =20 const char *object_property_get_type(Object *obj, const char *name, Error = **errp) { - ObjectProperty *prop =3D object_property_find(obj, name, errp); + ObjectProperty *prop =3D object_property_find_err(obj, name, errp); if (prop =3D=3D NULL) { return NULL; } @@ -1989,7 +1999,7 @@ char *object_get_canonical_path(const Object *obj) =20 Object *object_resolve_path_component(Object *parent, const char *part) { - ObjectProperty *prop =3D object_property_find(parent, part, NULL); + ObjectProperty *prop =3D object_property_find(parent, part); if (prop =3D=3D NULL) { return NULL; } @@ -2688,8 +2698,8 @@ object_property_add_alias(Object *obj, const char *na= me, ObjectProperty *target_prop; g_autofree char *prop_type =3D NULL; =20 - target_prop =3D object_property_find(target_obj, target_name, - &error_abort); + target_prop =3D object_property_find_err(target_obj, target_name, + &error_abort); =20 if (object_property_is_child(target_prop)) { prop_type =3D g_strdup_printf("link%s", @@ -2722,7 +2732,7 @@ void object_property_set_description(Object *obj, con= st char *name, { ObjectProperty *op; =20 - op =3D object_property_find(obj, name, &error_abort); + op =3D object_property_find_err(obj, name, &error_abort); g_free(op->description); op->description =3D g_strdup(description); } diff --git a/target/arm/monitor.c b/target/arm/monitor.c index ba6e01abd0..375f34bfaa 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.c @@ -214,7 +214,7 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(Cp= uModelExpansionType type, =20 i =3D 0; while ((name =3D cpu_model_advertised_features[i++]) !=3D NULL) { - ObjectProperty *prop =3D object_property_find(obj, name, NULL); + ObjectProperty *prop =3D object_property_find(obj, name); if (prop) { QObject *value; =20 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 49d8958528..5a8c48f776 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6932,7 +6932,7 @@ static void x86_cpu_register_bit_prop(X86CPU *cpu, ObjectProperty *op; uint64_t mask =3D (1ULL << bitnr); =20 - op =3D object_property_find(OBJECT(cpu), prop_name, NULL); + op =3D object_property_find(OBJECT(cpu), prop_name); if (op) { fp =3D op->opaque; assert(fp->w =3D=3D w); diff --git a/target/ppc/translate_init.c.inc b/target/ppc/translate_init.c.= inc index 230a062d29..ba81b71fa6 100644 --- a/target/ppc/translate_init.c.inc +++ b/target/ppc/translate_init.c.inc @@ -10478,7 +10478,7 @@ static void ppc_cpu_parse_featurestr(const char *ty= pe, char *features, return; } =20 - if (object_property_find(machine, "max-cpu-compat", NULL)) { + if (object_property_find(machine, "max-cpu-compat")) { int i; char **inpieces; char *s =3D features; --=20 2.26.2